Add patch to allow disabling sequencer-related utilities, so that the package can...

Package-Manager: portage-2.1.2

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 4a287d25d68cad41911bc9197d149241e1ad1f35..1cbec854737ad8819df159d449571d5e97527c28 100644 (file)
--- 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/Manifest b/media-sound/alsa-utils/Manifest
index caa0e40b3a901957b91dfb10a74cdb4c588ca384..fcda1627209bfb3e07ddc664dde5a3b254e34567 100644 (file)
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -13,6 +13,10 @@ AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649 RMD160 cfb4dac18bfacf45bbb
 MD5 6d9f0b77efeae08719b53549edfb9507 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
 RMD160 cfb4dac18bfacf45bbb78e0c3278b431d5015d30 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
 SHA256 e4da9da92bb88fbf66897da35b588bb81b6d4899a129d59237fd4d65cdd59a55 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
+AUX alsa-utils-1.0.14_rc2-seq.patch 1581 RMD160 66b1abc9b0cf810a5d51ae4878754d7fd767c3ce SHA1 bab8bcaacf5f339a0cfe38918db70405abf6ed43 SHA256 4ee63baf37506098b50d15c21aabadd7d80f7561a824bab541e89b4320da86c7
+MD5 9450bed77397033fbf23bb4074c4b634 files/alsa-utils-1.0.14_rc2-seq.patch 1581
+RMD160 66b1abc9b0cf810a5d51ae4878754d7fd767c3ce files/alsa-utils-1.0.14_rc2-seq.patch 1581
+SHA256 4ee63baf37506098b50d15c21aabadd7d80f7561a824bab541e89b4320da86c7 files/alsa-utils-1.0.14_rc2-seq.patch 1581
 AUX alsasound-1.0.10_rc2 7183 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c SHA1 70260ad940df48464a4089f014b73956a690eb3e SHA256 f9f51f35e0fafb87ac9d5f2b48835142e34bcaecc30eb28c92e2af6b16d4c083
 MD5 6e3b02ef9e95e47eb339f6a3d0d91daa files/alsasound-1.0.10_rc2 7183
 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c files/alsasound-1.0.10_rc2 7183
@@ -42,14 +46,14 @@ EBUILD alsa-utils-1.0.14_rc1.ebuild 2567 RMD160 bc3da62968d1aa7c0f45b287348d4542
 MD5 d29de6459ee4ffbf7b2208dc2011dd56 alsa-utils-1.0.14_rc1.ebuild 2567
 RMD160 bc3da62968d1aa7c0f45b287348d4542393cb553 alsa-utils-1.0.14_rc1.ebuild 2567
 SHA256 7a7f4e9101e5eee058eff3843cae40fffdb5ea4768e95611ae639c9bc02ca414 alsa-utils-1.0.14_rc1.ebuild 2567
-EBUILD alsa-utils-1.0.14_rc2.ebuild 2574 RMD160 cc8520e1f2681ee6993d280f3a8e89f7103a5599 SHA1 d75cf40fe12300729688fa666840c343f5036bc4 SHA256 3fdb3185dddcc67751cde289a13c100bead6e1a67eba364ba4b41532c4ad8201
-MD5 6271213b1097b1806203944620bfc95b alsa-utils-1.0.14_rc2.ebuild 2574
-RMD160 cc8520e1f2681ee6993d280f3a8e89f7103a5599 alsa-utils-1.0.14_rc2.ebuild 2574
-SHA256 3fdb3185dddcc67751cde289a13c100bead6e1a67eba364ba4b41532c4ad8201 alsa-utils-1.0.14_rc2.ebuild 2574
-MISC ChangeLog 27631 RMD160 ea46faff9ce5e66f24539c846942f34f6c32f436 SHA1 775c23b5aff837402a351787c44a587a221a1acd SHA256 96dc792e9f23c80829c58c2f693a58c5fcc626a2886abfa907899d13b29f0073
-MD5 e690603ba0b6bf48da716d2e48156907 ChangeLog 27631
-RMD160 ea46faff9ce5e66f24539c846942f34f6c32f436 ChangeLog 27631
-SHA256 96dc792e9f23c80829c58c2f693a58c5fcc626a2886abfa907899d13b29f0073 ChangeLog 27631
+EBUILD alsa-utils-1.0.14_rc2.ebuild 3196 RMD160 2b5298b70d0f2899b930e7b35cdec8b852ea3906 SHA1 2ab6db64fb557507edf04a68ecb585e54e0d2182 SHA256 8309628e5ad9dc455c5acedded476744543d3c19b3f5878395b1dfbe90e21d7f
+MD5 7c2c31893543b526134828d34707c078 alsa-utils-1.0.14_rc2.ebuild 3196
+RMD160 2b5298b70d0f2899b930e7b35cdec8b852ea3906 alsa-utils-1.0.14_rc2.ebuild 3196
+SHA256 8309628e5ad9dc455c5acedded476744543d3c19b3f5878395b1dfbe90e21d7f alsa-utils-1.0.14_rc2.ebuild 3196
+MISC ChangeLog 27894 RMD160 646c687136f017eb7fbf422b43046d0556939066 SHA1 a45c0e243d52354466cd77633cd5987939d4b468 SHA256 4e005dd16d8448da1d58b7dd49beea8d13cb3884d45a6d740c9ff632a023b8fa
+MD5 7e96c4f93f6810ee31c99fcb758b0610 ChangeLog 27894
+RMD160 646c687136f017eb7fbf422b43046d0556939066 ChangeLog 27894
+SHA256 4e005dd16d8448da1d58b7dd49beea8d13cb3884d45a6d740c9ff632a023b8fa ChangeLog 27894
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -72,7 +76,7 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFrVfwAiZjviIA2XgRAqhIAKC0vVxODeBs3/ecdn0+PCk3DF+WJgCePxjT
-11rf7EW0wklW9yHhKNB+V8c=
-=fshp
+iD8DBQFFrWSIAiZjviIA2XgRAvVcAJ4307CulkemOILIv9CNfmgaAz7M6wCgw8y5
+UnImPXZiX/p2nsf/dRu4pY4=
+=Is5A
 -----END PGP SIGNATURE-----

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 792ff52e8de2d89473620568dccd1b2f95c73328..55a8b449da5721def4963e6558faad797d495766 100644 (file)
--- 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 (file)
index 0000000..da26315
--- /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