diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-17 15:19:29 +0100 |
| commit | a66ad9f55f1788fcab4028fefb2c91e563fec35c (patch) | |
| tree | 93e3cfd6d5cee5dc334cd6582c789b1429f23694 /extra/xmms | |
| parent | 36128f354db7ef055305ffd69c29af225c6ca182 (diff) | |
| parent | 071ecd58a9b69020ec170e7f89009a603e885371 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keepassx/PKGBUILD
core/iputils/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kismet/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/sound-juicer/PKGBUILD
extra/wxgtk/PKGBUILD
kde-unstable/akonadi/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
Diffstat (limited to 'extra/xmms')
| -rw-r--r-- | extra/xmms/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/xmms/xmms-1.2.11-fix-mikmod-driver.patch | 20 |
2 files changed, 25 insertions, 3 deletions
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD index d1c92866e..b1d1a6dd0 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' 'mips64el') 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() { [ "$CARCH" != "mips64el" ] && 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, |