mplayer: update to 37379

2 files changed, 12 insertions, 38 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index fbf15d9..4c2e1e4 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,37 +1,36 @@
 # $Id$
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37224
-pkgrel=5
+pkgver=37379
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
   'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca'
-  'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+  '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' 'gsm'
+  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
+  'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
 )
 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.10.tar.bz2
+        http://ffmpeg.org/releases/ffmpeg-2.6.2.tar.bz2
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch
-        giflib51.patch
         revert-icl-fixes.patch)
 md5sums=('SKIP'
-         'f40a829f5075c8ee901e5dbc6d40c209'
+         'e75d598921285d6775f20164a91936ac'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
-         '14461fb94b7aa5dda091ba4f737df2d9'
          '3579402002b7302fdf2d146639333efd')
 
 pkgver() {
@@ -41,11 +40,10 @@ pkgver() {
 
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-2.2.10 ./ffmpeg
+  mv ../ffmpeg-*/ ./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
@@ -84,12 +82,12 @@ package_mplayer() {
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
   depends=(
     'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-    'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+    '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'
+    'gsm' 'gnutls' 'libdvdnav'
   )
 
   cd $pkgbase-$pkgver
@@ -112,7 +110,7 @@ package_mencoder() {
     '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'
+    'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav'
   )
 
   make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
diff --git a/abs/core/mplayer/giflib51.patch b/abs/core/mplayer/giflib51.patch
deleted file mode 100644
index e884b39..0000000
--- a/abs/core/mplayer/giflib51.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libvo/vo_gif89a.c.orig	2014-06-11 10:06:29.243216331 +0000
-+++ libvo/vo_gif89a.c	2014-06-11 10:08:37.346078847 +0000
-@@ -75,6 +75,9 @@
- #define MakeMapObject GifMakeMapObject
- #define FreeMapObject GifFreeMapObject
- #define QuantizeBuffer GifQuantizeBuffer
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
-+#endif
- #endif
- 
- // how many frames per second we are aiming for during output.
---- libmpdemux/demux_gif.c.orig	2014-06-11 10:46:48.120883788 +0000
-+++ libmpdemux/demux_gif.c	2014-06-11 10:47:28.290732272 +0000
-@@ -50,6 +50,9 @@
- #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
- #define GifError() (gif ? gif->Error : 0)
- #define GifErrorString() GifErrorString(gif->Error)
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
-+#endif
- #endif
- 
- /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */