From 921d29b83fb230032b51cc5ae08e0609e86d20c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 21 Dec 2006 16:13:55 +0000 Subject: [PATCH] Cleanup 1.0.14_rc1 ebuild, remove autotools calls (this is no more a snapshot), add alsa-headers only as build-time depend, and remove the patching on 2.6.17 or newer kernels: serialmidi driver is simply broken, so disable it for good. Package-Manager: portage-2.1.2_rc3-r9 --- media-sound/alsa-driver/ChangeLog | 9 +++++- media-sound/alsa-driver/Manifest | 22 +++++++-------- .../alsa-driver/alsa-driver-1.0.14_rc1.ebuild | 28 ++++--------------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 098ce29ddbf3..3f77a98e1060 100644 --- a/media-sound/alsa-driver/ChangeLog +++ b/media-sound/alsa-driver/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/alsa-driver # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.247 2006/12/21 15:57:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.248 2006/12/21 16:13:55 flameeyes Exp $ + + 21 Dec 2006; Diego Pettenò + alsa-driver-1.0.14_rc1.ebuild: + Cleanup 1.0.14_rc1 ebuild, remove autotools calls (this is no more a + snapshot), add alsa-headers only as build-time depend, and remove the + patching on 2.6.17 or newer kernels: serialmidi driver is simply broken, so + disable it for good. 21 Dec 2006; Diego Pettenò -files/alsa-driver-1.0.10_rc1-include.patch, diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index e7b4ecbcb15e..2b0610f3122a 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -11,18 +11,18 @@ EBUILD alsa-driver-1.0.13.ebuild 5065 RMD160 d9794eae68f06e8127f334d4fbf4f86e3bc MD5 e7e2a6a1f49879c3c8920d2542d33454 alsa-driver-1.0.13.ebuild 5065 RMD160 d9794eae68f06e8127f334d4fbf4f86e3bc1ca8f alsa-driver-1.0.13.ebuild 5065 SHA256 503ea89b408704a0d58b5f35988adc884795c40ab10dd94759ce91894b1249fd alsa-driver-1.0.13.ebuild 5065 -EBUILD alsa-driver-1.0.14_rc1.ebuild 6819 RMD160 e6b84ee9f1ba7b0027a898b09ba1716bdc547e4a SHA1 e9512b5eee157e137154d06d45260cd09dad84e5 SHA256 a6d338fa2233b8bbdfd8900abef7f87af9f87e8d42d5102defe1c16a0ac22a85 -MD5 2192f6ba973e3e3fde0b4714b16a7da8 alsa-driver-1.0.14_rc1.ebuild 6819 -RMD160 e6b84ee9f1ba7b0027a898b09ba1716bdc547e4a alsa-driver-1.0.14_rc1.ebuild 6819 -SHA256 a6d338fa2233b8bbdfd8900abef7f87af9f87e8d42d5102defe1c16a0ac22a85 alsa-driver-1.0.14_rc1.ebuild 6819 +EBUILD alsa-driver-1.0.14_rc1.ebuild 6339 RMD160 abc1d8a2faadae6c5eed67a064bb50e00f092b74 SHA1 887424dbb948df9103495a4b5122277f7c643f7a SHA256 8012dfdac79872a885da6ac9002a5ad946f323625a447801ef60406d442757cb +MD5 b85f49faa9db6e5bbf75abb06f1b49c2 alsa-driver-1.0.14_rc1.ebuild 6339 +RMD160 abc1d8a2faadae6c5eed67a064bb50e00f092b74 alsa-driver-1.0.14_rc1.ebuild 6339 +SHA256 8012dfdac79872a885da6ac9002a5ad946f323625a447801ef60406d442757cb alsa-driver-1.0.14_rc1.ebuild 6339 EBUILD alsa-driver-9999.ebuild 4833 RMD160 428db274715f43b3f617bee7a1ee089c4362c6c7 SHA1 230739968d5438300e6417ebb0019c497e2c59d4 SHA256 c083edd17448cf57235c22757ed40cd688a291af79e8ce6782b7b366d8e52909 MD5 d6a4945817218998f012b0e934eefe76 alsa-driver-9999.ebuild 4833 RMD160 428db274715f43b3f617bee7a1ee089c4362c6c7 alsa-driver-9999.ebuild 4833 SHA256 c083edd17448cf57235c22757ed40cd688a291af79e8ce6782b7b366d8e52909 alsa-driver-9999.ebuild 4833 -MISC ChangeLog 43104 RMD160 74e0c9bb86541a7ccb6bf6bd951ec7fe21a2239c SHA1 ecde5f234b7c69594a9f44215383168e1be46b25 SHA256 b270f19aa69825a041df5ce39066a539133c88be925fc4f133db8af2093bae2c -MD5 e33c1cb56f10bf1a211dde7d770a3657 ChangeLog 43104 -RMD160 74e0c9bb86541a7ccb6bf6bd951ec7fe21a2239c ChangeLog 43104 -SHA256 b270f19aa69825a041df5ce39066a539133c88be925fc4f133db8af2093bae2c ChangeLog 43104 +MISC ChangeLog 43435 RMD160 3292136de2b74c4be3653034f27dbc6e837ee4f0 SHA1 20ef6b3fcfa7b603a6b5e4c6a516cbbe2bc00a65 SHA256 f48eea9017251279f13becf6ab07caca119170c43d9f3114d7563808769b8f73 +MD5 3af4a4d1859b5666d9481a46bb6509cf ChangeLog 43435 +RMD160 3292136de2b74c4be3653034f27dbc6e837ee4f0 ChangeLog 43435 +SHA256 f48eea9017251279f13becf6ab07caca119170c43d9f3114d7563808769b8f73 ChangeLog 43435 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -39,7 +39,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFiq8RAiZjviIA2XgRAjSLAKC7dYRUjj7lUom1Grn8en32uRFipACfY6EP -IzqzUHDEopkOe+74sYm0cyE= -=Mlbb +iD8DBQFFirLPAiZjviIA2XgRAupOAJ9SpIrrUPms7w+uSH41Jw7UsbCj5ACglwDg +Nhng34fjTBFd7J5IhLNQ8Qk= +=LxVr -----END PGP SIGNATURE----- diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild index cd7fad722891..c8d13031d012 100644 --- a/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild +++ b/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild @@ -1,11 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild,v 1.2 2006/12/21 15:57:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.14_rc1.ebuild,v 1.3 2006/12/21 16:13:55 flameeyes Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit linux-mod flag-o-matic eutils multilib autotools +inherit linux-mod flag-o-matic eutils multilib MY_P="${P/_rc/rc}" S="${WORKDIR}/${MY_P}" @@ -20,7 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86" IUSE="oss debug" -IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401 serialmidi loopback +IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401 loopback portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848 als100 azt2320 cmi8330 cs4231 cs4232 cs4236 dt019x es968 es1688 es18xx gusclassic gusextreme gusmax interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro @@ -40,11 +37,10 @@ for iuse_card in ${IUSE_CARDS}; do IUSE="${IUSE} alsa_cards_${iuse_card}" done - RDEPEND="virtual/modutils - ~media-sound/alsa-headers-${PV} !media-sound/snd-aoa" DEPEND="${RDEPEND} + ~media-sound/alsa-headers-${PV} virtual/linux-sources sys-apps/debianutils" @@ -104,22 +100,8 @@ src_unpack() { cd "${S}" - if kernel_is ge 2 6 17 ; then - # These are needed for some drivers to build with kernel 2.6.17 - # until a refreshed release of alsa-driver is done - epatch "${FILESDIR}/${PN}-1.0.11-kernel-2.6.17.patch" - - # asihpi driver is broken, skip it until upstream releases something - # working. - sed -i -e 's:asihpi/::' "${S}/pci/Makefile" - fi - convert_to_m "${S}/Makefile" sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile" - - emake -j1 all-deps || die "make all-deps failed" - eaclocal - eautoconf } src_compile() { @@ -141,7 +123,7 @@ src_compile() { ARCH=$(tc-arch-kernel) ABI=${KERNEL_ABI} - emake LDFLAGS="$(raw-ldflags)" HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed" + emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" "CC=$(tc-getCC)" || die "Make Failed" ARCH=$(tc-arch) ABI=${myABI} } -- 2.26.2