Fix ALSA support with patch from Matsuu Takuto in bug 97507. Other various fixes, including emake usage..

Package-Manager: portage-2.1.2.2

5 files changed, 104 insertions, 16 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 18b27bf96bd3..b797e16e603e 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmikmod
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.45 2006/12/30 15:52:35 chainsaw Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.46 2007/03/25 12:51:44 drac Exp $
+
+*libmikmod-3.1.11-r4 (25 Mar 2007)
+
+  25 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +files/libmikmod-3.1.11-alsa.patch, +libmikmod-3.1.11-r4.ebuild:
+  Fix ALSA support with patch from Matsuu Takuto in bug 97507. Other various
+  fixes, including emake usage.
 
   30 Dec 2006; Tony Vroon <chainsaw@gentoo.org> libmikmod-3.1.11-r3.ebuild:
   Stable on PPC64, only this version works properly on 64UL. Ack'ed by
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index f13edb0feb4a..9e0db7f46e75 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libmikmod-3.1.11-alsa.patch 816 RMD160 829c9a979849e1f770166f06674015a79be6d4bf SHA1 c6104ca5bfd56ef49565cf718f92db32ca7fd001 SHA256 4b6fa98756681b6a26d9207ed065a6b3f4d821df288c694b43f91e2d9c83930a
+MD5 675296ebde02ffd7ea25d0ce51c73d91 files/libmikmod-3.1.11-alsa.patch 816
+RMD160 829c9a979849e1f770166f06674015a79be6d4bf files/libmikmod-3.1.11-alsa.patch 816
+SHA256 4b6fa98756681b6a26d9207ed065a6b3f4d821df288c694b43f91e2d9c83930a files/libmikmod-3.1.11-alsa.patch 816
 AUX libmikmod-3.1.11-amd64-archdef.patch 490 RMD160 eeba4322c3cc54391acc35c6cfb9e544d32b5daa SHA1 c14d486348347e6608580dd94a94a7f3a75b33a3 SHA256 59101a6b5c25a4a8af7a18a7d9b206e3183380c80f490c251f9bb4140bcd7b6d
 MD5 0624777bac2c07bc43ba979a97bd863d files/libmikmod-3.1.11-amd64-archdef.patch 490
 RMD160 eeba4322c3cc54391acc35c6cfb9e544d32b5daa files/libmikmod-3.1.11-amd64-archdef.patch 490
@@ -27,10 +28,14 @@ EBUILD libmikmod-3.1.11-r3.ebuild 1262 RMD160 f67e31b5f04e757e8c81944c4cca94f04f
 MD5 1c0be05b53ab099bc5efa0dd96ce700b libmikmod-3.1.11-r3.ebuild 1262
 RMD160 f67e31b5f04e757e8c81944c4cca94f04fc72fb3 libmikmod-3.1.11-r3.ebuild 1262
 SHA256 271218e6864d4669460c7074eec32d127f0e8adc7c60938807e0864ebc61ed68 libmikmod-3.1.11-r3.ebuild 1262
-MISC ChangeLog 6185 RMD160 4db8735a0c4b47e5c469901025cc7c3dd063ffb2 SHA1 cef4df275cade1ad3008f561c51449c0c60bddc8 SHA256 5fc5dc5ed1d335fcb52115958fb5ea0950fe1436aab17adbc0dd02d59c93b70c
-MD5 97accd382a4a333958070253ba732692 ChangeLog 6185
-RMD160 4db8735a0c4b47e5c469901025cc7c3dd063ffb2 ChangeLog 6185
-SHA256 5fc5dc5ed1d335fcb52115958fb5ea0950fe1436aab17adbc0dd02d59c93b70c ChangeLog 6185
+EBUILD libmikmod-3.1.11-r4.ebuild 1323 RMD160 46b72586e511885082d7c36109d752cc45f6e03e SHA1 7c41b1dbf4bf71d60def9b9b05d841010291bc4d SHA256 c2d3ec88600d36cdd11e7720c4fe0c8560fa0492a8e7b3ee842a5652616a63ef
+MD5 e86bc31d98832ae5b2585d34f3f9cfee libmikmod-3.1.11-r4.ebuild 1323
+RMD160 46b72586e511885082d7c36109d752cc45f6e03e libmikmod-3.1.11-r4.ebuild 1323
+SHA256 c2d3ec88600d36cdd11e7720c4fe0c8560fa0492a8e7b3ee842a5652616a63ef libmikmod-3.1.11-r4.ebuild 1323
+MISC ChangeLog 6443 RMD160 6abb8da439faf125c39cd624b25c633c7a63404a SHA1 5b5821809bfafc2318c29df6090ebd0c134503aa SHA256 4d9fc8e6352107f0d3a789175b37713622f25754b140fa406f0eb97b98fd7f28
+MD5 a3ae30a89cc0a393390f717dcb3db6bf ChangeLog 6443
+RMD160 6abb8da439faf125c39cd624b25c633c7a63404a ChangeLog 6443
+SHA256 4d9fc8e6352107f0d3a789175b37713622f25754b140fa406f0eb97b98fd7f28 ChangeLog 6443
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -41,10 +46,6 @@ SHA256 893794fe0bcb7844b12bb1b74b5ea8af95b76aaba1b9c178b5effc75d148adc6 files/di
 MD5 390683167d648b72950db89680baf753 files/digest-libmikmod-3.1.11-r3 521
 RMD160 b51127b57f4e0f3fc479c7fbf90adbae301fee82 files/digest-libmikmod-3.1.11-r3 521
 SHA256 893794fe0bcb7844b12bb1b74b5ea8af95b76aaba1b9c178b5effc75d148adc6 files/digest-libmikmod-3.1.11-r3 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFFlos3p5vW4rUFj5oRAu0tAJ9oDwQ3ZdguntsK33U5/GlaFGN9dwCgkUJ2
