Add patch to allow disabling sequencer-related utilities, so that the package can be built without midi support enabled in alsa-lib.

(Portage version: 2.1.2)

3 files changed, 68 insertions, 4 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 4a287d25d68c..1cbec854737a 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.187 2007/01/16 22:55:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.188 2007/01/16 23:49:11 flameeyes Exp $
+
+  16 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-utils-1.0.14_rc2-seq.patch, alsa-utils-1.0.14_rc2.ebuild:
+  Add patch to allow disabling sequencer-related utilities, so that the
+  package can be built without midi support enabled in alsa-lib.
 
 *alsa-utils-1.0.14_rc2 (16 Jan 2007)
 
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
index 792ff52e8de2..55a8b449da57 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild,v 1.1 2007/01/16 22:55:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild,v 1.2 2007/01/16 23:49:11 flameeyes Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
 
 inherit eutils autotools
 
@@ -13,7 +16,7 @@ SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.9"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="nls"
+IUSE="nls midi"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
@@ -21,7 +24,18 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+#pkg_setup() {
+# leave commented out for now as built_with_use cannot be used for this check
+#	if use midi && ! built_with_use media-libs/alsa-lib midi; then
+#		ewarn "To be able to build alsa-utils with midi support you need"
+#		ewarn "to have built media-libs/alsa-lib with midi useflag, if"
+#		ewarn "it has one. Otherwise, the package might fail to build."
+#		# This is not fatal because the version of alsa-lib with midi disabled
+#		# is not yet unmasked.
+#	fi
+#}
 
 src_unpack() {
 	unpack ${A}
@@ -29,11 +43,15 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
 	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
+	epatch "${FILESDIR}/${P}-seq.patch"
+
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
 	econf \
 		$(use_enable nls) \
+		$(use_enable midi sequencer) \
 		|| die "configure failed"
 
 	emake || die "make failed"
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.14_rc2-seq.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.14_rc2-seq.patch
new file mode 100644
index 000000000000..da26315363f7
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.14_rc2-seq.patch
@@ -0,0 +1,41 @@
+Index: alsa-utils-1.0.14rc2/configure.in
+===================================================================
+--- alsa-utils-1.0.14rc2.orig/configure.in
++++ alsa-utils-1.0.14rc2/configure.in
+@@ -82,6 +82,18 @@ AC_ARG_WITH(testsound,
+   TESTSOUND="$dir/test.wav")
+ AC_SUBST(TESTSOUND)
+ 
++AC_ARG_ENABLE([sequencer],
++  [AC_HELP_STRING([--disable-sequencer], [Disable sequencer utilities (aconnect, aplaymidi, aseqdump, aseqnet)])] )
++
++if test "x$enable_sequencer" != "xno"; then
++   AC_CHECK_LIB([asound], [snd_seq_open], [has_seq=yes], [has_seq=no])
++fi
++if test "x$enable_sequencer" = "xyes" && test "x$has_seq" = "xno"; then
++   AC_MSG_FAILURE([cannot find snd_seq_open. ALSA was built without sequencer support])
++fi
++
++AM_CONDITIONAL([BUILD_SEQ], [test "x$has_seq" = "xyes"])
++
+ AM_CONFIG_HEADER(include/aconfig.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+Index: alsa-utils-1.0.14rc2/Makefile.am
+===================================================================
+--- alsa-utils-1.0.14rc2.orig/Makefile.am
++++ alsa-utils-1.0.14rc2/Makefile.am
+@@ -4,7 +4,12 @@ ALSAMIXER_DIR=alsamixer
+ else
+ ALSAMIXER_DIR=
+ endif
+-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
++
++if BUILD_SEQ
++SEQ_DIR=seq
++endif
++
++SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset $(SEQ_DIR) speaker-test utils m4 po
+ EXTRA_DIST= config.rpath mkinstalldirs  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I m4