summaryrefslogtreecommitdiff
path: root/extra/xmms
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-11-17 01:32:38 -0800
committerroot <root@rshg054.dnsready.net>2012-11-17 01:32:38 -0800
commit071ecd58a9b69020ec170e7f89009a603e885371 (patch)
treec32fc487de5e9afc5bb12c053775982fdd2c6b7d /extra/xmms
parent99c34471cedb5de3afae4e33c48239abbe1410c7 (diff)
Sat Nov 17 01:27:29 PST 2012
Diffstat (limited to 'extra/xmms')
-rw-r--r--extra/xmms/PKGBUILD8
-rw-r--r--extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch20
2 files changed, 25 insertions, 3 deletions
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index faaef3fa9..026657181 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170551 2012-11-08 15:28:46Z heftig $
+# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=xmms
pkgver=1.2.11
-pkgrel=5
+pkgrel=6
pkgdesc="The X MultiMedia System - a multimedia player"
arch=('i686' 'x86_64')
url="http://legacy.xmms2.org/"
@@ -19,7 +19,7 @@ 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.11-3dse.patch xmms-1.2.10-recode-id3.patch xmms-1.2.11-fix-mikmod-driver.patch \
xmms-1.2.10-fonts.patch xmms.16.png xmms.32.png xmms.48.png)
sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
'27fb6e21bd6db923a425a8df8bd07a2a93867ddb'
@@ -29,6 +29,7 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
'0c060385561ea2a4b1c7ad3bd35d3646ae9554f5'
'6f6db13c780ba4cbddb8613f0abd2db2823f3021'
'2a3b1bf17054b6bd8b1e5937de5c0ad49af8dc92'
+ '155e11b344af1ba594b4e339640bcca37c8909af'
'31abd37c9c57bd13b2088eb11a1e54e5aa312bf3'
'0089d11aa3bce67f3496592d68ee65837406e220'
'f24071ae484d9b55e61dba076801fa8e7976ff2f'
@@ -49,6 +50,7 @@ build() {
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
+ patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
if [ "$CARCH" == "i686" ]; then
SIMDOPT="--enable-simd"
diff --git a/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
new file mode 100644
index 000000000..c2d1b4c77
--- /dev/null
+++ b/extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch
@@ -0,0 +1,20 @@
+--- a/Input/mikmod/drv_xmms.c 2003-05-19 23:22:06.000000000 +0200
++++ b/Input/mikmod/drv_xmms.c 2012-11-16 18:52:41.264644767 +0100
+@@ -117,6 +117,10 @@
+ return VC_Init();
+ }
+
++static void xmms_CommandLine(CHAR * commandLine)
++{
++}
++
+ MDRIVER drv_xmms =
+ {
+ NULL,
+@@ -126,5 +130,6 @@
+ "xmms",
+ NULL,
+ #endif
++ xmms_CommandLine, // Was missing
+ xmms_IsThere,
+ VC_SampleLoad,