Version bump, but even if this version supposedly played MIDI files, it's too broken to actually work.

Package-Manager: portage-2.1.2_rc2-r1

5 files changed, 90 insertions, 8 deletions

diff --git a/media-libs/libmodplug/ChangeLog b/media-libs/libmodplug/ChangeLog
index baa136066a85..adab138575ea 100644
--- a/media-libs/libmodplug/ChangeLog
+++ b/media-libs/libmodplug/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmodplug
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.20 2006/11/24 20:59:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/ChangeLog,v 1.21 2006/11/24 21:33:07 flameeyes Exp $
+
+*libmodplug-0.8.4 (24 Nov 2006)
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libmodplug-0.8.4-timidity-patches.patch, +libmodplug-0.8.4.ebuild:
+  Version bump, but even if this version supposedly played MIDI files, it's
+  too broken to actually work.
 
 *libmodplug-0.8-r1 (24 Nov 2006)
 
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index fb217a22b92d..856fa45eaf4c 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -13,7 +13,12 @@ AUX libmodplug-0.8-CVE-2006-4192.patch 1449 RMD160 659c804f64394078c72d6c1359d7d
 MD5 b04c926ad142751512df8b7869f4117e files/libmodplug-0.8-CVE-2006-4192.patch 1449
 RMD160 659c804f64394078c72d6c1359d7d32559e741a3 files/libmodplug-0.8-CVE-2006-4192.patch 1449
 SHA256 4068347f14f85220910abbf7eacb1a9ccb9540d3c8495e62b19618d54fdd4a9c files/libmodplug-0.8-CVE-2006-4192.patch 1449
+AUX libmodplug-0.8.4-timidity-patches.patch 592 RMD160 28433fbef068eccc69f2f013c81ebfbd8f47f219 SHA1 0950e4b480d5e2420240335696bfb95d1f3f24e7 SHA256 e486f9343d69d5849b42f6971162335e7c0805174dd5fba61697da9d948515ab
+MD5 e84fb4d4cedfeec35e93bf91794b3366 files/libmodplug-0.8.4-timidity-patches.patch 592
+RMD160 28433fbef068eccc69f2f013c81ebfbd8f47f219 files/libmodplug-0.8.4-timidity-patches.patch 592
+SHA256 e486f9343d69d5849b42f6971162335e7c0805174dd5fba61697da9d948515ab files/libmodplug-0.8.4-timidity-patches.patch 592
 DIST libmodplug-0.7.tar.gz 329398 RMD160 ba610e357027676274035811b42746b811608eed SHA1 1a76f8c530f118c00bcbad474b76bf8fb1437423 SHA256 c80da366576501be18a987c28609bd8ffa340ed20fc03249c70c43634f077052
+DIST libmodplug-0.8.4.tar.gz 510758 RMD160 0c4c179ebc32bf88cecb162c391e91a5d36ad834 SHA1 bf21746895d857e6995c9790c223ce1772f39ef0 SHA256 84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee
 DIST libmodplug-0.8.tar.gz 441612 RMD160 ccf5c29b06a2f5ed93f7b42676d892521c65bfbd SHA1 62c755e178e708cab2113c54b351d3dce793bc21 SHA256 ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
 EBUILD libmodplug-0.7.ebuild 813 RMD160 897e0437e10b25f06d3afb8ae30ef3b443b4eccc SHA1 6e57fa4ddd9ce19401becd43e9175ba345529ab0 SHA256 b8468769d2f6476500f9a6850723fd618edb125b051a05296bc312317a05aee6
 MD5 7fc2708450ae91d43944e2f4fc98c782 libmodplug-0.7.ebuild 813
@@ -23,14 +28,18 @@ EBUILD libmodplug-0.8-r1.ebuild 993 RMD160 28fa47e61c6a8de68ecda297222ecface3f1f
 MD5 ea0b6d97570228fd3a81e494a11aa9ea libmodplug-0.8-r1.ebuild 993
 RMD160 28fa47e61c6a8de68ecda297222ecface3f1f4e9 libmodplug-0.8-r1.ebuild 993
 SHA256 5e958c5bbddc4372ef5532da77682fbadb264a9d3b8e7a4c8541937d06d2d418 libmodplug-0.8-r1.ebuild 993
+EBUILD libmodplug-0.8.4.ebuild 1297 RMD160 ddc1416b024e91cc16fedce242fcdd383c675b4b SHA1 15857b960f73d7a06893283b93e7e91635db5a12 SHA256 40e289bbc114ce41c1dcf87d6e712a1394e563c361fc9d9440ccaa3f67904eea
+MD5 84a8271d92312d1cde047f72cdc44ceb libmodplug-0.8.4.ebuild 1297
+RMD160 ddc1416b024e91cc16fedce242fcdd383c675b4b libmodplug-0.8.4.ebuild 1297
+SHA256 40e289bbc114ce41c1dcf87d6e712a1394e563c361fc9d9440ccaa3f67904eea libmodplug-0.8.4.ebuild 1297
 EBUILD libmodplug-0.8.ebuild 943 RMD160 2207ba72e5d134f834ef34314aa5248a9a52c0d5 SHA1 f56535f1fd3a8984b950a27b4237829c836c29c7 SHA256 120536049558699bb253181769e580ca094cde2febc84eb19cad0dcb003e32e4
 MD5 289acc8c999cd9e7bc48d863955c2c33 libmodplug-0.8.ebuild 943
 RMD160 2207ba72e5d134f834ef34314aa5248a9a52c0d5 libmodplug-0.8.ebuild 943
 SHA256 120536049558699bb253181769e580ca094cde2febc84eb19cad0dcb003e32e4 libmodplug-0.8.ebuild 943
