mplayer: update to 37224

1 files changed, 24 insertions, 18 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 01b69c4..7dbdf3f 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -5,42 +5,48 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37051
+pkgver=37224
 pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
   'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca'
-  'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+  'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
   'libdca' 'a52dec' 'schroedinger' 'libvpx' 'fribidi' 'unzip' 'mesa'
   'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-  'libcdio-paranoia' 'opus'
+  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gsm'
 )
 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.2.tar.bz2
+        http://ffmpeg.org/releases/ffmpeg-2.2.10.tar.bz2
         mplayer.desktop
         cdio-includes.patch
-        include-samba-4.0.patch)
+        include-samba-4.0.patch
+        giflib51.patch
+        revert-icl-fixes.patch)
 md5sums=('SKIP'
-         '744febca199548c9393b1f1ed05ccdd8'
+         'f40a829f5075c8ee901e5dbc6d40c209'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
-         '868a92bdef148df7f38bfa992b26ce9d')
+         '868a92bdef148df7f38bfa992b26ce9d'
+         '14461fb94b7aa5dda091ba4f737df2d9'
+         '3579402002b7302fdf2d146639333efd')
 
-#pkgver() {
-#  cd $pkgbase-$pkgver
-#  svnversion
-#}
+pkgver() {
+  cd $pkgbase-$pkgver
+  svnversion
+}
 
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-2.2 ./ffmpeg
+  mv ../ffmpeg-2.2.10 ./ffmpeg
 
   patch -p0 -i ../cdio-includes.patch
   patch -p1 -i ../include-samba-4.0.patch
+  patch -Np0 -i ../giflib51.patch
+  patch -Np0 -i ../revert-icl-fixes.patch
 
   ./version.sh
 }
@@ -78,11 +84,12 @@ package_mplayer() {
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
   depends=(
     'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-    'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+    'lirc-utils' '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'
+    'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump'
+    'gsm'
   )
 
   cd $pkgbase-$pkgver
@@ -101,14 +108,13 @@ package_mplayer() {
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool'
   depends=(
-    'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+    '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'
+    'libvorbis' 'opus' 'rtmpdump' 'gsm'
   )
 
   make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
-  #find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
-  rm -rf $pkgdir/usr/share/man
+  find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
 }