Date: Tuesday, November 6, 2012 @ 15:57:47
Author: heftig
Revision: 170385
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libmikmod/repos/staging-i686/
libmikmod/repos/staging-i686/PKGBUILD
(from rev 170384, libmikmod/trunk/PKGBUILD)
libmikmod/repos/staging-i686/libmikmod-3.1.12-loopingvolume-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.1.12-loopingvolume-fix.diff)
libmikmod/repos/staging-i686/libmikmod-3.2.0-64bit-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.2.0-64bit-fix.diff)
libmikmod/repos/staging-i686/libmikmod.install
(from rev 170384, libmikmod/trunk/libmikmod.install)
libmikmod/repos/staging-x86_64/
libmikmod/repos/staging-x86_64/PKGBUILD
(from rev 170384, libmikmod/trunk/PKGBUILD)
libmikmod/repos/staging-x86_64/libmikmod-3.1.12-loopingvolume-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.1.12-loopingvolume-fix.diff)
libmikmod/repos/staging-x86_64/libmikmod-3.2.0-64bit-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.2.0-64bit-fix.diff)
libmikmod/repos/staging-x86_64/libmikmod.install
(from rev 170384, libmikmod/trunk/libmikmod.install)
--------------------------------------------------------+
staging-i686/PKGBUILD | 39 +++++++++++++++
staging-i686/libmikmod-3.1.12-loopingvolume-fix.diff | 15 +++++
staging-i686/libmikmod-3.2.0-64bit-fix.diff | 12 ++++
staging-i686/libmikmod.install | 18 ++++++
staging-x86_64/PKGBUILD | 39 +++++++++++++++
staging-x86_64/libmikmod-3.1.12-loopingvolume-fix.diff | 15 +++++
staging-x86_64/libmikmod-3.2.0-64bit-fix.diff | 12 ++++
staging-x86_64/libmikmod.install | 18 ++++++
8 files changed, 168 insertions(+)
Copied: libmikmod/repos/staging-i686/PKGBUILD (from rev 170384,
libmikmod/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-11-06 20:57:47 UTC (rev 170385)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: Tom Newsom <[email protected]>
+
+pkgname=libmikmod
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="A portable sound library"
+license=('GPL' 'LGPL')
+url="http://mikmod.shlomifish.org/";
+arch=('i686' 'x86_64')
+depends=('glibc' 'sh')
+makedepends=('alsa-lib')
+options=('!libtool')
+install=$pkgname.install
+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 $pkgname-$pkgver
+
+ # patches from sdl_mixer-1.2.11 source
+ patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff
+ patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff
+
+ ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
--disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
Copied: libmikmod/repos/staging-i686/libmikmod-3.1.12-loopingvolume-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.1.12-loopingvolume-fix.diff)
===================================================================
--- staging-i686/libmikmod-3.1.12-loopingvolume-fix.diff
(rev 0)
+++ staging-i686/libmikmod-3.1.12-loopingvolume-fix.diff 2012-11-06
20:57:47 UTC (rev 170385)
@@ -0,0 +1,15 @@
+Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
+ * Fixed MOD music volume when looping
+
+diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c
libmikmod-3.1.12/playercode/mplayer.c
+--- libmikmod-3.1.12.orig/playercode/mplayer.c 2009-10-05 00:19:59.000000000
-0700
++++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-05 00:44:35.000000000
-0700
+@@ -3019,7 +3019,7 @@
+ {
+ MUTEX_LOCK(vars);
+ if (pf)
+- pf->volume=(volume<0)?0:(volume>128)?128:volume;
++ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
+ MUTEX_UNLOCK(vars);
+ }
+
Copied: libmikmod/repos/staging-i686/libmikmod-3.2.0-64bit-fix.diff (from rev
170384, libmikmod/trunk/libmikmod-3.2.0-64bit-fix.diff)
===================================================================
--- staging-i686/libmikmod-3.2.0-64bit-fix.diff (rev 0)
+++ staging-i686/libmikmod-3.2.0-64bit-fix.diff 2012-11-06 20:57:47 UTC (rev
170385)
@@ -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 */
Copied: libmikmod/repos/staging-i686/libmikmod.install (from rev 170384,
libmikmod/trunk/libmikmod.install)
===================================================================
--- staging-i686/libmikmod.install (rev 0)
+++ staging-i686/libmikmod.install 2012-11-06 20:57:47 UTC (rev 170385)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(mikmod.info)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
Copied: libmikmod/repos/staging-x86_64/PKGBUILD (from rev 170384,
libmikmod/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-11-06 20:57:47 UTC (rev 170385)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Contributor: Tom Newsom <[email protected]>
+
+pkgname=libmikmod
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="A portable sound library"
+license=('GPL' 'LGPL')
+url="http://mikmod.shlomifish.org/";
+arch=('i686' 'x86_64')
+depends=('glibc' 'sh')
+makedepends=('alsa-lib')
+options=('!libtool')
+install=$pkgname.install
+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 $pkgname-$pkgver
+
+ # patches from sdl_mixer-1.2.11 source
+ patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff
+ patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff
+
+ ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
--disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
Copied: libmikmod/repos/staging-x86_64/libmikmod-3.1.12-loopingvolume-fix.diff
(from rev 170384, libmikmod/trunk/libmikmod-3.1.12-loopingvolume-fix.diff)
===================================================================
--- staging-x86_64/libmikmod-3.1.12-loopingvolume-fix.diff
(rev 0)
+++ staging-x86_64/libmikmod-3.1.12-loopingvolume-fix.diff 2012-11-06
20:57:47 UTC (rev 170385)
@@ -0,0 +1,15 @@
+Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
+ * Fixed MOD music volume when looping
+
+diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c
libmikmod-3.1.12/playercode/mplayer.c
+--- libmikmod-3.1.12.orig/playercode/mplayer.c 2009-10-05 00:19:59.000000000
-0700
++++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-05 00:44:35.000000000
-0700
+@@ -3019,7 +3019,7 @@
+ {
+ MUTEX_LOCK(vars);
+ if (pf)
+- pf->volume=(volume<0)?0:(volume>128)?128:volume;
++ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
+ MUTEX_UNLOCK(vars);
+ }
+
Copied: libmikmod/repos/staging-x86_64/libmikmod-3.2.0-64bit-fix.diff (from rev
170384, libmikmod/trunk/libmikmod-3.2.0-64bit-fix.diff)
===================================================================
--- staging-x86_64/libmikmod-3.2.0-64bit-fix.diff
(rev 0)
+++ staging-x86_64/libmikmod-3.2.0-64bit-fix.diff 2012-11-06 20:57:47 UTC
(rev 170385)
@@ -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 */
Copied: libmikmod/repos/staging-x86_64/libmikmod.install (from rev 170384,
libmikmod/trunk/libmikmod.install)
===================================================================
--- staging-x86_64/libmikmod.install (rev 0)
+++ staging-x86_64/libmikmod.install 2012-11-06 20:57:47 UTC (rev 170385)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(mikmod.info)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
