Clean up the way we disable wm97xx/sis315 and enable i830.
authorMike Frysinger <vapier@gentoo.org>
Fri, 2 Sep 2005 00:18:45 +0000 (00:18 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 2 Sep 2005 00:18:45 +0000 (00:18 +0000)
Package-Manager: portage-2.0.51.22-r2

dev-libs/DirectFB/ChangeLog
dev-libs/DirectFB/DirectFB-0.9.22.ebuild
dev-libs/DirectFB/Manifest
dev-libs/DirectFB/files/DirectFB-0.9.22-i830-detect.patch [new file with mode: 0644]

index f8eed7582e8d796c4ebe08480e5e3da0f8ea8d8a..932d2ebbbc4cde79584aa9dfaf96827eb967ee3d 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.48 2005/08/21 02:32:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.49 2005/09/02 00:18:45 vapier Exp $
+
+  02 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/DirectFB-0.9.22-i830-detect.patch, DirectFB-0.9.22.ebuild:
+  Clean up the way we disable wm97xx/sis315 and enable i830.
 
   21 Aug 2005; Mike Frysinger <vapier@gentoo.org> DirectFB-0.9.22.ebuild:
   Add support for USE=zlib by Steve Dibb in #103150.
index 8cb191f5fc897e3be8c657d379c6efc76d2cdd38..6f376493c2674c9b817c6e19a1f1532e2f06b447 100644 (file)
@@ -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/dev-libs/DirectFB/DirectFB-0.9.22.ebuild,v 1.5 2005/08/21 02:32:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.22.ebuild,v 1.6 2005/09/02 00:18:45 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -45,12 +45,7 @@ src_unpack() {
        cd "${S}"
 
        # Make sure i830 is detected
-       # force disable wm97xx #36924
-       sed -i \
-               -e 's:^//::' \
-               -e 's:wm97xx_ts=yes:wm97xx_ts=no:' \
-               configure \
-               || die "sed configure failed"
+       epatch "${FILESDIR}"/${P}-i830-detect.patch
 
        # This patch enables simd optimisations for amd64. Since mmx and sse are
        # masked USE flags on amd64 due to their enabling x86 specific asm more
@@ -60,6 +55,11 @@ src_unpack() {
 }
 
 src_compile() {
+       # force disable wm97xx #36924
+       export ac_cv_header_linux_wm97xx_h=no
+       # force disable of sis315 #77391
+       export ac_cv_header_linux_sisfb_h=no
+
        local vidcards card input inputdrivers
        for card in ${VIDEO_CARDS} ; do
                has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
index aa7545db5920235d86512873dd20fda82ec3e36c..64ae8d61794f21cccece554f807b9c5277599c77 100644 (file)
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
-MD5 11d456494e71ce088b95f8a1340581fb DirectFB-0.9.22.ebuild 4133
-MD5 12b64e8434fbbed993ce695cc55c2d5e ChangeLog 7426
+MD5 e91c5a57b150b16a26ed178bf020c9d6 DirectFB-0.9.22.ebuild 4178
+MD5 b2ade4dfff293e045e924f8bb104ca17 ChangeLog 7606
+MD5 c4d29f6e0f6e36e8e07b97fefe0a33cb files/DirectFB-0.9.22-i830-detect.patch 347
 MD5 51cf3c6f205c566235b00a488947f835 files/0.9.21-simd-amd64.patch 6156
 MD5 2a322a95caff6a561082846ca8f0d700 files/digest-DirectFB-0.9.22 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDB+gAgIKl8Uu19MoRAlrAAJ4nTzUZadF4Qb+8l0lrLfGU/SV28ACfYDZt
-WuS0ld0udXbfWS9O7JcGQtg=
-=1ahg
+iD8DBQFDF5qEgIKl8Uu19MoRAnSEAJ9OfuaSab5539Hm8qmphWSc9xC1IQCfZmGF
+3Q5KbgZio97CSxQyPNWtzMo=
+=Q0tX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/DirectFB/files/DirectFB-0.9.22-i830-detect.patch b/dev-libs/DirectFB/files/DirectFB-0.9.22-i830-detect.patch
new file mode 100644 (file)
index 0000000..fbe4816
--- /dev/null
@@ -0,0 +1,17 @@
+Detect the presence of the I830 fb driver rather than 
+just assuming it always exists.
+
+--- DirectFB-0.9.22/configure
++++ DirectFB-0.9.22/configure
+@@ -23622,9 +23622,9 @@
+ /* end confdefs.h.  */
+ 
+ #include <linux/fb.h>
+-//#ifdef FB_ACCEL_I830
++#ifdef FB_ACCEL_I830
+   yes
+-//#endif
++#endif
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |