add disable av1 patch
This commit is contained in:
parent
7ba45c368e
commit
9bb0ba9aa1
2 changed files with 92 additions and 6 deletions
|
@ -15,11 +15,7 @@ url="https://www.mozilla.org/en-US/firefox/organizations/"
|
||||||
# ppc64le: test suite stalls
|
# ppc64le: test suite stalls
|
||||||
arch="x86_64 armv7 aarch64 x86"
|
arch="x86_64 armv7 aarch64 x86"
|
||||||
license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
|
license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
|
||||||
depends="
|
|
||||||
ffmpeg-libavcodec
|
|
||||||
"
|
|
||||||
makedepends="
|
makedepends="
|
||||||
alsa-lib-dev
|
|
||||||
automake
|
automake
|
||||||
bash
|
bash
|
||||||
bsd-compat-headers
|
bsd-compat-headers
|
||||||
|
@ -56,8 +52,6 @@ makedepends="
|
||||||
nspr-dev
|
nspr-dev
|
||||||
nss-dev
|
nss-dev
|
||||||
perl
|
perl
|
||||||
pipewire-dev
|
|
||||||
pulseaudio-dev
|
|
||||||
python3
|
python3
|
||||||
rsync
|
rsync
|
||||||
sed
|
sed
|
||||||
|
@ -95,6 +89,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${_fxver}esr/source/firefox
|
||||||
mozilla-location.keys
|
mozilla-location.keys
|
||||||
vendor-prefs.js
|
vendor-prefs.js
|
||||||
|
|
||||||
|
mozilla-bmo1789216-disable-av1.patch
|
||||||
|
|
||||||
zotero.desktop
|
zotero.desktop
|
||||||
https://ayakael.net/api/packages/mirrors/generic/zotero/$pkgver/zotero-$pkgver.tar.gz
|
https://ayakael.net/api/packages/mirrors/generic/zotero/$pkgver/zotero-$pkgver.tar.gz
|
||||||
zotero_build-modifications.patch
|
zotero_build-modifications.patch
|
||||||
|
@ -408,6 +404,7 @@ f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e71106951
|
||||||
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
|
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
|
||||||
382510375b1a2fa79be0ab79e3391a021ae2c022429ffbaa7e7a69166f99bb56d01e59a1b10688592a29238f21c9d6977672bd77f9fae439b66bdfe0c55ddb15 mozilla-location.keys
|
382510375b1a2fa79be0ab79e3391a021ae2c022429ffbaa7e7a69166f99bb56d01e59a1b10688592a29238f21c9d6977672bd77f9fae439b66bdfe0c55ddb15 mozilla-location.keys
|
||||||
fc45bc3ffb9404e5338ea26a9f04807b40f6f516324972cddd48bedb91b8bd7c6b8d4e03a0209020f5e67b703bc4ff89389985791b9bd544a0fc3951e2dc338e vendor-prefs.js
|
fc45bc3ffb9404e5338ea26a9f04807b40f6f516324972cddd48bedb91b8bd7c6b8d4e03a0209020f5e67b703bc4ff89389985791b9bd544a0fc3951e2dc338e vendor-prefs.js
|
||||||
|
e855df345eff3bf52db4a4a58726f1ffcf91d855cf17a6d7222ea364c106a82f22eac73d45e2d3575299fef097329aeaa04d8b59721b5ea45b646e23395706aa mozilla-bmo1789216-disable-av1.patch
|
||||||
e1a0a4ff5cc1b53f13776ca11927d671426b0691e78e74a4adf2166d57bb2ae8ac409cc11a37ce5e2f680fdf05d5bc3849c33a9717aca1bb62d03ae5231a67fb zotero.desktop
|
e1a0a4ff5cc1b53f13776ca11927d671426b0691e78e74a4adf2166d57bb2ae8ac409cc11a37ce5e2f680fdf05d5bc3849c33a9717aca1bb62d03ae5231a67fb zotero.desktop
|
||||||
48c7106f0d20b5f1fba2a4b846282c627a5654ac8579f8a7cdb202b187416311f5eb32827ac6e972d1815348bd2ad00bd10bcff1a4ca8efc9b4b07b4e3e825dc zotero-7.0.3.tar.gz
|
48c7106f0d20b5f1fba2a4b846282c627a5654ac8579f8a7cdb202b187416311f5eb32827ac6e972d1815348bd2ad00bd10bcff1a4ca8efc9b4b07b4e3e825dc zotero-7.0.3.tar.gz
|
||||||
746dbabbb3ea9199d17891e2079b9256d04843f548132178862117d2334694d98e2cc981945d72f31d0e5b2c42904d371633f6905996bb580aa0b5ae95c64ddc zotero_build-modifications.patch
|
746dbabbb3ea9199d17891e2079b9256d04843f548132178862117d2334694d98e2cc981945d72f31d0e5b2c42904d371633f6905996bb580aa0b5ae95c64ddc zotero_build-modifications.patch
|
||||||
|
|
89
user/zotero/mozilla-bmo1789216-disable-av1.patch
Normal file
89
user/zotero/mozilla-bmo1789216-disable-av1.patch
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
--- a/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/allcodecs.c
|
||||||
|
@@ -755,12 +755,15 @@
|
||||||
|
extern FFCodec ff_libaom_av1_encoder;
|
||||||
|
extern const FFCodec ff_libaribb24_decoder;
|
||||||
|
extern const FFCodec ff_libcelt_decoder;
|
||||||
|
extern const FFCodec ff_libcodec2_encoder;
|
||||||
|
extern const FFCodec ff_libcodec2_decoder;
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
extern const FFCodec ff_libdav1d_decoder;
|
||||||
|
extern const FFCodec ff_libdavs2_decoder;
|
||||||
|
+extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
+#endif
|
||||||
|
extern const FFCodec ff_libfdk_aac_encoder;
|
||||||
|
extern const FFCodec ff_libfdk_aac_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_encoder;
|
||||||
|
extern const FFCodec ff_libgsm_decoder;
|
||||||
|
extern const FFCodec ff_libgsm_ms_encoder;
|
||||||
|
@@ -783,11 +786,10 @@
|
||||||
|
extern const FFCodec ff_libspeex_encoder;
|
||||||
|
extern const FFCodec ff_libspeex_decoder;
|
||||||
|
extern const FFCodec ff_libsvtav1_encoder;
|
||||||
|
extern const FFCodec ff_libtheora_encoder;
|
||||||
|
extern const FFCodec ff_libtwolame_encoder;
|
||||||
|
-extern const FFCodec ff_libuavs3d_decoder;
|
||||||
|
extern const FFCodec ff_libvo_amrwbenc_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_encoder;
|
||||||
|
extern const FFCodec ff_libvorbis_decoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_encoder;
|
||||||
|
extern const FFCodec ff_libvpx_vp8_decoder;
|
||||||
|
diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
--- a/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
+++ b/media/ffvpx/libavcodec/codec_list.c
|
||||||
|
@@ -9,12 +9,14 @@
|
||||||
|
&ff_flac_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_MP3_DECODER
|
||||||
|
&ff_mp3_decoder,
|
||||||
|
#endif
|
||||||
|
+#if CONFIG_MOZ_AV1
|
||||||
|
#if CONFIG_LIBDAV1D
|
||||||
|
&ff_libdav1d_decoder,
|
||||||
|
#endif
|
||||||
|
#if CONFIG_AV1_DECODER
|
||||||
|
&ff_av1_decoder,
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
NULL };
|
||||||
|
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
|
||||||
|
--- a/media/ffvpx/libavcodec/moz.build
|
||||||
|
+++ b/media/ffvpx/libavcodec/moz.build
|
||||||
|
@@ -84,11 +84,10 @@
|
||||||
|
'cbs.c',
|
||||||
|
'cbs_av1.c',
|
||||||
|
'golomb.c',
|
||||||
|
'h264pred.c',
|
||||||
|
'imgconvert.c',
|
||||||
|
- 'libdav1d.c',
|
||||||
|
'mathtables.c',
|
||||||
|
'qsv_api.c',
|
||||||
|
'raw.c',
|
||||||
|
'videodsp.c',
|
||||||
|
'vp8.c',
|
||||||
|
@@ -107,14 +106,19 @@
|
||||||
|
'vp9mvs.c',
|
||||||
|
'vp9prob.c',
|
||||||
|
'vp9recon.c',
|
||||||
|
'vpx_rac.c',
|
||||||
|
]
|
||||||
|
- USE_LIBS += [
|
||||||
|
- 'dav1d',
|
||||||
|
- 'media_libdav1d_asm',
|
||||||
|
- ]
|
||||||
|
+ if CONFIG['MOZ_AV1']:
|
||||||
|
+ USE_LIBS += [
|
||||||
|
+ 'dav1d',
|
||||||
|
+ 'media_libdav1d_asm',
|
||||||
|
+ ]
|
||||||
|
+ SOURCES += [
|
||||||
|
+ 'libdav1d.c',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['MOZ_WAYLAND']:
|
||||||
|
LOCAL_INCLUDES += ['/media/mozva']
|
||||||
|
SOURCES += [
|
||||||
|
'vaapi_av1.c',
|
||||||
|
'vaapi_decode.c',
|
||||||
|
|
Loading…
Reference in a new issue