mplayer-libre-37051-2: updating version

* rebuild against ffmpeg 2.2

1 files changed, 85 insertions, 78 deletions

diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 35054754d..8600ea77f 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 208941 2014-03-28 21:27:08Z bpiotrowski $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
@@ -7,109 +8,115 @@
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=36498
-pkgrel=5
+pkgver=37051
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=(
-    'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
-    'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
-    'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
-    'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
-    'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-    'libcdio-paranoia' 'opus'
-    )
+  'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+  'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+  'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+  'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+  'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+  'libcdio-paranoia' 'opus'
+)
 license=('GPL')
 url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
-        http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
+source=($_pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
+        http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch)
-md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
-         '4ec1cedd4c7753512462f70b347c338a'
+md5sums=('SKIP'
+         '744febca199548c9393b1f1ed05ccdd8'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d')
 
+pkgver() {
+  cd $_pkgbase-$pkgver
+  svnversion
+}
+
 prepare() {
-    cd $_pkgbase-$pkgver
-    patch -p0 -i ../cdio-includes.patch
-    patch -p1 -i ../include-samba-4.0.patch
+  cd $_pkgbase-$pkgver
+  mv ../ffmpeg-2.2 ./ffmpeg
+
+  patch -p0 -i ../cdio-includes.patch
+  patch -p1 -i ../include-samba-4.0.patch
 
-    mv ../ffmpeg-2.1 ./ffmpeg
+  ./version.sh
 }
 
 build() {
-    cd $_pkgbase-$pkgver
+  cd $_pkgbase-$pkgver
 
-    ./configure --prefix=/usr \
-        --enable-runtime-cpudetection \
-        --disable-gui \
-        --disable-arts \
-        --disable-liblzo \
-        --disable-speex \
-        --disable-openal \
-        --disable-libdv \
-        --disable-musepack \
-        --disable-esd \
-        --disable-mga \
-        --disable-ass-internal \
-        --disable-cdparanoia \
-        --enable-xvmc \
-        --enable-radio \
-        --enable-radio-capture \
-        --enable-smb \
-        --language=all \
-        --confdir=/etc/mplayer 
-    [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+  ./configure --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --disable-speex \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --disable-cdparanoia \
+    --enable-xvmc \
+    --enable-radio \
+    --enable-radio-capture \
+    --enable-smb \
+    --language=all \
+    --confdir=/etc/mplayer
+  [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
-    make
+  make
 }
 
 package_mplayer-libre() {
-    pkgdesc="A movie player for GNU/Linux, without nonfree faac support"
-    install=mplayer.install
-    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'
-        'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
-        'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
-        'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
-        'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
-    )
-    provides=("mplayer=$pkgver")
-    replaces=('mplayer')
-    conflicts=('mplayer')
+  pkgdesc='Media player for GNU/Linux, without nonfree faac support'
+  install=mplayer.install
+  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'
+    'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+    'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+    'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+    'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+  )
+  provides=("mplayer=$pkgver")
+  replaces=('mplayer')
+  conflicts=('mplayer')
 
-    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/"
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+    "$pkgdir/etc/mplayer/"
 
-    # desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" \
-        "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png \
-        "$pkgdir/usr/share/pixmaps/mplayer.png"
+  # 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
 }
 
 package_mencoder-libre() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support"
-    depends=(
-        'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
-        'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
-        'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
-        'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
-        'libvorbis' 'opus'
-        )
-    provides=("mencoder=$pkgver")
-    replaces=('mencoder')
-    conflicts=('mencoder')
+  pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support'
+  depends=(
+    'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+    'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+    'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
+    'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+    'libvorbis' 'opus'
+  )
+  provides=("mencoder=$pkgver")
+  replaces=('mencoder')
+  conflicts=('mencoder')
 
-    cd $_pkgbase-$pkgver
-    make 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 {} +
 }