summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libmodplug
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libmodplug')
-rw-r--r--media-libs/libmodplug/Manifest1
-rw-r--r--media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch15
-rw-r--r--media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch12
-rw-r--r--media-libs/libmodplug/files/libmodplug-0.8.8.5-no-fast-math.patch12
-rw-r--r--media-libs/libmodplug/files/libmodplug-0.8.8.5-psm-omf2097-fixes.patch134
-rw-r--r--media-libs/libmodplug/libmodplug-0.8.8.5.ebuild28
-rw-r--r--media-libs/libmodplug/metadata.xml12
7 files changed, 214 insertions, 0 deletions
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
new file mode 100644
index 000000000000..26dcefcceead
--- /dev/null
+++ b/media-libs/libmodplug/Manifest
@@ -0,0 +1 @@
+DIST libmodplug-0.8.8.5.tar.gz 546751 SHA256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad SHA512 aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 WHIRLPOOL 00d88ffde88f9136274737bf63d6eca864935f24409f5f6cbe0679fcc962e890b9a5a68636dd20f0e44e070de71b8a804ef31cca78930d19004fd5148dfd736e
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.4-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch
new file mode 100644
index 000000000000..3ca9ad1a6fd5
--- /dev/null
+++ b/media-libs/libmodplug/files/libmodplug-0.8.8.4-no-fast-math.patch
@@ -0,0 +1,12 @@
+diff -uNr libmodplug-0.8.8.4.ORIG//configure.in libmodplug-0.8.8.4/configure.in
+--- libmodplug-0.8.8.4.ORIG//configure.in 2011-08-17 12:09:24.843546749 +0100
++++ libmodplug-0.8.8.4/configure.in 2011-08-17 12:10:23.582544651 +0100
+@@ -27,7 +27,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-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..b5b6aa192088
--- /dev/null
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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
new file mode 100644
index 000000000000..60a7ab7a3a5b
--- /dev/null
+++ b/media-libs/libmodplug/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sound</herd>
+ <maintainer>
+ <email>chainsaw@gentoo.org</email>
+ <name>Tony Vroon</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">modplug-xmms</remote-id>
+ </upstream>
+</pkgmetadata>