diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-02 00:18:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-02 00:18:45 +0000 |
| commit | 3034d955db659ab864d4dcbda23f861849f2a675 (patch) | |
| tree | a2aac11fff7aaacc295181b84fd5f98fbc36d727 /dev-libs | |
| parent | Add missing automake-1.9 dep (diff) | |
| download | gentoo-2-3034d955db659ab864d4dcbda23f861849f2a675.tar.gz gentoo-2-3034d955db659ab864d4dcbda23f861849f2a675.tar.bz2 gentoo-2-3034d955db659ab864d4dcbda23f861849f2a675.zip | |
Clean up the way we disable wm97xx/sis315 and enable i830.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/DirectFB/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/DirectFB/DirectFB-0.9.22.ebuild | 14 | ||||
| -rw-r--r-- | dev-libs/DirectFB/files/DirectFB-0.9.22-i830-detect.patch | 17 |
3 files changed, 29 insertions, 8 deletions
diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog index f8eed7582e8d..932d2ebbbc4c 100644 --- a/dev-libs/DirectFB/ChangeLog +++ b/dev-libs/DirectFB/ChangeLog @@ -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. diff --git a/dev-libs/DirectFB/DirectFB-0.9.22.ebuild b/dev-libs/DirectFB/DirectFB-0.9.22.ebuild index 8cb191f5fc89..6f376493c267 100644 --- a/dev-libs/DirectFB/DirectFB-0.9.22.ebuild +++ b/dev-libs/DirectFB/DirectFB-0.9.22.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/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}" 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 index 000000000000..fbe4816d287d --- /dev/null +++ b/dev-libs/DirectFB/files/DirectFB-0.9.22-i830-detect.patch @@ -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 | |