[arch-commits] Commit in mplayer/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Monday, March 24, 2014 @ 10:21:11
  Author: bpiotrowski
Revision: 208539

upgpkg: mplayer 37051-1

rebuild against ffmpeg 2.2

Modified:
  mplayer/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-24 09:06:25 UTC (rev 208538)
+++ PKGBUILD	2014-03-24 09:21:11 UTC (rev 208539)
@@ -4,8 +4,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=36498
-pkgrel=5
+pkgver=37051
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=(
     'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -18,13 +18,14 @@
 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=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz{,.sig}
+        http://ffmpeg.org/releases/ffmpeg-2.2.tar.bz2
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch)
-md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
-         '4ec1cedd4c7753512462f70b347c338a'
+md5sums=('0407ab1f9613dcd6bce06a80ac0b028b'
+         'SKIP'
+         '744febca199548c9393b1f1ed05ccdd8'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d')
@@ -34,7 +35,7 @@
     patch -p0 -i ../cdio-includes.patch
     patch -p1 -i ../include-samba-4.0.patch
 
-    mv ../ffmpeg-2.1 ./ffmpeg
+    mv ../ffmpeg-2.2 ./ffmpeg
 }
 
 build() {
@@ -58,7 +59,7 @@
         --enable-radio-capture \
         --enable-smb \
         --language=all \
-        --confdir=/etc/mplayer 
+        --confdir=/etc/mplayer
     [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
     make
@@ -65,7 +66,7 @@
 }
 
 package_mplayer() {
-    pkgdesc="A movie player for linux"
+    pkgdesc='Media player for Linux'
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=(
@@ -83,24 +84,23 @@
     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"
+    # 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"
+        "$pkgdir"/usr/share/pixmaps/mplayer.png
 }
 
 package_mencoder() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool"
+    pkgdesc='Free command line video decoding, encoding and filtering tool'
     depends=(
         'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
         'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
-        'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 
+        'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
         'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
         'libvorbis' 'opus'
         )
 
-    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 {} +
 }