Add a patch to allow building akode with the experimental alsa-lib with sequencer (midi) disabled.

Package-Manager: portage-2.1.2-r8

5 files changed, 136 insertions, 20 deletions

diff --git a/media-libs/akode/ChangeLog b/media-libs/akode/ChangeLog
index 0a39e26010c1..1feae5476b8d 100644
--- a/media-libs/akode/ChangeLog
+++ b/media-libs/akode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/akode
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/ChangeLog,v 1.23 2006/10/20 21:37:38 kloeri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/ChangeLog,v 1.24 2007/02/06 21:49:43 flameeyes Exp $
+
+  06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/akode-2.0.1-alsa-tests.patch, akode-2.0.1.ebuild:
+  Add a patch to allow building akode with the experimental alsa-lib with
+  sequencer (midi) disabled.
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> akode-2.0.1.ebuild:
   Stable on Alpha.
diff --git a/media-libs/akode/Manifest b/media-libs/akode/Manifest
index 8b3c2e0e60a0..7643bbcd33c4 100644
--- a/media-libs/akode/Manifest
+++ b/media-libs/akode/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX akode-2.0.1-alsa-tests.patch 2369 RMD160 5f2f833524823daa1cc51b6ebe1f0e8005a84e3a SHA1 b0a7928e82bed3cae6c46283e66b71c59723c85a SHA256 4f22d466e2ac1b4838c9b9bd7861817f34de9602749bdda8890b7686a9d7612e
+MD5 f81efdb0c8e6b88a4781c763df8de9f0 files/akode-2.0.1-alsa-tests.patch 2369
+RMD160 5f2f833524823daa1cc51b6ebe1f0e8005a84e3a files/akode-2.0.1-alsa-tests.patch 2369
+SHA256 4f22d466e2ac1b4838c9b9bd7861817f34de9602749bdda8890b7686a9d7612e files/akode-2.0.1-alsa-tests.patch 2369
 DIST 30375-akode-2.0.1.tar.bz2 460964 RMD160 e476f01a6baea4051e407166b1997ecdca1bfa86 SHA1 122fe6aabda78a8bda6d81074b7b66eb424f34eb SHA256 a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e
-DIST 30375-akode-2.0b3.tar.gz 643404
+DIST 30375-akode-2.0b3.tar.gz 643404 RMD160 34dfdd7da4c839c54d4cd34d79c62d02514d0137 SHA1 a4287bf6ea50c44589160e0c8ccbfe143d210428 SHA256 f84b19b26ad7040ade074160ac6a9c50d44941b75fb04526cea078e2bab5b577
 DIST 30375-akode-2.0rc1.tar.gz 650104 RMD160 8db2eefab88b204231947f29a4963f2c91944d26 SHA1 f1c7193f3d0f173d19668b67485b973e63f06f20 SHA256 26f77ca7f41e494b7e97c2cf2f7aad2a3cd77f7f6728118d0b8b9b752a655b1a
-EBUILD akode-2.0.1.ebuild 1266 RMD160 cc991a88a830486d0c746c5e0f2f8da618792f0c SHA1 dfe83f6334de0f3e0a81dd5d4cf4b7b2aac19129 SHA256 7ecc8bfbd3b0f68c4022a647ad20cb35a8646efb779ccd7369424bad87091378
-MD5 61e428f67f65b9882c26386084a37b88 akode-2.0.1.ebuild 1266
-RMD160 cc991a88a830486d0c746c5e0f2f8da618792f0c akode-2.0.1.ebuild 1266
-SHA256 7ecc8bfbd3b0f68c4022a647ad20cb35a8646efb779ccd7369424bad87091378 akode-2.0.1.ebuild 1266
+EBUILD akode-2.0.1.ebuild 1569 RMD160 22af9552b5b5a5b40c1c35e43bcc1818de532dab SHA1 d28f5ec2ffc3fbb46d396f6639b6b96b81887f58 SHA256 f8e6ddceb19792e2ccbab35d12ce133187cab34561cd663e2731a978d58107a8
+MD5 6f8d689196d037e07ca5657a2ee3fa76 akode-2.0.1.ebuild 1569
+RMD160 22af9552b5b5a5b40c1c35e43bcc1818de532dab akode-2.0.1.ebuild 1569
+SHA256 f8e6ddceb19792e2ccbab35d12ce133187cab34561cd663e2731a978d58107a8 akode-2.0.1.ebuild 1569
 EBUILD akode-2.0_beta3.ebuild 1244 RMD160 5fbb36a67ef54d0216233128e079b28baa7fd68d SHA1 03f697e9006b26ee22bea95394742668b370ee74 SHA256 6272a9beb1936de51c6d416525d73181de0d065aa7f958d1e5ecac36c5ecd939
 MD5 458c99a66374878127d005bbbcfc8656 akode-2.0_beta3.ebuild 1244
 RMD160 5fbb36a67ef54d0216233128e079b28baa7fd68d akode-2.0_beta3.ebuild 1244
