xmms 1.2.11

1 files changed, 57 insertions, 31 deletions

diff --git a/abs/extra/xmms/PKGBUILD b/abs/extra/xmms/PKGBUILD
index 533c227..1a4e74b 100644
--- a/abs/extra/xmms/PKGBUILD
+++ b/abs/extra/xmms/PKGBUILD
@@ -1,50 +1,76 @@
-# $Id: PKGBUILD,v 1.3 2007/12/06 01:18:06 Snowman Exp $
-# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
+# $Id: PKGBUILD 146759 2012-01-17 03:41:24Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=1
-pkgdesc="The X MultiMedia System"
+pkgrel=4
+pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64')
-url="http://www.xmms.org"
+url="http://legacy.xmms2.org/"
 license=('GPL')
-depends=('libsm' 'libxxf86vm' 'zlib' 'gtk' 'libvorbis' 'esd' 'alsa-lib' 'libgl')
-makedepends=('mesa')
+depends=('gtk' 'libxxf86vm' 'libsm' 'desktop-file-utils')
+makedepends=('mesa' 'libmikmod' 'libvorbis' 'alsa-lib' 'libgl')
+optdepends=('libmikmod: for the MikMod input plugin' \
+            'libvorbis: for the Ogg Vorbis input plugin' \
+            'alsa-lib: for the alsa output plugin' \
+            'libgl: for the OpenGL Spectrum analyser visualization plugin')
 options=('!libtool')
-source=(http://www.xmms.org/files/1.2.x/$pkgname-$pkgver.tar.bz2 \
-	xmms-menu.patch \
-	xmms-1.2.10-crossfade-0.3.9.patch \
-	xmms-fix.diff)
-md5sums=('f3e6dbaf0b3f571a532ab575656be506' 'b7b6f1811bad8d14e4c4534240e45980'\
-         '4eb222111a82a2e1ebe63b5f6109133d' 'd7f9dc3712c486658149c4504f7478a7')
+install=xmms.install
+source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
+	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
+        xmms-1.2.11-CVE-2007-0653.0654.patch xmms-1.2.11-fix-http-title-mpg123.patch \
+        xmms-1.2.11-3dse.patch xmms-1.2.10-recode-id3.patch \
+        xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png)
 sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
           '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
           'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5'
-          'c227284955f2cc16f027dade670155c0f0fbc4ff')
+          'c227284955f2cc16f027dade670155c0f0fbc4ff'
+          '4ef47c34b27b6c868d4301b7a078b257c8604471'
+          '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'
+          '6f6db13c780ba4cbddb8613f0abd2db2823f3021'
+          '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'
+          '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3'
+          '0089d11aa3bce67f3496592d68ee65837406e220'
+          'f24071ae484d9b55e61dba076801fa8e7976ff2f'
+          '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-# Add id3v2 editing feature (doesn't apply atm, needs to be redone)
-#  patch -Np1 -i ../id3v2.patch || return 1
 # Fix xmms.desktop
-  patch -Np0 -i ../xmms-menu.patch || return 1
+  patch -p0 < ../xmms-menu.patch
 # Patch for hang with xmms-crossfade 
-  patch -Np1 -i ../xmms-1.2.10-crossfade-0.3.9.patch || return 1
+  patch -p1 < ../xmms-1.2.10-crossfade-0.3.9.patch
 # fix xmms not able to be shown double size,at least needed for x86_64
-  patch -Np1 -i ../xmms-fix.diff || return 1
+  patch -p1 < ../xmms-fix.diff
+# Several patches from Mandriva
+  patch -p1 < ../xmms-1.2.11-fix-http-title-mpg123.patch
+  patch -p0 < ../xmms-1.2.10-recode-id3.patch
+  patch -p1 < ../xmms-1.2.11-3dse.patch
+  patch -p1 < ../xmms-1.2.10-fonts.patch
+  patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
 
-  if [ "$CARCH" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mikmod --disable-simd	# for x86_64
-  else 
-    ./configure --prefix=/usr --disable-mikmod --enable-simd	# for i686
+  if [ "$CARCH" == "i686" ]; then
+    SIMDOPT="--enable-simd"
+  else
+    SIMDOPT="--disable-simd"
   fi
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
-  install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications
-  install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm
+  ./configure --prefix=/usr --mandir=/usr/share/man $SIMDOPT
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop"
+  install -D -m644 xmms/xmms_mini.xpm "${pkgdir}/usr/share/pixmaps/xmms_mini.xpm"
+  install -D -m644 ../xmms.16.png "${pkgdir}/usr/share/pixmaps/xmms16.png"
+  install -D -m644 ../xmms.32.png "${pkgdir}/usr/share/pixmaps/xmms32.png"
+  install -D -m644 ../xmms.48.png "${pkgdir}/usr/share/pixmaps/xmms48.png"
+  ln -s /usr/share/pixmaps/xmms48.png "${pkgdir}/usr/share/pixmaps/xmms.png"
+
   # don't want wmxmms
-  rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms
-  rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1}
+  rm -rf "${pkgdir}/usr/bin/wmxmms" "${pkgdir}/usr/share/xmms"
+  rm -f "${pkgdir}"/usr/share/man/man1/{gnomexmms.1,wmxmms.1}
 }