Version bump, as requested by Tom Wijsman in bug #516926. Handle OMF2097 PSM files correctly, filed upstream on Github as pull request 19.

Package-Manager: portage-2.2.11-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

6 files changed, 198 insertions, 10 deletions

diff --git a/media-libs/libmodplug/ChangeLog b/media-libs/libmodplug/ChangeLog
index 9af70a81fae4..787a021de554 100644
--- a/media-libs/libmodplug/ChangeLog
+++ b/media-libs/libmodplug/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libmodplug
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.81 2014/07/31 14:34:27 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.82 2014/08/04 21:35:28 chainsaw Exp $
+
+*libmodplug-0.8.8.5 (04 Aug 2014)
+
+  04 Aug 2014; Tony Vroon <chainsaw@gentoo.org> +libmodplug-0.8.8.5.ebuild,
+  +files/libmodplug-0.8.8.5-no-fast-math.patch,
+  +files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch, metadata.xml:
+  Version bump, as requested by Tom Wijsman in bug #516926. Handle OMF2097 PSM
+  files correctly, filed upstream on Github as pull request 19.
 
   31 Jul 2014; Tobias Klausmann <klausman@gentoo.org>
   libmodplug-0.8.8.4-r1.ebuild:
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index bd4c4e5f7420..3dc149889655 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
 
 AUX libmodplug-0.8.4-timidity-patches.patch 592 SHA256 e486f9343d69d5849b42f6971162335e7c0805174dd5fba61697da9d948515ab SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219 WHIRLPOOL d62662ea1b47381247aa6bb8d9e38aa08ecf7a5af2c5384fc21b3ebf3d755c012096e4492416e8d0c32d9808753aafdf497fa6294add62a3c6f13fa120b545a3
 AUX libmodplug-0.8.8.4-no-fast-math.patch 563 SHA256 3b683a6890a20d9f4e2c04b80d5908013e78e9a93877d491c140e9a6685d7da7 SHA512 313e2469a50d227b89f812d5dea13099650f55631e7ab33354ce47c23292e24a187df705bd93cdd0771d02475ec43b71dfefae4d6a83628aa1931b57f7bfe134 WHIRLPOOL 2afe683b4eff778905cb3289aa05e64d43ef5264d163cd7b281c2ae4abd3841000fe94d69604ecc8906ac2956dfcd7bb0c9d1b48691d6beff13e71a92950fab7
+AUX libmodplug-0.8.8.5-no-fast-math.patch 561 SHA256 991a3e9275dc905602781d5d6dc67ad9f350c77153511d438426df4db298bf33 SHA512 f02ffb5594d65b601880744576408baa03869a4ffc12182826a6692351863045e9522ff2456744e667223919c10acfa5dbe6e0ada7881ae2e62e818829a20769 WHIRLPOOL 77f4a2a771b4599d5a2a0b62369beae97391d4f99c41a83d5e576c6eca6c7cd8a8e35696dc22eee94b265420d3bfde52111ee57a7574eae29abf7d38b8e6c80e
+AUX libmodplug-0.8.8.5-psm-omf2097-fixes.patch 4294 SHA256 9bbde0a2cd9ccf1b5bb1b3e5c4fa07bc1d64db279bd95f85f6f6005efb458708 SHA512 2aa1256ddb813ec7f578abb848e6b462edb5f41b946c8f30a2c903eec327c53959d01cda90bd306de6536bd8d54e3dad815c8beec54faddc7664c960aa979dff WHIRLPOOL e191ce255afac12663a4c67e9b828c90a25026fe2bdc140dea57875c03637e6cac0d59b09d7f102fd1820ed7cfe70bc69e6a93247799be9b436d0fe5a02525c0
 DIST libmodplug-0.8.8.2.tar.gz 517938 SHA256 6dedf79713f7ab75258c097a8749dab9127c81692858dab5295eef504ea61705
 DIST libmodplug-0.8.8.4.tar.gz 546319 SHA256 5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7 SHA512 60ef0d1cdcb7a7ba085155487026c128cb7720fcfad16decdf4513a4e4f26a33854044d7da8e25443543d547d599fd7348e72ce241bbacc7994c2560bcf750e3 WHIRLPOOL 96ca800fd14f180663ca35cc0659bf03b1dd66e5f1186d8cb94ee70b46803aa8fc66e1e5d91025707e77a34d4e8d904332fc104033222a60e5d62775a89be5d0