@@ -13,10 +20,10 @@ EBUILD akode-2.0_rc1.ebuild 1211 RMD160 602c5c1c24b54843364c651b02091b2118a1a3cd
 MD5 ae4a37da5b51caf9fd970e30a46d526d akode-2.0_rc1.ebuild 1211
 RMD160 602c5c1c24b54843364c651b02091b2118a1a3cd akode-2.0_rc1.ebuild 1211
 SHA256 b799a452de9ce07685587f67c4bd1e5941f80d90b14208519478b45fa0954090 akode-2.0_rc1.ebuild 1211
-MISC ChangeLog 2819 RMD160 84aec1e436c45dbff2a01da7894eb4c3e45538af SHA1 ff94ee7cf93cd0b7676a81342526dcc68bd2cfda SHA256 5a2c03c3b37957e17964029c15b65eea56169f694f79899e3b0ff3cdd7d96b3a
-MD5 0a74ee557f6bb7b29adf21b6e15db0d1 ChangeLog 2819
-RMD160 84aec1e436c45dbff2a01da7894eb4c3e45538af ChangeLog 2819
-SHA256 5a2c03c3b37957e17964029c15b65eea56169f694f79899e3b0ff3cdd7d96b3a ChangeLog 2819
+MISC ChangeLog 3038 RMD160 8cdba247181988b7df9559444a327a318570399c SHA1 e3e81d277431e022ef83ae35d1db99adf112fff3 SHA256 d2d3cd864858c9c612fd03af105e8fde76c8bbe619a82b7b0b19627670054860
+MD5 c7953069b34d3c9409b8323b8607dc80 ChangeLog 3038
+RMD160 8cdba247181988b7df9559444a327a318570399c ChangeLog 3038
+SHA256 d2d3cd864858c9c612fd03af105e8fde76c8bbe619a82b7b0b19627670054860 ChangeLog 3038
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -24,9 +31,16 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 087f975a2f8dfeb3a370c6a14364f34c files/digest-akode-2.0.1 256
 RMD160 027f18d077b9fc197013ffe2adb72e224bf8a928 files/digest-akode-2.0.1 256
 SHA256 62720b021d9ad61430b3ae155f38572330574f805e0ef8a84da46b15e2a05e89 files/digest-akode-2.0.1 256
-MD5 8d4c9e8ba9c53cc3841b090130ae40cf files/digest-akode-2.0_beta3 69
-RMD160 aba1953ef250de91dab0ffd9dfd644ca3315c2db files/digest-akode-2.0_beta3 69
-SHA256 6ab472964e9ff3d44f01b64726beba26fd9391ea1835af28c82edb5fe3cba760 files/digest-akode-2.0_beta3 69
+MD5 3022c4333231675569d5a9f211fd06de files/digest-akode-2.0_beta3 253
+RMD160 f50f1db56feb1742443fd5052e791ef0433d8612 files/digest-akode-2.0_beta3 253
+SHA256 65dada63e41136d1f5789907212cccc5ca97ea738ff1f57b62d5d31becf956f0 files/digest-akode-2.0_beta3 253
 MD5 687d74f954b244f9078631094f47e54a files/digest-akode-2.0_rc1 256
 RMD160 8a4c6a9f79f9c7b5c6027315c38d5f619f87d809 files/digest-akode-2.0_rc1 256
 SHA256 a74d9e3b1d96324604408df4bea931381b2b7726edc83005717f978524d23e0c files/digest-akode-2.0_rc1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFyPf/AiZjviIA2XgRAm8IAJ99iVrxIZYJ/D91Zz2PflUWzEoS0QCfU1AT
+Qjcs9cWrjJOON3oXsDysBwI=
+=q1qa
+-----END PGP SIGNATURE-----
diff --git a/media-libs/akode/akode-2.0.1.ebuild b/media-libs/akode/akode-2.0.1.ebuild
index d8a367d5a428..6ead00f0622f 100644
--- a/media-libs/akode/akode-2.0.1.ebuild
+++ b/media-libs/akode/akode-2.0.1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.1.ebuild,v 1.9 2006/10/20 21:37:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/akode/akode-2.0.1.ebuild,v 1.10 2007/02/06 21:49:43 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="2.5"
+
+inherit eutils autotools
 
 MY_P=${P/_beta/b}
 S=${WORKDIR}/${MY_P}
@@ -23,12 +28,26 @@ DEPEND="media-libs/libsamplerate
 	vorbis? ( media-libs/libvorbis )
 	speex? ( media-libs/speex )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-alsa-tests.patch"
