diff options
| -rw-r--r-- | libre-testing/iceweasel/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch | 34 | ||||
| -rw-r--r-- | libre-testing/iceweasel/iceweasel-support-YUV420J-pixel-format.patch | 34 |
3 files changed, 81 insertions, 3 deletions
diff --git a/libre-testing/iceweasel/PKGBUILD b/libre-testing/iceweasel/PKGBUILD index 0d19d5153..4784b5ea1 100644 --- a/libre-testing/iceweasel/PKGBUILD +++ b/libre-testing/iceweasel/PKGBUILD @@ -17,7 +17,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=43.0.2 +_debver=43.0.4 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -56,10 +56,12 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" $pkgname.desktop $pkgname-install-dir.patch vendor.js + $pkgname-disable-GMP-PDM.patch + $pkgname-support-YUV420J-pixel-format.patch $pkgname-fixed-loading-icon.png no-neon.patch) -sha256sums=('7b42a06bfd8c99d1eb9bc49bb095228518e56641c7d7f7b0ba2fb234ba1af66a' - 'db9678c4490432d2666dd5ab1c4016d8dd68c33fb32c03e1ea0386a939857cdd' +sha256sums=('10509acf085740bce9699d146851618c3abac600b701580ff0b697ca97e52b29' + '41cb6beb59711438c898348fa743810c56dbee232b8a1713826ecff7de95621f' '351ff30a3709ea5c2336e8c5ea93d6fa24c1f34a136594ee5eae729590d18b2a' 'a28bd21522f0c7d93e9669f1fcc35309c9841d9b2332aa16b0b746ad18fc878c' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' @@ -67,6 +69,8 @@ sha256sums=('7b42a06bfd8c99d1eb9bc49bb095228518e56641c7d7f7b0ba2fb234ba1af66a' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' '815a764744eaf4efae30d61a2886cd0e2fb09146fc9e06b61e1fa3ad3c749690' + 'fb1f631363c9b50c8246a0d8738c40570717b3e15b5457dacad9f447449d7e92' + '4a949e5b4281be4df0bece8087ecad0a3debb4828efc6a587bd3bd931ab70c94' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' '6d0c1c9ca28b20d206ce24ca84f4d4e3f5d062a2e9cb7445fcb6c2cfea959b4a') @@ -84,6 +88,12 @@ prepare() { install -m644 "$srcdir/"{gnu_headshadow,drm-free}.png \ browser/base/content/abouthome + # https://bugzilla.mozilla.org/show_bug.cgi?id=1233429 + patch -Np1 -i "$srcdir/$pkgname-disable-GMP-PDM.patch" + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1233340 + patch -Np1 -i "$srcdir/$pkgname-support-YUV420J-pixel-format.patch" + # Install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" diff --git a/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch b/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch new file mode 100644 index 000000000..25f7ed5d4 --- /dev/null +++ b/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Jean-Yves Avenard <jyavenard@mozilla.com> + +Bug 1233429: Disable GMP PDM. r=cpearce + +Prevent users from shooting themselves in the foot by turning some prefs on. + +diff --git a/dom/media/platforms/PlatformDecoderModule.cpp b/dom/media/platforms/PlatformDecoderModule.cpp +index 530c7b9..50933ca 100644 +--- a/dom/media/platforms/PlatformDecoderModule.cpp ++++ b/dom/media/platforms/PlatformDecoderModule.cpp +@@ -150,20 +150,22 @@ PlatformDecoderModule::Create() + } + return CreateAgnosticDecoderModule(); + } + + /* static */ + already_AddRefed<PlatformDecoderModule> + PlatformDecoderModule::CreatePDM() + { ++#ifndef RELEASE_BUILD + if (sGMPDecoderEnabled) { + nsRefPtr<PlatformDecoderModule> m(new GMPDecoderModule()); + return m.forget(); + } ++#endif + #ifdef MOZ_WIDGET_ANDROID + if(sAndroidMCDecoderPreferred && sAndroidMCDecoderEnabled){ + nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule()); + return m.forget(); + } + #endif + if (sUseBlankDecoder) { + return CreateBlankDecoderModule(); diff --git a/libre-testing/iceweasel/iceweasel-support-YUV420J-pixel-format.patch b/libre-testing/iceweasel/iceweasel-support-YUV420J-pixel-format.patch new file mode 100644 index 000000000..178c5897d --- /dev/null +++ b/libre-testing/iceweasel/iceweasel-support-YUV420J-pixel-format.patch @@ -0,0 +1,34 @@ + +# HG changeset patch +# User Jean-Yves Avenard <jyavenard@mozilla.com> +# Date 1450657258 -39600 +# Node ID 8b0ced62c1957f6da6028af686c32ada1ccb570c +# Parent e1a98377eb38679bda820456ee6d20bdc17eaa8e +Bug 1233340: [ffmpeg] Support YUV420J pixel format. r=kentuckyfriedtakahe + +YUV420J is 12bpp YUV420P. + + +diff --git a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp +--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp ++++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp +@@ -52,17 +52,17 @@ FFmpegDataDecoder<LIBAV_VER>::~FFmpegDat + * For now, we just look for YUV420P as it is the only non-HW accelerated format + * supported by FFmpeg's H264 decoder. + */ + static PixelFormat + ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats) + { + FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding."); + for (; *aFormats > -1; aFormats++) { +- if (*aFormats == PIX_FMT_YUV420P) { ++ if (*aFormats == PIX_FMT_YUV420P || *aFormats == PIX_FMT_YUVJ420P) { + FFMPEG_LOG("Requesting pixel format YUV420P."); + return PIX_FMT_YUV420P; + } + } + + NS_WARNING("FFmpeg does not share any supported pixel formats."); + return PIX_FMT_NONE; + } + |