gentoo resync : 18.11.2018

3 files changed, 0 insertions, 148 deletions

diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index f91b9eb89b0f..79b6477a8e8b 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,6 +1,4 @@
 AUX libmodplug-0.8.4-timidity-patches.patch 592 BLAKE2B 7bbee6d0ff833a6ead5e1a1d25953fbdbe0f3fe3f9efb6de560ed93e69dc6d4b74a8096d4517f9c46d3be4772e6eb682a0b068d68dcd30efd705090cebe2cf60 SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219
-AUX libmodplug-0.8.8.5-no-fast-math.patch 561 BLAKE2B 366ed73a5c960dff3d4494781c6b53ce621f2828f8b92f584be8d3f9238244151394c7083429c570e6bc877fcae939c02488fce83ca459c2aa5186fc6bc1cee1 SHA512 f02ffb5594d65b601880744576408baa03869a4ffc12182826a6692351863045e9522ff2456744e667223919c10acfa5dbe6e0ada7881ae2e62e818829a20769
-AUX libmodplug-0.8.8.5-psm-omf2097-fixes.patch 4294 BLAKE2B 310ba033d8c49d98eb6d7bbaf71fb352f4524272c1d5da8b817f6c0fc4943bc01f03acab7371a715109064e8cf49cf6e80f234f0f473300140fd7632caf9c4cf SHA512 2aa1256ddb813ec7f578abb848e6b462edb5f41b946c8f30a2c903eec327c53959d01cda90bd306de6536bd8d54e3dad815c8beec54faddc7664c960aa979dff
 AUX libmodplug-0.8.9.0-no-fast-math.patch 515 BLAKE2B d1068b8647b59daecbf60470d7d0f6cf6884438c3a833aefb16181b50201f33879ca0d8dd6f341c1690b5e160e0a6eb706aebd28533aa5fbf5bdde0eb47196f2 SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1
 DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
 EBUILD libmodplug-0.8.9.0.ebuild 780 BLAKE2B 24ffe6ae1d91d499f79465a30803103a74576e161c04632eb00f8dbd7de4f693401293a1ee51994f39e47a87833a24fc67df54ad038f721cbf842a8bf66a3b85 SHA512 dae2420bb31e9254ce12ec0299607d195849dfd5d830e7be0b093b57b1effd1e72fde6eb0a21b15f35c33c80e831ad7c360300319d8252fa0524679bf6c86e74
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
deleted file mode 100644
index 3f1a7ab71b33..000000000000
--- a/media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 1badfb46af5b..000000000000
--- a/media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-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)