From a07858bf96292d21bc4350166a71ed0bff042402 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 23 Jul 2016 22:10:54 +0000
Subject: mplayer: update to 37857

---
 abs/core/mplayer/PKGBUILD                          | 50 +++++++---------------
 abs/core/mplayer/__changelog                       |  1 -
 ...pxenc-remove-some-unused-ctrl-id-mappings.patch | 41 ------------------
 abs/core/mplayer/mplayer.install                   | 11 -----
 4 files changed, 15 insertions(+), 88 deletions(-)
 delete mode 100644 abs/core/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
 delete mode 100644 abs/core/mplayer/mplayer.install

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index d282afc..4d95801 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -5,49 +5,35 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37379
-pkgrel=6
+pkgver=37857
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=(
-  'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
-  'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca'
-  'faac' 'faad2' 'lirc'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
-  'libdca' 'a52dec' 'schroedinger' 'libvpx' 'fribidi' 'unzip' 'mesa'
-  'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
-  'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
+  'libxxf86dga' 'libmad' 'libxinerama'
+  'libmng' 'libxss' 'smbclient' 'aalib' 'libcaca'
+  'faac' 'faad2' 'lirc'  'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa'
+  'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 
+  'libcdio-paranoia' 'subversion' 'x264' 'libx264' 'rtmpdump'
+  'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg'
 )
 license=('GPL')
 url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
-        http://ffmpeg.org/releases/ffmpeg-2.6.2.tar.bz2
         mplayer.desktop
-        cdio-includes.patch
         include-samba-4.0.patch
-        ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
         revert-icl-fixes.patch)
 md5sums=('SKIP'
-         'e75d598921285d6775f20164a91936ac'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
-         '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
-         '71be9bcd297cb9ce833bbc5d425c0470'
          '3579402002b7302fdf2d146639333efd')
 
-pkgver() {
-  cd $pkgbase-$pkgver
-  svnversion
-}
-
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-*/ ./ffmpeg
+#  mv ../ffmpeg-*/ ./ffmpeg
 
-  patch -Np0 -i ../cdio-includes.patch
   patch -Np1 -i ../include-samba-4.0.patch
   patch -Np0 -i ../revert-icl-fixes.patch
-  patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
 
   ./version.sh
 }
@@ -68,6 +54,7 @@ build() {
     --disable-mga \
     --disable-ass-internal \
     --disable-cdparanoia \
+    --disable-ffmpeg_a \
     --enable-xvmc \
     --enable-radio \
     --enable-radio-capture \
@@ -81,16 +68,12 @@ build() {
 
 package_mplayer() {
   pkgdesc='Media player for Linux'
-  install=mplayer.install
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
   depends=(
     'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-    'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
-    'libgl' 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore'
-    'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
-    'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
-    'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
-    'gsm' 'gnutls' 'libdvdnav'
+    'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
+    'libmad' 'libcaca' 'libxxf86dga' 'faac' 'faad2' 'libxvmc' 'mpg123'
+    'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
   )
 
   cd $pkgbase-$pkgver
@@ -109,11 +92,8 @@ package_mplayer() {
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool'
   depends=(
-    'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
-    'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
-    'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
-    'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
-    'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav'
+    'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'smbclient' 'libmad' 'faac' 'faad2'
+    'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
   )
 
   make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
diff --git a/abs/core/mplayer/__changelog b/abs/core/mplayer/__changelog
index c723332..345be54 100644
--- a/abs/core/mplayer/__changelog
+++ b/abs/core/mplayer/__changelog
@@ -1,2 +1 @@
-PKGBUILD - remove dep libpulse
 PKGBUILD - remove dep jack
diff --git a/abs/core/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/abs/core/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
deleted file mode 100644
index 15d2600..0000000
--- a/abs/core/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-
diff --git a/abs/core/mplayer/mplayer.install b/abs/core/mplayer/mplayer.install
deleted file mode 100644
index 660593c..0000000
--- a/abs/core/mplayer/mplayer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
-- 
cgit v0.12

