mplayer: update to 38017

3 files changed, 44 insertions, 96 deletions

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 4d95801..c59bebe 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -1,46 +1,43 @@
-# $Id$
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Levente Polyak <anthraxx@archlinux.org>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=37857
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=(
-  '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')
+pkgver=38017
+pkgrel=1
+pkgdesc='Media player for Linux'
 url='http://www.mplayerhq.hu/'
-options=('!buildflags' '!emptydirs')
-source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
+arch=('x86_64')
+license=('GPL')
+makedepends=('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')
+options=('!emptydirs')
+source=(${pkgbase}-${pkgver}::"svn://svn.mplayerhq.hu/mplayer/trunk#revision=${pkgver}"
         mplayer.desktop
         include-samba-4.0.patch
         revert-icl-fixes.patch)
-md5sums=('SKIP'
-         '62f44a58f072b2b1a3c3d3e4976d64b3'
-         '868a92bdef148df7f38bfa992b26ce9d'
-         '3579402002b7302fdf2d146639333efd')
+sha512sums=('SKIP'
+            'd3c5cbf0035279c6f307e4e225473d7b77f9b56566537a26aa694e68446b9e3240333296da627ad5af83b04cc8f476d1a3f8c05e4cf81cd6e77153feb4ed74bc'
+            '9debb8c58b996f6c716c22c86c720bf9dc49b4ee9b76c57519f791667ae1de2cc6f5add878fbf4ac02c6b6fd1865e1bcfa6105e75de4bf7ec596c338ed0cae99'
+            '0cae0b26d3d97fd4c962962c43a481de20335369cbca406cadfc9bda1a0608b32f5374e76c477cb9a85bda83a568a1ed17126df224ae61579d0a402c1824aea8')
 
 prepare() {
-  cd $pkgbase-$pkgver
-#  mv ../ffmpeg-*/ ./ffmpeg
-
-  patch -Np1 -i ../include-samba-4.0.patch
-  patch -Np0 -i ../revert-icl-fixes.patch
-
+  cd ${pkgbase}-${pkgver}
+  patch -p1 < "../include-samba-4.0.patch"
+  patch -p0 < "../revert-icl-fixes.patch"
   ./version.sh
 }
 
 build() {
-  cd $pkgbase-$pkgver
-
+  cd ${pkgbase}-${pkgver}
+  export CFLAGS="${CFLAGS/-march=x86-64/}"
+  export CFLAGS="${CFLAGS/-mtune=generic/}"
+  export LDFLAGS="${LDFLAGS/,O1/}"
+  export LDFLAGS="${LDFLAGS/,--sort-common/}"
   ./configure --prefix=/usr \
     --enable-runtime-cpudetection \
     --disable-gui \
@@ -60,42 +57,36 @@ build() {
     --enable-radio-capture \
     --enable-smb \
     --language=all \
-    --confdir=/etc/mplayer
-  [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
+    --confdir=/etc/mplayer \
+    --extra-cflags="${CFLAGS}" \
+    --extra-ldflags="${LDFLAGS}"
+  [[ "${CARCH}" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
   make
 }
 
 package_mplayer() {
   pkgdesc='Media player for Linux'
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-  depends=(
-    'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-    'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
-    'libmad' 'libcaca' 'libxxf86dga' 'faac' 'faad2' 'libxvmc' 'mpg123'
-    'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
-  )
+  depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
+           'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient'
+           'libmad' 'libcaca' 'libxxf86dga' 'faac' 'faad2' 'libxvmc' 'mpg123'
+           'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg')
 
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
 
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
-    "$pkgdir/etc/mplayer/"
-
-  # desktop file (FS#14770)
-  install -Dm644 ../mplayer.desktop \
-    "$pkgdir"/usr/share/applications/mplayer.desktop
-  install -Dm644 etc/mplayer256x256.png \
-    "$pkgdir"/usr/share/pixmaps/mplayer.png
+  install -Dm 644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer"
+  install -Dm 644 "${srcdir}/mplayer.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dm 644 etc/mplayer256x256.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool'
-  depends=(
-    'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'smbclient' 'libmad' 'faac' 'faad2'
-    'mpg123' 'libcdio-paranoia' 'rtmpdump' 'libdvdnav' 'ffmpeg'
-  )
+  depends=('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
-  find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+  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 {} +
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/abs/core/mplayer/cdio-includes.patch b/abs/core/mplayer/cdio-includes.patch
deleted file mode 100644
index f714728..0000000
--- a/abs/core/mplayer/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
- 
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/abs/core/mplayer/mplayer.png b/abs/core/mplayer/mplayer.png
deleted file mode 100644
index 7997693..0000000
--- a/abs/core/mplayer/mplayer.png
+++ /dev/null