diff options
Diffstat (limited to 'extra/libmikmod')
-rw-r--r-- | extra/libmikmod/PKGBUILD | 46 | ||||
-rw-r--r-- | extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff | 12 |
2 files changed, 33 insertions, 25 deletions
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index e71aa0d44..3cde12fec 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,43 +1,39 @@ -# $Id: PKGBUILD 149426 2012-02-07 16:55:08Z heftig $ +# $Id: PKGBUILD 170549 2012-11-08 15:28:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod -pkgver=3.1.12 -pkgrel=4 +pkgver=3.2.0 +pkgrel=1 pkgdesc="A portable sound library" license=('GPL' 'LGPL') -url="http://sourceforge.net/projects/mikmod/" +url="http://mikmod.shlomifish.org/" arch=('i686' 'x86_64') -depends=('glibc') +depends=('glibc' 'sh') +makedepends=('alsa-lib') options=('!libtool') install=$pkgname.install -source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz - libmikmod-3.1.12-64bit-fix.diff - libmikmod-3.1.12-exitcrash-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff - libmikmod-3.1.12-md_sngchn-fix.diff - libmikmod-CVE-2009-0179.patch) -md5sums=('9f3c740298260d5f88981fc0d51f6f16' - 'dc7ffd8d6d355e9d6ec671b7f2b2adc7' - '03a4f5bfcecddf5f515672d6d477b7f7' - 'a837fd876cbd2ac27419b802504489db' - '076d39de19de36b880ed90297f1ee0d1' - 'fa91f4bc17164be32bec0ea7a73f2aaa') +source=($url/files/$pkgname-$pkgver.tar.gz + libmikmod-3.2.0-64bit-fix.diff + libmikmod-3.1.12-loopingvolume-fix.diff) +md5sums=('96e9820d72a41fe27ff304071739696c' + '0bb09aac6e83e0a7fd6535961b3cff4c' + 'a837fd876cbd2ac27419b802504489db') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff + patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make || return 1 - make DESTDIR=$pkgdir install + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff new file mode 100644 index 000000000..c965f9ab7 --- /dev/null +++ b/extra/libmikmod/libmikmod-3.2.0-64bit-fix.diff @@ -0,0 +1,12 @@ +diff -u -r libmikmod-3.2.0-orig/include/mikmod.h libmikmod-3.2.0/include/mikmod.h +--- libmikmod-3.2.0-orig/include/mikmod.h 2012-06-01 15:15:42.000000000 +0200 ++++ libmikmod-3.2.0/include/mikmod.h 2012-10-03 20:03:48.173576199 +0200 +@@ -85,7 +85,7 @@ + + + +-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) ++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64) + /* 64 bit architectures */ + + typedef signed char SBYTE; /* 1 byte, signed */ |