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

(Portage version: 2.1.2-r8)

4 files changed, 110 insertions, 8 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/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