summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Toombs2015-11-16 15:29:25 -0500
committerEric Toombs2015-11-16 15:29:25 -0500
commit473b345d678f4d992e54a6e821678473e61375d2 (patch)
tree12c7255a76818061e9d5ba87bf7211013d32d460
parentd51d8fee47856dfec31ab36df1866e683d8a1a1d (diff)
downloadaur-473b345d678f4d992e54a6e821678473e61375d2.tar.gz
Updated all components, patched new ffmpeg so it would build.
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch41
3 files changed, 56 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44a113ae406..1227bc5cb56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = mplayer-svn
- pkgver = 37551
+ pkgver = 37553
pkgrel = 1
url = http://www.mplayerhq.hu/
arch = i686
@@ -55,12 +55,14 @@ pkgbase = mplayer-svn
makedepends = libdvdnav
options = !buildflags
options = !emptydirs
- source = mplayer-37551::svn://svn.mplayerhq.hu/mplayer/trunk#revision=37551
- source = http://ffmpeg.org/releases/ffmpeg-2.8.1.tar.bz2
+ source = mplayer-37553::svn://svn.mplayerhq.hu/mplayer/trunk#revision=37553
+ source = http://ffmpeg.org/releases/ffmpeg-2.8.2.tar.bz2
source = mplayer.desktop
+ source = ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
md5sums = SKIP
- md5sums = 63b2cfeea930e942ff7579fd0064c5be
+ md5sums = 99f31723326dfe1bfd1bc7521338f2d2
md5sums = 62f44a58f072b2b1a3c3d3e4976d64b3
+ md5sums = 71be9bcd297cb9ce833bbc5d425c0470
pkgname = mplayer-svn
pkgdesc = Media player for Linux
diff --git a/PKGBUILD b/PKGBUILD
index ea89dd3620c..d0c7513edd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
pkgbase='mplayer-svn'
pkgname=('mplayer-svn' 'mencoder-svn')
-pkgver=37551
+pkgver=37553
pkgrel=1
-_ffmpegver=2.8.1
+_ffmpegver=2.8.2
arch=('i686' 'x86_64')
makedepends=(
'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -23,10 +23,12 @@ url='http://www.mplayerhq.hu/'
options=('!buildflags' '!emptydirs')
source=("mplayer-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver"
"http://ffmpeg.org/releases/ffmpeg-$_ffmpegver.tar.bz2"
- 'mplayer.desktop')
+ 'mplayer.desktop'
+ 'ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch')
md5sums=('SKIP'
- '63b2cfeea930e942ff7579fd0064c5be'
- '62f44a58f072b2b1a3c3d3e4976d64b3')
+ '99f31723326dfe1bfd1bc7521338f2d2'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '71be9bcd297cb9ce833bbc5d425c0470')
pkgver() {
cd "mplayer-$pkgver"
@@ -37,6 +39,8 @@ prepare() {
cd "mplayer-$pkgver"
mv "../ffmpeg-$_ffmpegver" ffmpeg
+ patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+
./version.sh
}
diff --git a/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
new file mode 100644
index 00000000000..15d2600d1c4
--- /dev/null
+++ b/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
+