+DIST libmodplug-0.8.8.5.tar.gz 546751 SHA256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 WHIRLPOOL 00d88ffde88f9136274737bf63d6eca864935f24409f5f6cbe0679fcc962e890b9a5a68636dd20f0e44e070de71b8a804ef31cca78930d19004fd5148dfd736e
 EBUILD libmodplug-0.8.8.2.ebuild 1063 SHA256 50c9a57ac9f7ff9f469c45b782ec01799776497bf9a1fadba83081518432e247 SHA512 86737b06a05dd572072ee8fa20ae416b8d3ab02442f52ebd8d8a26d7a420b399343ca7016f8e9340c7c540e0c595628052fa0b27464549668e2d1179e8f1540a WHIRLPOOL d7cc51e08680e64d56eabb69d0d44bcb570ebb82773ec12d3e1f1084c50559801eede5375ea4dbc61af719aaf7b6b5476aa246161bf6715fcb22288bcc09bffd
 EBUILD libmodplug-0.8.8.4-r1.ebuild 988 SHA256 b1f4bb286716bc2732dc456e42cd9df4df822a7a50beec23987232c9dfc1a548 SHA512 ce6d9911dd6cca2f1127c521a57e1d09d34586b2771e06dcd2e55556911d01280b7d9c4e975c3a500ff39ee1e892f157d4da2342632bdd240bd6b24464bbcbce WHIRLPOOL 0e2ef4cbdda2e99f215deb6c834cedf28159d7140c88435f24c3911b3b5bfda4b18a7db94b15c02b6cd4e132fc8414756899301a77d9410b3c96579d8111ea97
 EBUILD libmodplug-0.8.8.4.ebuild 1046 SHA256 8945fb3235dd047916f36da855172868c3e7bbfb451533daafaa126015c1c6ea SHA512 5020c3fd1acdc0c5ff36f98eec34c547340971ea3cbdb0f83d69c08c928e52011a8f9771e45ba156b10dce945fcae5a723459b5dc90bc0d5a248736a1bc95fbb WHIRLPOOL bd505f6960e5ef7dc7fcedff3c489a8b7f691fea7af98229ae7cd0af2fca10acc1d0e222a77227dc6fa5f658a98e9bda32c909504e55aa40da6a6c1bb685b0dc
