From: Diego Elio Pettenò Date: Sun, 11 Feb 2007 18:47:51 +0000 (+0000) Subject: Add a midi useflag to disable building of the tools that require snd_seq_* functions... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16578fd7bdb2972d258c9b951aba61790c20843a;p=gentoo.git Add a midi useflag to disable building of the tools that require snd_seq_* functions, so that the package can be built with alsa-lib with the midi useflag disabled. Package-Manager: portage-2.1.2-r9 --- diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog index 939d7dc2522b..666ddbbd8225 100644 --- a/media-sound/alsa-tools/ChangeLog +++ b/media-sound/alsa-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-tools # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.135 2007/02/11 18:37:56 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.136 2007/02/11 18:47:51 flameeyes Exp $ + + 11 Feb 2007; Diego Pettenò + alsa-tools-1.0.14_rc1.ebuild: + Add a midi useflag to disable building of the tools that require snd_seq_* + functions, so that the package can be built with alsa-lib with the midi + useflag disabled. 11 Feb 2007; Diego Pettenò alsa-tools-1.0.13.ebuild, alsa-tools-1.0.14_rc1.ebuild: diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest index 9df8a679e02b..f4cb93ae962e 100644 --- a/media-sound/alsa-tools/Manifest +++ b/media-sound/alsa-tools/Manifest @@ -11,14 +11,14 @@ EBUILD alsa-tools-1.0.13.ebuild 2101 RMD160 a2ab656d8d28038ff6a8ab45a49b7d6ea195 MD5 f25cd526260d3c488eacb6d0c2faa21b alsa-tools-1.0.13.ebuild 2101 RMD160 a2ab656d8d28038ff6a8ab45a49b7d6ea1957178 alsa-tools-1.0.13.ebuild 2101 SHA256 fe512b0942bd3825572197d4fe1e2cba8d0a19211c7b244926ec54617f4f6b02 alsa-tools-1.0.13.ebuild 2101 -EBUILD alsa-tools-1.0.14_rc1.ebuild 2159 RMD160 46626628beabf1b509ed5502689578cb96adc844 SHA1 28d6882dddd6e8aec2606b95ac464593491874f9 SHA256 93eccb8352544a48980d4e095913be6a9da3ab140ab5381fc12491fe0f9a5bbb -MD5 e010a6f62962ca3a7b819ae939457809 alsa-tools-1.0.14_rc1.ebuild 2159 -RMD160 46626628beabf1b509ed5502689578cb96adc844 alsa-tools-1.0.14_rc1.ebuild 2159 -SHA256 93eccb8352544a48980d4e095913be6a9da3ab140ab5381fc12491fe0f9a5bbb alsa-tools-1.0.14_rc1.ebuild 2159 -MISC ChangeLog 18893 RMD160 30dfefbc52e527edb4cd6cd4a6a09896dfdf05c4 SHA1 1618b113e7acad8f1cf88a30ad50d33e6b0c1a30 SHA256 a7b366b27dc89b510ac708992da399a5f10f0136c833c4c4c50c493d4000b4a2 -MD5 b9fba63a109e5ad270a31b2cf91f205e ChangeLog 18893 -RMD160 30dfefbc52e527edb4cd6cd4a6a09896dfdf05c4 ChangeLog 18893 -SHA256 a7b366b27dc89b510ac708992da399a5f10f0136c833c4c4c50c493d4000b4a2 ChangeLog 18893 +EBUILD alsa-tools-1.0.14_rc1.ebuild 2559 RMD160 32f8392e63f417457e1662e7ba49fcd20e443834 SHA1 38f0db19e338895deb40e6e6a98f06dee6f00806 SHA256 40b1ebd56e7e6dc9a93e3713042b7c0f7f35691a17bcd9f90782d0246f7e09aa +MD5 8923aca6d0412d1ddc99665ed28d8260 alsa-tools-1.0.14_rc1.ebuild 2559 +RMD160 32f8392e63f417457e1662e7ba49fcd20e443834 alsa-tools-1.0.14_rc1.ebuild 2559 +SHA256 40b1ebd56e7e6dc9a93e3713042b7c0f7f35691a17bcd9f90782d0246f7e09aa alsa-tools-1.0.14_rc1.ebuild 2559 +MISC ChangeLog 19150 RMD160 679dc153f29ab0e1eb56df980d0d656234d32c09 SHA1 6ffc796bfadbb7eb59c670a22c11f30a25e9e709 SHA256 bccedd1abd56bb2d7b4373dc750be771d66ba3b2718df9868cb3415a2577fdd0 +MD5 661b5e9751538045670260d2cfb4f26d ChangeLog 19150 +RMD160 679dc153f29ab0e1eb56df980d0d656234d32c09 ChangeLog 19150 +SHA256 bccedd1abd56bb2d7b4373dc750be771d66ba3b2718df9868cb3415a2577fdd0 ChangeLog 19150 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -32,7 +32,7 @@ SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFz2KLAiZjviIA2XgRAt7nAJwP+Dr5IoVQdct3FDmC1f3EP4hIsgCgyT8h -YXl8g1IFeD6NvoDTOsaeBS8= -=jcWE +iD8DBQFFz2TeAiZjviIA2XgRAmAwAKCHDA7jvavQjYLfitjuquuQb743/gCeNwjc +wKS//PYRn9s5xr6/hGW1V80= +=UuXc -----END PGP SIGNATURE----- diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild index 4a8bc9eb8e51..dcb934d659d2 100644 --- a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild,v 1.8 2007/02/11 18:37:56 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild,v 1.9 2007/02/11 18:47:51 flameeyes Exp $ WANT_AUTOMAKE="1.9" WANT_AUTOCONF="2.5" @@ -16,7 +16,7 @@ SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0.9" KEYWORDS="~amd64 ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="fltk gtk" +IUSE="fltk gtk midi" RDEPEND=">=media-libs/alsa-lib-1.0.0 fltk? ( =x11-libs/fltk-1.1* ) @@ -26,12 +26,23 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" pkg_setup() { - ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload - sscape_ctl us428control usx2yloader vxloader" + if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "" + eerror "To be able to build ${CATEGORY}/${PN} with midi support you" + eerror "need to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi + + ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader + sscape_ctl usx2yloader vxloader" + + use midi && ALSA_TOOLS="${ALSA_TOOLS} seq/sbiload us428control" use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer" - use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol" + use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer rmedigicontrol" + use gtk && use midi && ALSA_TOOLS="${ALSA_TOOLS} envy24control" + # sb16_csp won't build on ppc64 _AND_ ppc (and is not needed) if use !ppc64 && use !ppc; then ALSA_TOOLS="${ALSA_TOOLS} sb16_csp" @@ -68,8 +79,8 @@ src_compile() { for f in ${ALSA_TOOLS} do cd "${S}/${f}" - econf --with-gtk2 || die "econf failed" - make || die "make failed" + econf --with-gtk2 || die "econf ${f} failed" + emake || die "emake ${f} failed" done }