Update to 44.0.deb1

5 files changed, 18 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c7d00e8abfe..4316569469ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jan 17 18:02:58 UTC 2016
+# Wed Jan 27 13:42:38 UTC 2016
 pkgbase = iceweasel
 	pkgdesc = Debian Browser based on Mozilla Firefox
-	pkgver = 43.0.4.deb1
-	pkgrel = 2
+	pkgver = 44.0.deb1
+	pkgrel = 1
 	url = https://packages.debian.org/source/sid/iceweasel
 	install = iceweasel.install
 	arch = i686
@@ -19,7 +19,6 @@ pkgbase = iceweasel
 	makedepends = mesa
 	makedepends = imake
 	makedepends = libpulse
-	makedepends = gst-plugins-base-libs
 	makedepends = inetutils
 	makedepends = quilt
 	makedepends = pkg-config
@@ -46,33 +45,28 @@ pkgbase = iceweasel
 	depends = hunspell
 	depends = sqlite
 	optdepends = networkmanager: Location detection via available WiFi networks
-	optdepends = gst-plugins-good: h.264 video
-	optdepends = gst-libav: h.264 video
 	optdepends = upower: Battery API
+	optdepends = ffmpeg: H264/AAC/MP3 decoding
 	optdepends = iceweasel-extension-archsearch: Iceweasel Arch search engines
 	optdepends = iceweasel-extension-archforumsearch-it: Iceweasel search engines for Arch Linux Italian forum
-	provides = iceweasel=43.0.4
+	provides = iceweasel=44.0
 	options = !emptydirs
 	options = !makeflags
 	options = debug
-	source = http://ftp.debian.org/debian/pool/main/i//iceweasel/iceweasel_43.0.4.orig.tar.xz
-	source = http://ftp.debian.org/debian/pool/main/i//iceweasel/iceweasel_43.0.4-1.debian.tar.xz
+	source = http://ftp.debian.org/debian/pool/main/i//iceweasel/iceweasel_44.0.orig.tar.xz
+	source = http://ftp.debian.org/debian/pool/main/i//iceweasel/iceweasel_44.0-1.debian.tar.xz
 	source = mozconfig
 	source = iceweasel.desktop
 	source = iceweasel-install-dir.patch
 	source = vendor.js
 	source = iceweasel-fixed-loading-icon.png
-	source = iceweasel-disable-GMP-PDM.patch
-	source = iceweasel-support-YUV420J-pixel-format.patch
-	md5sums = 8e39af63adc496dc3c6f1acd0f69fa0f
-	md5sums = 7c098a67f9f20d763381c28afb626cea
+	md5sums = cca619497c1c7e1a255a463d0fc75fb0
+	md5sums = 20cc51d6550e03f15d797689762711b9
 	md5sums = 329ae0844819b6baac61d9a5749a6005
 	md5sums = 7b9e5996dd9fe0b186a43a297db1c6b5
 	md5sums = 1c42509891cf6843660a5f3c69896e80
 	md5sums = 35adf69c840aadeb138d1b0be3af63b5
 	md5sums = 6e335a517c68488941340ee1c23f97b0
-	md5sums = 211de20ce4eb4944415f7cd0ccb01abe
-	md5sums = 54e636a3a191dc652decc30ffa0c96e6
 
 pkgname = iceweasel
 
diff --git a/PKGBUILD b/PKGBUILD
index f47cef23eba9..c15219c086e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,18 +23,18 @@ _pgo=false
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=43.0.4
+_debver=44.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/i/
 
 pkgname=iceweasel
 pkgver=$_debver.deb$_debrel
-pkgrel=2
+pkgrel=1
 pkgdesc="Debian Browser based on Mozilla Firefox"
 arch=('i686' 'x86_64')
 license=('GPL' 'MPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'libpulse' 'gst-plugins-base-libs' 'inetutils' 'quilt' 'pkg-config' 'nss>=3.18.1' 'libidl2'  'librsvg' 'libxslt' 'autoconf2.13' 'imagemagick' 'gconf')
+makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'libpulse' 'inetutils' 'quilt' 'pkg-config' 'nss>=3.18.1' 'libidl2'  'librsvg' 'libxslt' 'autoconf2.13' 'imagemagick' 'gconf')
 
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -43,9 +43,8 @@ if $_pgo; then
 fi
 
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gst-plugins-good: h.264 video'
-            'gst-libav: h.264 video'
 			'upower: Battery API'
+			'ffmpeg: H264/AAC/MP3 decoding'
             'iceweasel-extension-archsearch: Iceweasel Arch search engines'
             'iceweasel-extension-archforumsearch-it: Iceweasel search engines for Arch Linux Italian forum')
 url="https://packages.debian.org/source/sid/iceweasel"
@@ -57,18 +56,14 @@ source=("${_debrepo}/${_debname}/${_debname}_${_debver}.orig.tar.xz"
         'iceweasel.desktop'
         'iceweasel-install-dir.patch'
         'vendor.js'
-		'iceweasel-fixed-loading-icon.png'
-		'iceweasel-disable-GMP-PDM.patch'
-		'iceweasel-support-YUV420J-pixel-format.patch')
-md5sums=('8e39af63adc496dc3c6f1acd0f69fa0f'
-         '7c098a67f9f20d763381c28afb626cea'
+		'iceweasel-fixed-loading-icon.png')
+md5sums=('cca619497c1c7e1a255a463d0fc75fb0'
+         '20cc51d6550e03f15d797689762711b9'
          '329ae0844819b6baac61d9a5749a6005'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
          '35adf69c840aadeb138d1b0be3af63b5'
-         '6e335a517c68488941340ee1c23f97b0'
-         '211de20ce4eb4944415f7cd0ccb01abe'
-         '54e636a3a191dc652decc30ffa0c96e6')
+         '6e335a517c68488941340ee1c23f97b0')
 
 prepare() {
   export DEBIAN_BUILD="firefox-$_debver"
@@ -83,12 +78,6 @@ prepare() {
   # We wont save user profile in .mozilla/iceweasel
   sed -i 's/MOZ_APP_PROFILE=mozilla\/firefox/MOZ_APP_PROFILE=mozilla\/iceweasel/g' "debian/branding/configure.sh"
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233429
-  patch -Np1 -i "$srcdir/iceweasel-disable-GMP-PDM.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233340
-  patch -Np1 -i "$srcdir/iceweasel-support-YUV420J-pixel-format.patch"
-
   quilt push -av
 
   # Install to /usr/lib/$pkgname
diff --git a/iceweasel-disable-GMP-PDM.patch b/iceweasel-disable-GMP-PDM.patch
deleted file mode 100644
index 25f7ed5d4f7a..000000000000
--- a/iceweasel-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/iceweasel-support-YUV420J-pixel-format.patch b/iceweasel-support-YUV420J-pixel-format.patch
deleted file mode 100644
index 2d32fbb2be2a..000000000000
--- a/iceweasel-support-YUV420J-pixel-format.patch
+++ /dev/null
@@ -1,32 +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 39641d45f0d7..252ab3f03139 100644
--- a/mozconfig
+++ b/mozconfig
@@ -37,7 +37,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