[arch-commits] Commit in lib32-libmikmod/trunk (5 files)

[Jan Steffens]

    Date: Thursday, October 10, 2013 @ 03:45:40
  Author: heftig
Revision: 98422

we have no info files; remove old patches

Modified:
  lib32-libmikmod/trunk/PKGBUILD
Deleted:
  lib32-libmikmod/trunk/lib32-libmikmod.install
  lib32-libmikmod/trunk/libmikmod-3.1.12-loopingvolume-fix.diff
  lib32-libmikmod/trunk/libmikmod-3.2.0-64bit-fix.diff
  lib32-libmikmod/trunk/libmikmod-CVE-2009-0179.patch

-----------------------------------------+
 PKGBUILD                                |    1 
 lib32-libmikmod.install                 |   18 ----------------
 libmikmod-3.1.12-loopingvolume-fix.diff |   15 -------------
 libmikmod-3.2.0-64bit-fix.diff          |   12 ----------
 libmikmod-CVE-2009-0179.patch           |   33 ------------------------------
 5 files changed, 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-10 01:44:06 UTC (rev 98421)
+++ PKGBUILD	2013-10-10 01:45:40 UTC (rev 98422)
@@ -13,7 +13,6 @@
 depends=(libmikmod lib32-openal)
 makedepends=(gcc-multilib libtool-multilib lib32-alsa-lib)
 options=('!libtool')
-install=$pkgname.install
 source=($url/files/libmikmod-$pkgver.tar.gz)
 sha256sums=('2311b209255bf24e95161907a16778cb054ac6d447fd8d05f1f0e41a555c7580')
 

Deleted: lib32-libmikmod.install
===================================================================
--- lib32-libmikmod.install	2013-10-10 01:44:06 UTC (rev 98421)
+++ lib32-libmikmod.install	2013-10-10 01:45:40 UTC (rev 98422)
@@ -1,18 +0,0 @@
-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
-}

Deleted: libmikmod-3.1.12-loopingvolume-fix.diff
===================================================================
--- libmikmod-3.1.12-loopingvolume-fix.diff	2013-10-10 01:44:06 UTC (rev 98421)
+++ libmikmod-3.1.12-loopingvolume-fix.diff	2013-10-10 01:45:40 UTC (rev 98422)
@@ -1,15 +0,0 @@
-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);
- }
- 

Deleted: libmikmod-3.2.0-64bit-fix.diff
===================================================================
--- libmikmod-3.2.0-64bit-fix.diff	2013-10-10 01:44:06 UTC (rev 98421)
+++ libmikmod-3.2.0-64bit-fix.diff	2013-10-10 01:45:40 UTC (rev 98422)
@@ -1,12 +0,0 @@
-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 */

Deleted: libmikmod-CVE-2009-0179.patch
===================================================================
--- libmikmod-CVE-2009-0179.patch	2013-10-10 01:44:06 UTC (rev 98421)
+++ libmikmod-CVE-2009-0179.patch	2013-10-10 01:45:40 UTC (rev 98422)
@@ -1,33 +0,0 @@
-diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
---- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
-@@ -622,7 +622,8 @@
- 				/* read the remainder of the header */
- 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
- 
--				if(_mm_eof(modreader)) {
-+				/* last instrument is at the end of file in version 0x0104 */
-+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- 					free(nextwav);free(wh);
- 					nextwav=NULL;wh=NULL;
- 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
-diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
---- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
-@@ -450,10 +450,12 @@
- 	if (!l->Init || l->Init()) {
- 		_mm_rewind(modreader);
- 		ok = l->Load(curious);
--		/* propagate inflags=flags for in-module samples */
--		for (t = 0; t < of.numsmp; t++)
--			if (of.samples[t].inflags == 0)
--				of.samples[t].inflags = of.samples[t].flags;
-+		if (ok) {
-+			/* propagate inflags=flags for in-module samples */
-+			for (t = 0; t < of.numsmp; t++)
-+				if (of.samples[t].inflags == 0)
-+					of.samples[t].inflags = of.samples[t].flags;
-+		}
- 	} else
- 		ok = 0;
-