Slight changes to mplayer2 PKGBUILD

1 files changed, 16 insertions, 56 deletions

diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 4a4da3547..b1d8186fb 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,73 +1,33 @@
-# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $
+# $Id$
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Bartek Piotrowski <barthalion@gmail.com>
 
 pkgname=mplayer2
-pkgver=2.0.20111101
-pkgrel=1.1
+_commit=3a39fc1
+pkgver="2.0.20111114+g${_commit}"
+_snapshot="${pkgname}-${_commit}"
+pkgrel=1
 pkgdesc="A movie player"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.mplayer2.org/"
-if [ "${CARCH}" = "mips64el" ] ; then
-    # OpenGL, VDPAU and XVMC don't have efficient implementations on
-    # the supported mips64el machines.
-    depends=('ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libass' 'fontconfig' 'freetype2'
-        'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 
-        'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex' 'libxv')
-    makedepends=('live-media' 'p7zip-libre' 'gettext')
-else
-    depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
-        'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' 
-        'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex')
-    makedepends=('live-media' 'mesa' 'p7zip-libre' 'yasm' 'gettext')
-fi
+depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
+         'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
+         'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa')
+makedepends=('mesa' 'unzip' 'yasm' 'git')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
-#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
+source=("http://git.${pkgname}.org/${pkgname}/snapshot/${_snapshot}.tar.xz")
+sha1sums=('ae4542ae6bbe00110aed32708d097ec5f611f0de')
 options=('!emptydirs')
 
-# source PKGBUILD && mksource
-mksource() {
-  _gitroot="git://git.mplayer2.org/mplayer2.git"
-  _gitname="${pkgname}-${pkgver}"
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  tar -cJvf ${_gitname}.tar.xz ${_gitname}
-  rm -fr ${_gitname}
-}
-
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${_snapshot}"
 
-    if [ "$CARCH" = "mips64el" ]; then
-    ./configure --prefix=/usr \
-                --disable-arts \
-                --enable-speex \
-                --disable-openal \
-                --disable-libdv \
-                --disable-musepack \
-                --disable-esd \
-                --disable-mga \
-                --disable-vdpau \
-                --disable-gl \
-                --enable-xv \
-                --language=all \
-                --enable-translation \
-                --confdir=/etc/mplayer
-    else
     ./configure --prefix=/usr \
-                --enable-runtime-cpudetection \
                 --disable-arts \
-                --enable-speex \
+                --disable-speex \
                 --disable-openal \
                 --disable-libdv \
                 --disable-musepack \
@@ -75,13 +35,13 @@ build() {
                 --disable-mga \
                 --language=all \
                 --enable-translation \
-                --confdir=/etc/mplayer
-    fi
+                --confdir=/etc/mplayer \
+                --disable-live  # Disabled by default in Uoti’s Git branch
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    cd "${srcdir}/${_snapshot}"
 
     make DESTDIR="${pkgdir}" install
     install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/