+
+	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
+		admin/cvs.sh
+
+	emake -j1 -f admin/Makefile.common || die "unable to regenerate configure"
+
+	elibtoolize
+}
+
 src_compile() {
 	local myconf="--with-libsamplerate
-	              $(use_with oss) $(use_with alsa) $(use_with jack)
-	              $(use_with flac) $(use_with mp3 libmad)
-	              $(use_with vorbis) $(use_with speex)
-	              --without-polypaudio"
+				  $(use_with oss) $(use_with alsa) $(use_with jack)
+				  $(use_with flac) $(use_with mp3 libmad)
+				  $(use_with vorbis) $(use_with speex)
+				  --without-polypaudio"
 
 	econf ${myconf} || die
 	emake || die
diff --git a/media-libs/akode/files/akode-2.0.1-alsa-tests.patch b/media-libs/akode/files/akode-2.0.1-alsa-tests.patch
new file mode 100644
index 000000000000..94dabc153dea
--- /dev/null
+++ b/media-libs/akode/files/akode-2.0.1-alsa-tests.patch
@@ -0,0 +1,76 @@
+Index: akode-2.0.1/akode/configure.in.in
+===================================================================
+--- akode-2.0.1.orig/akode/configure.in.in
++++ akode-2.0.1/akode/configure.in.in
+@@ -105,59 +105,11 @@ AC_DEFUN([KDE_CHECK_SUN],
+ 
+ AC_DEFUN([KDE_CHECK_ALSA],
+ [
+-  have_alsa=no
++  PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa=yes], [have_alsa=no])
+ 
+-  AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h],
+-    [have_alsa=yes])
+-
+-  AC_CHECK_LIB(asound, snd_seq_create_simple_port,
+-    [:], [have_alsa=no])
+-
+-  AC_LANG_SAVE
+-  AC_LANG_C
+-  if test "x$have_alsa" = xyes; then
+-    AC_TRY_COMPILE([
+-      #include "confdefs.h"
+-      #ifdef HAVE_SYS_ASOUNDLIB_H
+-      #include <sys/asoundlib.h>
+-      #endif
+-      #ifdef HAVE_ALSA_ASOUNDLIB_H
+-      #include <alsa/asoundlib.h>
+-      #endif
+-    ],[
+-      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)
+-        /* we have ALSA 0.9.x */
+-      #else
+-        #error not ALSA 0.9.x
+-      #endif
+-    ],
+-    have_alsa_0_9=yes)
+-
+-    AC_TRY_COMPILE([
+-      #include "confdefs.h"
+-      #ifdef HAVE_SYS_ASOUNDLIB_H
+-      #include <sys/asoundlib.h>
+-      #endif
+-      #ifdef HAVE_ALSA_ASOUNDLIB_H
+-      #include <alsa/asoundlib.h>
+-      #endif
+-    ],[
+-      #if (SND_LIB_MAJOR == 1)
+-        /* we have ALSA 1.x */
+-      #else
+-        #error not ALSA 1.x
+-      #endif
+-    ],
+-    have_alsa_1=yes)
+-  fi
+-  AC_LANG_RESTORE
+-
+-  if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then
+-    LIBASOUND="-lasound"
++  if test "x$have_alsa" = "xyes"; then
+     AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
+   fi
+-
+-  AC_SUBST(LIBASOUND)
+ ])
+ 
+ AC_ARG_WITH(flac,AC_HELP_STRING([--with-flac],[Enable FLAC support @<:@default=check@:>@]),[flac_test="$withval"],[flac_test="yes"])
+Index: akode-2.0.1/akode/plugins/alsa_sink/Makefile.am
+===================================================================
+--- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.am
++++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.am
+@@ -4,4 +4,4 @@ lib_LTLIBRARIES	= libakode_alsa_sink.la
+ 
+ libakode_alsa_sink_la_SOURCES = alsa_sink.cpp
+ libakode_alsa_sink_la_LDFLAGS = -module -avoid-version -no-undefined
+-libakode_alsa_sink_la_LIBADD = ../../lib/libakode.la $(LIBASOUND)
++libakode_alsa_sink_la_LIBADD = ../../lib/libakode.la $(ALSA_LIBS)
diff --git a/media-libs/akode/files/digest-akode-2.0_beta3 b/media-libs/akode/files/digest-akode-2.0_beta3
index 1fc8ee839def..92c188276d4a 100644
--- a/media-libs/akode/files/digest-akode-2.0_beta3
+++ b/media-libs/akode/files/digest-akode-2.0_beta3
@@ -1 +1,3 @@
 MD5 b78b747e87811726ab336334038c64d8 30375-akode-2.0b3.tar.gz 643404
+RMD160 34dfdd7da4c839c54d4cd34d79c62d02514d0137 30375-akode-2.0b3.tar.gz 643404
+SHA256 f84b19b26ad7040ade074160ac6a9c50d44941b75fb04526cea078e2bab5b577 30375-akode-2.0b3.tar.gz 643404