Date: Sunday, October 17, 2010 @ 20:20:50 Author: eric Revision: 95269
upgpkg: xmms 1.2.11-3 Improved description, Updated url, Added mikmod plugin, Changed some depends to optdepends Modified: xmms/trunk/PKGBUILD Deleted: xmms/trunk/ChangeLog -----------+ ChangeLog | 8 ----- PKGBUILD | 82 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 43 insertions(+), 47 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2010-10-17 20:55:11 UTC (rev 95268) +++ ChangeLog 2010-10-18 00:20:50 UTC (rev 95269) @@ -1,8 +0,0 @@ -2009-01-19 Eric Belanger <[email protected]> - - * xmms 1.2.11-2 - * Added to [extra] repo - * Added several patches including a security fix from Mandriva - * FHS man pages - * Added new icons - * Added ChangeLog Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-10-17 20:55:11 UTC (rev 95268) +++ PKGBUILD 2010-10-18 00:20:50 UTC (rev 95269) @@ -3,15 +3,20 @@ pkgname=xmms pkgver=1.2.11 -pkgrel=2 -pkgdesc="The X MultiMedia System" +pkgrel=3 +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' 'esound' 'alsa-lib' 'libgl') -makedepends=('mesa') +depends=('gtk' 'libxxf86vm' 'libsm') +makedepends=('mesa' 'libmikmod' 'libvorbis' 'esound' 'alsa-lib' 'libgl') +optdepends=('libmikmod: for the MikMod input plugin' \ + 'libvorbis: for the Ogg Vorbis input plugin' \ + 'esound: for the esound output 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 \ +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 \ @@ -22,51 +27,50 @@ '2b534832b0dbb0d06dbcc829e2b702e6' 'd1715c291d35ee8854e5d926912e8b0d'\ '408ea5e28c4c4c221cf3c8ded76fd1f0' '3c328565c99c85d92ac0b9918805da46'\ '128406a02c07cd477dc901f2a658add5' 'd022280df4379383732a8a26abea1d08') -sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' - '27fb6e21bd6db923a425a8df8bd07a2a93867ddb' - 'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5' - 'c227284955f2cc16f027dade670155c0f0fbc4ff' - '4ef47c34b27b6c868d4301b7a078b257c8604471' - '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5' - '6f6db13c780ba4cbddb8613f0abd2db2823f3021' - '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92' - '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' - '0089d11aa3bce67f3496592d68ee65837406e220' - 'f24071ae484d9b55e61dba076801fa8e7976ff2f' - '485c67cb8c8d4678bb3b0b280d2e233b14153b22') +sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d' '27fb6e21bd6db923a425a8df8bd07a2a93867ddb'\ + 'ff5c172752c8bee708d9a9ecd53864cc95a4bcc5' 'c227284955f2cc16f027dade670155c0f0fbc4ff'\ + '4ef47c34b27b6c868d4301b7a078b257c8604471' '0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'\ + '6f6db13c780ba4cbddb8613f0abd2db2823f3021' '2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'\ + '31abd37c9c57bd13b2088eb11a1e54e5aa312bf3' '0089d11aa3bce67f3496592d68ee65837406e220'\ + 'f24071ae484d9b55e61dba076801fa8e7976ff2f' '485c67cb8c8d4678bb3b0b280d2e233b14153b22') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # Fix xmms.desktop - patch -p0 < ../xmms-menu.patch || return 1 + patch -p0 < ../xmms-menu.patch # Patch for hang with xmms-crossfade - patch -p1 < ../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 -p1 < ../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 || return 1 - patch -p0 < ../xmms-1.2.10-recode-id3.patch || return 1 - patch -p1 < ../xmms-1.2.11-3dse.patch || return 1 - patch -p1 < ../xmms-1.2.10-fonts.patch || return 1 - patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch || return 1 + 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 --mandir=/usr/share/man --disable-mikmod --disable-simd || return 1 # for x86_64 + SIMDOPT="--disable-simd" else - ./configure --prefix=/usr --mandir=/usr/share/man --disable-mikmod --enable-simd || return 1 # for i686 + SIMDOPT="--enable-simd" fi - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man $SIMDOPT + make +} - 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 +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 ${pkgdir}/usr/bin/wmxmms ${pkgdir}/usr/share/xmms - rm -f ${pkgdir}/usr/share/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} }
