mplayer-37379-6.parabola1: libvpx 1.5.0 rebuild

3 files changed, 50 insertions, 21 deletions

diff --git a/libre/mplayer/37386.patch b/libre/mplayer/37386.patch
deleted file mode 100644
index e705a9349..000000000
--- a/libre/mplayer/37386.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 37385)
-+++ configure	(revision 37386)
-@@ -9212,6 +9212,7 @@
- #define HAVE_MM_EMPTY 0
- #define HAVE_PPC4XX 0
- #define HAVE_RDTSC 0
-+#define HAVE_SECTION_DATA_REL_RO 0
- #define HAVE_SIMD_ALIGN_16 1
- #define HAVE_STRERROR_R 0
- #define HAVE_STRPTIME 0
diff --git a/libre/mplayer/PKGBUILD b/libre/mplayer/PKGBUILD
index 6dea057a5..2d9766f70 100644
--- a/libre/mplayer/PKGBUILD
+++ b/libre/mplayer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 245654 2015-09-10 03:10:50Z allan $
+# $Id: PKGBUILD 250583 2015-11-10 20:56:30Z foutrelis $
 # Maintainer (Arch):  Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
@@ -8,7 +8,7 @@
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
 pkgver=37379
-pkgrel=5.parabola1
+pkgrel=6.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -27,15 +27,15 @@ source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch
-        revert-icl-fixes.patch
-        37386.patch)
+        ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+        revert-icl-fixes.patch)
 md5sums=('SKIP'
          'e75d598921285d6775f20164a91936ac'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
-         '3579402002b7302fdf2d146639333efd'
-         '9131fa5229c857174ab029ed9b0cb71b')
+         '71be9bcd297cb9ce833bbc5d425c0470'
+         '3579402002b7302fdf2d146639333efd')
 
 pkgver() {
   cd $pkgbase-$pkgver
@@ -46,10 +46,10 @@ prepare() {
   cd $pkgbase-$pkgver
   mv ../ffmpeg-*/ ./ffmpeg
 
-  patch -p0 -i ../cdio-includes.patch
-  patch -p1 -i ../include-samba-4.0.patch
+  patch -Np0 -i ../cdio-includes.patch
+  patch -Np1 -i ../include-samba-4.0.patch
   patch -Np0 -i ../revert-icl-fixes.patch
-  patch -p0 -i ../37386.patch
+  patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
 
   ./version.sh
 }
diff --git a/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
new file mode 100644
index 000000000..15d2600d1
--- /dev/null
+++ b/libre/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
@@ -0,0 +1,41 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Mon, 19 Oct 2015 22:44:11 -0700
+Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
+
+VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+from libvpx and the remaining values were never used here
+
+Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
+Signed-off-by: James Zern <jzern@google.com>
+---
+ libavcodec/libvpxenc.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- a/libavcodec/libvpxenc.c
++++ b/libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+-- 
+1.7.10.4
+