-TER6LCDtC8xJtwIJOVJKpAc=
-=xbEk
------END PGP SIGNATURE-----
+MD5 390683167d648b72950db89680baf753 files/digest-libmikmod-3.1.11-r4 521
+RMD160 b51127b57f4e0f3fc479c7fbf90adbae301fee82 files/digest-libmikmod-3.1.11-r4 521
+SHA256 893794fe0bcb7844b12bb1b74b5ea8af95b76aaba1b9c178b5effc75d148adc6 files/digest-libmikmod-3.1.11-r4 521
diff --git a/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r4 b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r4
new file mode 100644
index 000000000000..6f922159993f
--- /dev/null
+++ b/media-libs/libmikmod/files/digest-libmikmod-3.1.11-r4
@@ -0,0 +1,6 @@
+MD5 5d7a4705bbc7260332e752f32e48613b libmikmod-3.1.11-esdm4.patch.bz2 2944
+RMD160 8abf8e31a5e3cb9ebee45a04b52ef04024894e25 libmikmod-3.1.11-esdm4.patch.bz2 2944
+SHA256 3dc3d413a9c617b919523866768559bee487a240670040f987825305609987da libmikmod-3.1.11-esdm4.patch.bz2 2944
+MD5 705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz 611590
+RMD160 79b144cce51340b4c9abe09d1110dba2333d7bfb libmikmod-3.1.11.tar.gz 611590
+SHA256 2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 libmikmod-3.1.11.tar.gz 611590
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
new file mode 100644
index 000000000000..1f14fc27f5d1
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
@@ -0,0 +1,26 @@
+diff -Naur libmikmod-3.1.11.orig/configure.in libmikmod-3.1.11/configure.in
+--- libmikmod-3.1.11.orig/configure.in	2004-01-22 02:43:52.000000000 +0900
++++ libmikmod-3.1.11/configure.in	2007-01-14 11:32:35.000000000 +0900
+@@ -6,7 +6,7 @@
+ 
+ LIBMIKMOD_MAJOR_VERSION=3
+ LIBMIKMOD_MINOR_VERSION=1
+-LIBMIKMOD_MICRO_VERSION=10
++LIBMIKMOD_MICRO_VERSION=11
+ 
+ BETA=
+ 
+@@ -257,10 +257,10 @@
+ if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
+ then
+ 	libmikmod_driver_alsa=no
+-	AC_CHECK_HEADERS(sys/asoundlib.h)
+-	if test $ac_cv_header_sys_asoundlib_h = yes
++	AC_CHECK_HEADERS(alsa/asoundlib.h)
++	if test $ac_cv_header_alsa_asoundlib_h = yes
+ 	then
+-		AC_CHECK_LIB(asound,snd_cards,libmikmod_driver_alsa=yes)
++		AC_CHECK_LIB(asound,snd_card_load,libmikmod_driver_alsa=yes)
+ 	fi
+ else
+ 	libmikmod_driver_alsa=no
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild
new file mode 100644
index 000000000000..c2e9e36cf3cf
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild,v 1.1 2007/03/25 12:51:44 drac Exp $
+
+WANT_AUTOMAKE="1.5"
+
+inherit flag-o-matic eutils libtool autotools
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.raphnet.net/"
+SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz
+	mirror://gentoo/${P}-esdm4.patch.bz2"
+
+LICENSE="|| ( LGPL-2.1 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="oss esd alsa"
+
+DEPEND=">=media-libs/audiofile-0.2.3
+	alsa? ( >=media-libs/alsa-lib-0.5.9 )
+	esd? ( >=media-sound/esound-0.2.19 )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${DISTDIR}"/${P}-esdm4.patch.bz2
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/${P}-amd64-ppc64-archdef.patch
+	epatch "${FILESDIR}"/${P}-respectflags.patch
+	epatch "${FILESDIR}"/${P}-alsa.patch
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_compile() {
+	econf --enable-af \
+		$(use_enable esd) \
+		$(use_enable alsa) \
+		$(use_enable oss)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+}