-MISC ChangeLog 10418 SHA256 076b32f86045b1ce5431962794be65ba99a256e62850f0201eff1dd06816cf66 SHA512 b9c6b72e6ee7085ec06bfbefa0db3e05d26e9ab13a089f398940601c1b842def8fdf7b7794f8dcafdafc8a7865c153d23af9cad6fa4c931dd748dedb45c31159 WHIRLPOOL 9cd83b3a00b86dd4bc12559b13a75cb432f00ea74bc32278db651796c21ac014c2574c2abdecce034a100cb35c4dcc5a0cec43603b58078e8595ff542c26eac6
-MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
+EBUILD libmodplug-0.8.8.5.ebuild 1033 SHA256 da1f819107f7b4ba3701bfded8600336af2b3944b2921b8e8a7821915710ad29 SHA512 353fb5864b7f8fdb93a9494d11ce47273adee9288b8bea557a37d65cae59f3535e1ace434608b83a0c690ac82e5e21b54868ddd38e580122231ea1f7e9fe7f1f WHIRLPOOL 3203e9dc4b125ff1adfa88e1896017fdc6ee659966559fc7736fb6ee4b627b687fec6922c474c889fb8433e46bc6a1cb9637ea9f1242e6424d6162d473c1548b
+MISC ChangeLog 10788 SHA256 339ed441e05c4c0ac1b1baea5ea3f70d5df618a613dfa7e15c89eaedfefd355d SHA512 d9df5903a19cd485baecd06f3029638a41bf74a92bf01ceb506cad532ac4b42725e6d69f6f8027cad8b961ad29b39cc21da908b245666894dd6b44433e10988a WHIRLPOOL 2e3883ab9acc1c81ee09f96dd36b743b1c7967fc080dc43ceba81a7e578a7fcfadc4baaa274061a2ac2bb8dce2f10f348be30ff239a732eb0ce1831f4188ecc9
+MISC metadata.xml 258 SHA256 5fa59a9b0948090cf9ac59d499e93bf0b51c3a2f11a6cca666f2d4c03eca033d SHA512 900738229ca0bb825ee4c00f5ea0839566067012ca8818673f31dbdde3d6544a7c3356c169e38968b06dae25fbb88a28cfba105a4533c6b26d0df4de0b053200 WHIRLPOOL fbe74fb92b7652da70d244ceb77c52fc99b49971971267c6a8eb34902ca684dceda27dbb36b202d7c104d2178f8ea87d67681f1bd5df31fa080ce7b9a8ab179e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlPaU/RfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhdSQCgl92ZpTGHbOrDJPP2vcqE4SnB
-exUAn2d/Lo1yXImN7FLj7FmGA65JdnJb
-=jqoI
+iEYEAREIAAYFAlPf/K4ACgkQp5vW4rUFj5qoVwCdGiAid6bsApoDM7cWNCl9to6T
++RAAnR+E2tm3JxOITAJztN523KY32GZU
+=iKem
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch
new file mode 100644
index 000000000000..3f1a7ab71b33
--- /dev/null
+++ b/media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch
@@ -0,0 +1,12 @@
+diff -uNr libmodplug-0.8.8.5.ORIG/configure.ac libmodplug-0.8.8.5/configure.ac
+--- libmodplug-0.8.8.5.ORIG/configure.ac	2014-08-04 22:25:14.741262000 +0100
++++ libmodplug-0.8.8.5/configure.ac	2014-08-04 22:25:45.228263519 +0100
+@@ -29,7 +29,7 @@
+ AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
+ AC_CHECK_FUNCS(setenv sinf)
+ 
+-CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -D_REENTRANT"
++CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -D_REENTRANT"
+ # CXXFLAGS="-fno-exceptions -g -Wall -ffast-math -D_REENTRANT `glib-config --cflags`"
+ 
+ AC_CANONICAL_HOST
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch b/media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch
new file mode 100644
index 000000000000..1badfb46af5b
--- /dev/null
+++ b/media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch
@@ -0,0 +1,134 @@
+diff -uNr libmodplug-0.8.8.5.ORIG/src/load_psm.cpp libmodplug-0.8.8.5/src/load_psm.cpp
+--- libmodplug-0.8.8.5.ORIG/src/load_psm.cpp	2014-08-04 22:25:14.743262000 +0100
++++ libmodplug-0.8.8.5/src/load_psm.cpp	2014-08-04 22:26:56.907267088 +0100
+@@ -286,66 +286,49 @@
+ 		if ((Patterns[nPat] = AllocatePattern(nRows, m_nChannels)) == NULL) break;
+ 		MODCOMMAND *m = Patterns[nPat];
+ 		BYTE *p = pPsmPat->data;
++		MODCOMMAND *sp, dummy;
+ 		UINT pos = 0;
+ 		UINT row = 0;
+-		UINT oldch = 0;
+-		BOOL bNewRow = FALSE;
++		UINT rowlim;
+ 	#ifdef PSM_LOG
+ 		Log("Pattern %d at offset 0x%04X\n", nPat, (DWORD)(p - (BYTE *)lpStream));
+ 	#endif
++		UINT flags, ch;
++		rowlim = bswapLE16(pPsmPat->reserved1)-2;
+ 		while ((row < nRows) && (pos+1 < len))
+ 		{
+-			UINT flags = p[pos++];
+-			UINT ch = p[pos++];
+-			
+-		#ifdef PSM_LOG
+-			//Log("flags+ch: %02X.%02X\n", flags, ch);
+-		#endif
+-			if (((flags & 0xf0) == 0x10) && (ch <= oldch) /*&& (!bNewRow)*/)
+-			{
+-				if ((pos+1<len) && (!(p[pos] & 0x0f)) && (p[pos+1] < m_nChannels))
+-				{
+-				#ifdef PSM_LOG
+-					//if (!nPat) Log("Continuing on new row\n");
+-				#endif
+-					row++;
+-					m += m_nChannels;
+-					oldch = ch;
+-					continue;
+-				}
+-			}
+-			if ((pos >= len) || (row >= nRows)) break;
+-			if (!(flags & 0xf0))
+-			{
+-			#ifdef PSM_LOG
+-				//if (!nPat) Log("EOR(%d): %02X.%02X\n", row, p[pos], p[pos+1]);
+-			#endif
+-				row++;
++			if ((pos+1) >= rowlim) {
++				pos = rowlim;
++				rowlim = (((int)p[pos+1])<<8)
++					| ((int)p[pos+0]);
+ 				m += m_nChannels;
+-				bNewRow = TRUE;
+-				oldch = ch;
+-				continue;
+-			}
+-			bNewRow = FALSE;
+-			if (ch >= m_nChannels)
+-			{
+-			#ifdef PSM_LOG
+-				if (!nPat) Log("Invalid channel row=%d (0x%02X.0x%02X)\n", row, flags, ch);
+-			#endif
+-				ch = 0;
++				row++;
++				rowlim += pos;
++				pos += 2;
+ 			}
++			flags = p[pos++];
++			ch = p[pos++];
++			if (ch >= m_nChannels) {
++				sp = &dummy;
++                        } else {
++				sp = &m[ch];
++                        }
+ 			// Note + Instr
++                        if ((flags & 0x80) && (pos+1 < len))
++                        {
++                                UINT note = p[pos++];
++                                note = (note>>4)*12+(note&0x0f)+12+1;
++                                if (note > 0x80) note = 0;
++				m[ch].note = note;
++                        }
+ 			if ((flags & 0x40) && (pos+1 < len))
+ 			{
+-				UINT note = p[pos++];
+ 				UINT nins = p[pos++];
+ 			#ifdef PSM_LOG
+ 				//if (!nPat) Log("note+ins: %02X.%02X\n", note, nins);
+ 				if ((!nPat) && (nins >= m_nSamples)) Log("WARNING: invalid instrument number (%d)\n", nins);
+ 			#endif
+-				if ((note) && (note < 0x80)) note = (note>>4)*12+(note&0x0f)+12+1;
+ 				m[ch].instr = samplemap[nins];
+-				m[ch].note = note;
+ 			}
+ 			// Volume
+ 			if ((flags & 0x20) && (pos < len))
+@@ -362,13 +345,29 @@
+ 				switch(command)
+ 				{
+ 				// 01: fine volslide up
+-				case 0x01:	command = CMD_VOLUMESLIDE; param |= 0x0f; break;
++				case 0x01:	command = CMD_VOLUMESLIDE; param |= 0x0f;
++						if (param == 15) param=31;
++						break;
++                                // 02: volslide up
++                                case 0x02:      command = CMD_VOLUMESLIDE; param>>=1; param<<=4; break;
++                                // 03: fine volslide down
++                                case 0x03:	command = CMD_VOLUMESLIDE; param>>=4; param |= 0xf0;
++						if (param == 240) param=241;
++						break;
+ 				// 04: fine volslide down
+ 				case 0x04:	command = CMD_VOLUMESLIDE; param>>=4; param |= 0xf0; break;
+ 				// 0C: portamento up
+ 				case 0x0C:	command = CMD_PORTAMENTOUP; param = (param+1)/2; break;
+ 				// 0E: portamento down
+ 				case 0x0E:	command = CMD_PORTAMENTODOWN; param = (param+1)/2; break;
++				// 0F: tone portamento
++				case 0x0F:	command = CMD_TONEPORTAMENTO; param = param/4; break;
++				// 15: vibrato
++                                case 0x15:	command = CMD_VIBRATO; break;
++				// 29: sample offset
++				case 0x29:	pos += 2; break;
++				// 2A: retrigger note
++				case 0x2A:	command = CMD_RETRIG; break;
+ 				// 33: Position Jump
+ 				case 0x33:	command = CMD_POSITIONJUMP; break;
+ 				// 34: Pattern break
+@@ -387,7 +386,6 @@
+ 				m[ch].command = (BYTE)command;
+ 				m[ch].param = (BYTE)param;
+ 			}
+-			oldch = ch;
+ 		}
+ 	#ifdef PSM_LOG
+ 		if (pos < len)
diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
new file mode 100644
index 000000000000..1e8909f2dfcb
--- /dev/null
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild,v 1.1 2014/08/04 21:35:28 chainsaw Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+inherit autotools-multilib
+
+DESCRIPTION="Library for playing MOD-like music files"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
+	"${FILESDIR}/${P}-no-fast-math.patch"
+	"${FILESDIR}/${P}-psm-omf2097-fixes.patch"
+)
diff --git a/media-libs/libmodplug/metadata.xml b/media-libs/libmodplug/metadata.xml
index e1774e3d9ad7..30c7b1bad8ae 100644
--- a/media-libs/libmodplug/metadata.xml
+++ b/media-libs/libmodplug/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+  <herd>sound</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
 </pkgmetadata>