[arch-commits] Commit in mythtv/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, November 10, 2015 @ 21:53:48
  Author: foutrelis
Revision: 146538

Fix build with libvpx 1.5.0

Added:
  mythtv/trunk/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
Modified:
  mythtv/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |    4 +
 ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch |   41 +++++++++++
 2 files changed, 45 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-10 20:50:26 UTC (rev 146537)
+++ PKGBUILD	2015-11-10 20:53:48 UTC (rev 146538)
@@ -30,14 +30,18 @@
 install='mythtv.install'
 source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
         'mythbackend.service'
+        'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch'
         'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch')
 sha256sums=('7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b'
             'ecfde779ded8332cc62c86fac6b432b09cbf5d254135798287ada688af9a1302'
+            '277994aca5a6e40c1a90750859828817e0646bfb28142fdb34d5f9d3196c3f7a'
             '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver/$pkgname"
 
+  patch -d external/FFmpeg -Np1 -i "$srcdir/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch"
+
   find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
   patch -Np2 -i "$srcdir/libcec-2-support.2.patch"
 }

Added: ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
===================================================================
--- ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch	                        (rev 0)
+++ ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch	2015-11-10 20:53:48 UTC (rev 146538)
@@ -0,0 +1,41 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern at 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 at niedermayer.cc>
+Signed-off-by: James Zern <jzern at 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
+