Back into ~sparc with the patch that I made for upstream bug #1267.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 38 insertions, 6 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 31d3d792ade9..b8e90e631c82 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.150 2005/07/17 10:59:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.151 2005/07/19 06:10:59 eradicator Exp $
+
+  19 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch,
+  alsa-driver-1.0.9b.ebuild:
+  Back into ~sparc with the patch that I made for upstream bug #1267.
 
   17 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.9b.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 683bb337f05d..a7fac0741388 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 b68abfee68f5d2e19dd53a2f00e79abf ChangeLog 26576
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
@@ -11,3 +14,10 @@ MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
 MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3JmHArHZZzCEUG0RAufKAJ4pd2bGVcG/T3Gu2LCe+k9xsZuPhgCdEh9w
+hZf71f7E37TIMjzJSC9ETmA=
+=Pldp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
index 2599c2875c6a..f33779f6fb2f 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9b.ebuild,v 1.4 2005/07/17 10:59:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild,v 1.5 2005/07/19 06:10:59 eradicator Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -11,16 +11,14 @@ SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-# -sparc: snd-ioctl32 issues in 1.0.9b --eradicator
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc -sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc x86"
 IUSE="oss doc"
 
 RDEPEND="virtual/modutils
 	 ~media-sound/alsa-headers-${PV}"
 DEPEND="${RDEPEND}
-	sys-devel/patch
 	virtual/linux-sources
-	>=sys-devel/autoconf-2.50
+	sparc? ( >=sys-devel/autoconf-2.50 )
 	sys-apps/debianutils"
 
 PROVIDE="virtual/alsa"
@@ -60,6 +58,11 @@ src_unpack() {
 
 	cd ${S}
 
+	if use sparc ; then
+		epatch ${FILESDIR}/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
+		WANT_AUTOCONF=2.5 autoconf || die
+	fi
+
 	convert_to_m ${S}/Makefile
 }
 
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
new file mode 100644
index 000000000000..61ab47540e1b
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
@@ -0,0 +1,14 @@
+diff -Naurp alsa-driver-1.0.9b.orig/configure.in alsa-driver-1.0.9b/configure.in
+--- alsa-driver-1.0.9b.orig/configure.in	2005-06-07 05:27:46.000000000 -0700
++++ alsa-driver-1.0.9b/configure.in	2005-07-18 22:58:40.000000000 -0700
+@@ -2042,6 +2042,10 @@ if test "$kversion.$kpatchlevel" = "2.6"
+   ac_save_CFLAGS="$CFLAGS"
+   ac_save_CC="$CC"
+   CFLAGS="$KERNEL_CHECK_CFLAGS -Werror"
++  if test -n "$CONFIG_SPARC64"; then
++    CFLAGS="$CFLAGS -ffixed-g4"
++  fi
++
+   CC=$KCC
+   AC_TRY_COMPILE([
+ #define __KERNEL__