From a7ce5c380fa1e3c2a0be0deacfe1390fcafb6d4d Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <foutrelis@archlinux.org>
Date: Tue, 26 Jan 2016 15:50:01 +0000
Subject: [PATCH] New upstream release.
---
PKGBUILD | 22 ++++----------
firefox-disable-GMP-PDM.patch | 34 ----------------------
firefox-support-YUV420J-pixel-format.patch | 34 ----------------------
mozconfig | 2 +-
4 files changed, 6 insertions(+), 86 deletions(-)
delete mode 100644 firefox-disable-GMP-PDM.patch
delete mode 100644 firefox-support-YUV420J-pixel-format.patch
diff --git a/PKGBUILD b/PKGBUILD
index d957c83..0361b1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Jakub Schmidtke <sjakub@gmail.com>
pkgname=firefox
-pkgver=43.0.4
+pkgver=44.0
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
arch=('i686' 'x86_64')
@@ -12,11 +12,9 @@ depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-typ
'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme'
'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
- 'xorg-server-xvfb' 'libpulse' 'inetutils' 'gst-plugins-base-libs')
+ 'xorg-server-xvfb' 'libpulse' 'inetutils')
optdepends=('networkmanager: Location detection via available WiFi networks'
- 'ffmpeg: H264/AAC decoding'
- 'gst-plugins-good: MP3 playback'
- 'gst-plugins-ugly: MP3 playback'
+ 'ffmpeg: H264/AAC/MP3 decoding'
'upower: Battery API')
install=firefox.install
options=('!emptydirs' '!makeflags')
@@ -25,16 +23,12 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
firefox.desktop
firefox-install-dir.patch
vendor.js
- firefox-disable-GMP-PDM.patch
- firefox-support-YUV420J-pixel-format.patch
firefox-fixed-loading-icon.png)
-sha256sums=('76cfa99285d49dede4097096ab3e7ee4bdedb64084b1fc23f2de216884245a76'
- '0a6968180eba6d66b549cebb4106540280600614e91a72a95955e739d4b75fb9'
+sha256sums=('ea82b0f4840d320aa4fe8046ba28e686bf6dc60f707a0514a9d68c150d0c4c1d'
+ 'a7a5dffa8df27a8f4d1e034c5fc10b39d69068be92ee3f40e8ee7980a68655a6'
'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
'4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
- 'fb1f631363c9b50c8246a0d8738c40570717b3e15b5457dacad9f447449d7e92'
- '4a949e5b4281be4df0bece8087ecad0a3debb4828efc6a587bd3bd931ab70c94'
'68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -56,12 +50,6 @@ _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
prepare() {
cd $pkgname-$pkgver
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1233429
- patch -Np1 -i ../firefox-disable-GMP-PDM.patch
-
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1233340
- patch -Np1 -i ../firefox-support-YUV420J-pixel-format.patch
-
cp ../mozconfig .mozconfig
patch -Np1 -i ../firefox-install-dir.patch
diff --git a/firefox-disable-GMP-PDM.patch b/firefox-disable-GMP-PDM.patch
deleted file mode 100644
index 25f7ed5..0000000
--- a/firefox-disable-GMP-PDM.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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/firefox-support-YUV420J-pixel-format.patch b/firefox-support-YUV420J-pixel-format.patch
deleted file mode 100644
index 178c589..0000000
--- a/firefox-support-YUV420J-pixel-format.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# 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;
- }
-
diff --git a/mozconfig b/mozconfig
index c8d5dcf..b18330c 100644
--- a/mozconfig
+++ b/mozconfig
@@ -29,7 +29,7 @@ ac_add_options --enable-system-pixman
# Features
ac_add_options --enable-startup-notification
ac_add_options --enable-pulseaudio
-ac_add_options --enable-gstreamer=1.0
+ac_add_options --disable-gstreamer
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
--
GitLab