From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-libs/libmodplug/Manifest | 11 ++ .../files/libmodplug-0.8.4-timidity-patches.patch | 15 +++ .../files/libmodplug-0.8.8.5-no-fast-math.patch | 12 ++ .../libmodplug-0.8.8.5-psm-omf2097-fixes.patch | 134 +++++++++++++++++++++ .../files/libmodplug-0.8.9.0-no-fast-math.patch | 12 ++ media-libs/libmodplug/libmodplug-0.8.8.5.ebuild | 27 +++++ media-libs/libmodplug/libmodplug-0.8.9.0.ebuild | 26 ++++ media-libs/libmodplug/metadata.xml | 15 +++ 8 files changed, 252 insertions(+) create mode 100644 media-libs/libmodplug/Manifest create mode 100644 media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch create mode 100644 media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch create mode 100644 media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch create mode 100644 media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch create mode 100644 media-libs/libmodplug/libmodplug-0.8.8.5.ebuild create mode 100644 media-libs/libmodplug/libmodplug-0.8.9.0.ebuild create mode 100644 media-libs/libmodplug/metadata.xml (limited to 'media-libs/libmodplug') diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest new file mode 100644 index 000000000000..a521f21e757a --- /dev/null +++ b/media-libs/libmodplug/Manifest @@ -0,0 +1,11 @@ +AUX libmodplug-0.8.4-timidity-patches.patch 592 SHA256 e486f9343d69d5849b42f6971162335e7c0805174dd5fba61697da9d948515ab SHA512 9a01299e9886d2e1fb9db18283fdf2d926ed0899fc6068f66739d6f462fdfbd6500fae70da43edd9a20532ab8ac83cc2ed2ed019f33725a964b9b4aae5ad8219 WHIRLPOOL d62662ea1b47381247aa6bb8d9e38aa08ecf7a5af2c5384fc21b3ebf3d755c012096e4492416e8d0c32d9808753aafdf497fa6294add62a3c6f13fa120b545a3 +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 +AUX libmodplug-0.8.9.0-no-fast-math.patch 515 SHA256 3fce444df613386ede58b99365b7f534c428f4ecd343baf926c29ced370168db SHA512 dfcf1497343f5bb145ac41ada3e313c2eaf8b18827dd1dbb55024a945300eb9054503f20d8a60f835dce50820c99eb4edf20109056ce929e7284f247312cd9c1 WHIRLPOOL 54e16b150eba31c9b638e2f3a9c4b79eb31b666496a4aa1498d84dadd0e2f06f07b4c33102082b2f8b8906d1da0d05eda6233c820b5fd546d5db391725b72bea +DIST libmodplug-0.8.8.5.tar.gz 546751 SHA256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 WHIRLPOOL 00d88ffde88f9136274737bf63d6eca864935f24409f5f6cbe0679fcc962e890b9a5a68636dd20f0e44e070de71b8a804ef31cca78930d19004fd5148dfd736e +DIST libmodplug-0.8.9.0.tar.gz 576566 SHA256 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd WHIRLPOOL c49b978398192fde4d19a224cc611dca529a0fccacef37f67360c7a73bb527aa46d7df3e9739bdadd636e11420f79f8c97378ac70d1c037891619eac39a83120 +EBUILD libmodplug-0.8.8.5.ebuild 894 SHA256 f7f6382fc9904c55cb2e88749f53c3ff05af054139926e41cab83721c53db1a3 SHA512 45616b989320c4d10559b5a25df29e2cca91652b4310fa0e90839844c016257044a08c0fc0d0d44b8404d3a1f0311da1a60df6c21c8073d1f065090d079e8868 WHIRLPOOL d7ab9335965f9e139c819193dbbf242e5943823a4533dc38dfcd2baf8bfffb0fd2b178eff1dd51530442dc6fc045bdf9aec27540b0d22d4dbe98f4180a9b11cf +EBUILD libmodplug-0.8.9.0.ebuild 859 SHA256 5e0268510afcee624e72d1b453ee551703c7320dc62211d8b19ec322372e58bb SHA512 9804a0c226fd262985c6766f415dcf991e789d177e8d0b28f19e35da2e490fee93c4d0acb339148ecb37bad6b84edf4068a107f681e337269c344d5ca489d142 WHIRLPOOL f49ead369cb0dfa26b1c8f33a43b7075fc87f832599b382ba6ce453ae0742aad28573ce13e7461d335a524738c2bd6fd1996e6fab4b7d35dc365cf23f5b4d434 +MISC ChangeLog 2641 SHA256 60f1bf92f8f1fc1766e9a6d259cea7145a5324cc7a4154ee62a48400a7a7491c SHA512 6814feac5425fcc0dde4ea988c62e7e66e5d52cc5371b9d44315a07836bb93093913aa8b8b222c385ba3fdc978dfd33dee532adf8b6141f14612d9f37343ded5 WHIRLPOOL 6f30ee0e14600d7d7462f0353aae315347632f39311a7f06a2b13b876b71ab456c1a87b85a93e20d4a91291a140712ca33a4439a0f0709ef74047e2a8a5c34f8 +MISC ChangeLog-2015 12063 SHA256 0dccb86ad75a2efc78a752ac1ab84222cfb9d550e18a9904fa55b23360d4c961 SHA512 b19839872bcd6253d0e088da31708e129cbf7fc810a6811bbbd1ab793581e948565cc28a4848a5b3a8061d8ff4c65454a8a0a90c9dba46f3a4b6e298aa63a616 WHIRLPOOL 45be025a9e61d75778f6fd42abf4cdaf83cca92f71ee3695663deaf614d6c58431a15ceee1cf07b85e7e27f1718617dc7f5899a68112d608b66a56fd931f28c0 +MISC metadata.xml 457 SHA256 b79d69a331454d64599024a247b00bfbd5c67f02d4b17fee678273a372b3d966 SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d WHIRLPOOL 55d34a561a689d61f48ddb074053f4d3a2c8c2a47f6ad9f25f73fe293a3fa181573ad733560b85d5bea8505b65da6e23fc9a45806b52cccd1b076617efe11b25 diff --git a/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch b/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch new file mode 100644 index 000000000000..87150effb3e9 --- /dev/null +++ b/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch @@ -0,0 +1,15 @@ +Index: libmodplug-0.8.4/src/load_pat.cpp +=================================================================== +--- libmodplug-0.8.4.orig/src/load_pat.cpp ++++ libmodplug-0.8.4/src/load_pat.cpp +@@ -53,8 +53,8 @@ typedef UWORD WORD; + #define PATHFORPAT "C:\\TIMIDITY\\INSTRUMENTS" + #else + #define DIRDELIM '/' +-#define TIMIDITYCFG "/usr/local/share/timidity/timidity.cfg" +-#define PATHFORPAT "/usr/local/share/timidity/instruments" ++#define TIMIDITYCFG "/usr/share/timidity/timidity.cfg" ++#define PATHFORPAT "/usr/share/timidity/current" + #endif + + #define PAT_ENV_PATH2CFG "MMPAT_PATH_TO_CFG" 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) || (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/files/libmodplug-0.8.9.0-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch new file mode 100644 index 000000000000..51f0d9d2d495 --- /dev/null +++ b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch @@ -0,0 +1,12 @@ +diff -uNr libmodplug-0.8.9.0.ORIG/configure.ac libmodplug-0.8.9.0/configure.ac +--- libmodplug-0.8.9.0.ORIG/configure.ac 2017-07-26 22:39:07.461198820 +0100 ++++ libmodplug-0.8.9.0/configure.ac 2017-07-26 22:39:53.284622741 +0100 +@@ -31,7 +31,7 @@ + AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h]) + AC_CHECK_FUNCS(setenv sinf) + +-CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -ffast-math -fno-common -D_REENTRANT" ++CXXFLAGS="$CXXFLAGS -fno-exceptions -Wall -fno-common -D_REENTRANT" + + AC_CANONICAL_HOST + case "$host" in 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..99f6dc5b198e --- /dev/null +++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild new file mode 100644 index 000000000000..bd1229984a9b --- /dev/null +++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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" +) diff --git a/media-libs/libmodplug/metadata.xml b/media-libs/libmodplug/metadata.xml new file mode 100644 index 000000000000..72aaf93ce01c --- /dev/null +++ b/media-libs/libmodplug/metadata.xml @@ -0,0 +1,15 @@ + + + + + chainsaw@gentoo.org + Tony Vroon + + + sound@gentoo.org + Gentoo Sound project + + + modplug-xmms + + -- cgit v1.2.3