-MISC ChangeLog 2473 RMD160 aad6a04cbcc65a92035583dd651c2ceabb2130eb SHA1 180c8414b80085a563764ec13e61e71af3d3e16d SHA256 ad62fd7eb147719b7dcdec915f5f11d971692469355eb03a093822d52fd3aba6
-MD5 65f846c4e768f291404234ff5be693aa ChangeLog 2473
-RMD160 aad6a04cbcc65a92035583dd651c2ceabb2130eb ChangeLog 2473
-SHA256 ad62fd7eb147719b7dcdec915f5f11d971692469355eb03a093822d52fd3aba6 ChangeLog 2473
+MISC ChangeLog 2743 RMD160 831b698103010084b1cb56716365e796e40bf1cd SHA1 e2159b22f103b85154e101d7a3daf188b75fe9ba SHA256 7823d5f8202efb56cbff5e55f76ed6bba05dad06f71371ba84ddc316626e41cb
+MD5 0a48c1c2485692c5bafb80456f902320 ChangeLog 2743
+RMD160 831b698103010084b1cb56716365e796e40bf1cd ChangeLog 2743
+SHA256 7823d5f8202efb56cbff5e55f76ed6bba05dad06f71371ba84ddc316626e41cb ChangeLog 2743
 MISC metadata.xml 248 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d SHA1 4ea80510c4e90c385ac851b4f82c36b4f91d9402 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
@@ -44,10 +53,13 @@ SHA256 6aab7593739988a695fcbdba006f50c78d520cabe81cfaac7de84f5934363bf0 files/di
 MD5 6099a721c7a188eabdc91042dac3de3d files/digest-libmodplug-0.8-r1 244
 RMD160 deea679a926392dd22bec1017cc644f8ed5764f1 files/digest-libmodplug-0.8-r1 244
 SHA256 6aab7593739988a695fcbdba006f50c78d520cabe81cfaac7de84f5934363bf0 files/digest-libmodplug-0.8-r1 244
+MD5 1be334fdc8d38eea67d6928c162ac041 files/digest-libmodplug-0.8.4 250
+RMD160 a2ef5b2e60e99cc7c597d0a5850d706bde0ca871 files/digest-libmodplug-0.8.4 250
+SHA256 d27c62e06c98df68316b1e39b248ab990913d3f4779676ca9818b1c24bba5d81 files/digest-libmodplug-0.8.4 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZ11RAiZjviIA2XgRAt7FAJkBpMqqRKdFixdAQ7t0Ad4tUL98uwCfdVgN
-uJLT2f97/jMwsyQkofWNn/c=
-=Z90l
+iD8DBQFFZ2UbAiZjviIA2XgRAtSBAKC21ON4sZ7q9ScLSAQUwnpFbBm42wCgz8nR
+0bxM14APgj0injPc6IrvT4A=
+=eQb5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmodplug/files/digest-libmodplug-0.8.4 b/media-libs/libmodplug/files/digest-libmodplug-0.8.4
new file mode 100644
index 000000000000..590a3cc7437e
--- /dev/null
+++ b/media-libs/libmodplug/files/digest-libmodplug-0.8.4
@@ -0,0 +1,3 @@
+MD5 091bd1168a524a4f36fc61f95209e7e4 libmodplug-0.8.4.tar.gz 510758
+RMD160 0c4c179ebc32bf88cecb162c391e91a5d36ad834 libmodplug-0.8.4.tar.gz 510758
+SHA256 84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee libmodplug-0.8.4.tar.gz 510758
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/libmodplug-0.8.4.ebuild b/media-libs/libmodplug/libmodplug-0.8.4.ebuild
new file mode 100644
index 000000000000..00c81436294b
--- /dev/null
+++ b/media-libs/libmodplug/libmodplug-0.8.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmodplug/libmodplug-0.8.4.ebuild,v 1.1 2006/11/24 21:33:07 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Library for playing MOD-like music files"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: 1.0 - Bus Error on play
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.7-amd64.patch"
+	epatch "${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
+
+	sed -i -e 's:-ffast-math::' "${S}/configure.in"
+
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+}
+
+pkg_postinst() {
+	elog "Since version 0.8.4 onward, libmodplug supports MIDI playback."
+	elog "unfortunately to work correctly, this needs timidity patches,"
+	elog "but the code does not support the needed 'source' directive to"
+	elog "work with the patches currently in portage. For this reason it"
+	elog "will not work as intended yet."
+}