Version bump #190463 by Alexandre Bique. Fix from Andrew Williams for the .pc file #200661.

Package-Manager: portage-2.1.4_rc4

6 files changed, 235 insertions, 5 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 436a4a14f8cb..a1ee2c530b3d 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.64 2007/04/19 06:27:10 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.65 2007/12/02 22:22:18 vapier Exp $
+
+*DirectFB-1.1.0 (02 Dec 2007)
+
+  02 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/DirectFB-1.1.0-headers.patch,
+  +files/DirectFB-1.1.0-pkgconfig.patch, +DirectFB-1.1.0.ebuild:
+  Version bump #190463 by Alexandre Bique. Fix from Andrew Williams for the
+  .pc file #200661.
 
   19 Apr 2007; Markus Rothe <corsair@gentoo.org> DirectFB-1.0.0.ebuild:
   Added ~ppc64; bug #175166
diff --git a/dev-libs/DirectFB/DirectFB-1.1.0.ebuild b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
new file mode 100644
index 000000000000..70a9b7706db5
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.0.ebuild,v 1.1 2007/12/02 22:22:18 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 i830 mach64 matrox neomagic nsc nvidia radeon savage sis315 tdfx unichrome"
+IUSE_INPUT_DEVICES="dbox2remote elo-input gunze h3600_ts joystick keyboard dreamboxremote linuxinput lirc mutouch none permount ps2mouse serialmouse sonypijogdial wm97xx"
+
+DESCRIPTION="Thin library on top of the Linux framebuffer devices"
+HOMEPAGE="http://www.directfb.org/"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz
+	mirror://gentoo/DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
+IUSE="debug fbcon fusion gif jpeg mmx png sdl sse sysfs truetype v4l v4l2 zlib"
+
+#	fusion? ( >=dev-libs/linux-fusion-7.0.1 )
+DEPEND="sdl? ( media-libs/libsdl )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	sysfs? ( sys-fs/sysfsutils )
+	zlib? ( sys-libs/zlib )
+	truetype? ( >=media-libs/freetype-2.0.1 )"
+
+pkg_setup() {
+	if [[ -z ${VIDEO_CARDS} ]] ; then
+		ewarn "All video drivers will be built since you did not specify"
+		ewarn "via the VIDEO_CARDS variable what video card you use."
+		ewarn "DirectFB supports: ${IUSE_VIDEO_CARDS} all none"
+		echo
+	fi
+	if [[ -z ${INPUT_DEVICES} ]] ; then
+		ewarn "All input drivers will be built since you did not specify"
+		ewarn "via the INPUT_DEVICES variable which input drivers to use."
+		ewarn "DirectFB supports: ${IUSE_INPUT_DEVICES} all none"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${P}-upstream-git-gfxdrivers-fixes.patch
+	epatch "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-headers.patch
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+}
+
+src_compile() {
+	local vidcards card input inputdrivers
+	for card in ${VIDEO_CARDS} ; do
+		has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
+		#use video_cards_${card} && vidcards="${vidcards},${card}"
+	done
+	[[ -z ${vidcards} ]] \
+		&& vidcards="all" \
+		|| vidcards=${vidcards:1}
+	for input in ${INPUT_DEVICES} ; do
+		has ${input} ${IUSE_INPUT_DEVICES} && inputdrivers="${inputdrivers},${input}"
+		#use input_devics_${input} && inputdrivers="${inputdrivers},${input}"
+	done
+	[[ -z ${inputdrivers} ]] \
+		&& inputdrivers="all" \
+		|| inputdrivers=${inputdrivers:1}
+
+	local sdlconf="--disable-sdl"
+	if use sdl ; then
+		# since SDL can link against DirectFB and trigger a
+		# dependency loop, only link against SDL if it isn't
+		# broken #61592
+		echo 'int main(){}' > sdl-test.c
+		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
+			&& sdlconf="--enable-sdl" \
+			|| ewarn "Disabling SDL since libSDL.so is broken"
+	fi
+
+	econf \
+		--enable-static \
+		$(use_enable fbcon fbdev) \
+		$(use_enable mmx) \
+		$(use_enable sse) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable gif) \
+		$(use_enable truetype freetype) \
+		$(use_enable fusion multi) \
+		$(use_enable debug) \
+		$(use_enable sysfs) \
+		$(use_enable zlib) \
+		$(use_enable v4l video4linux) \
+		$(use_enable v4l2 video4linux2) \
+		${sdlconf} \
+		--with-gfxdrivers="${vidcards}" \
+		--with-inputdrivers="${inputdrivers}" \
+		--disable-vnc \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc fb.modes AUTHORS ChangeLog NEWS README* TODO
+	dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	ewarn "Each DirectFB update in the 0.9.xx series"
+	ewarn "breaks DirectFB related applications."
+	ewarn "Please run \"revdep-rebuild\" which can be"
+	ewarn "found by emerging the package 'gentoolkit'."
+	ewarn
+	ewarn "If you have an ALPS touchpad, then you might"
+	ewarn "get your mouse unexpectedly set in absolute"
+	ewarn "mode in all DirectFB applications."
+	ewarn "This can be fixed by removing linuxinput from"
+	ewarn "INPUT_DEVICES."
+}
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 92ad36189555..67e7c73bf9e6 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX DirectFB-0.9.24-CFLAGS.patch 570 RMD160 e65704cfdedd20ba96544357ab89aeb26927e2af SHA1 bb6c670639fb2292e9ab65abbac5d1e0012847cf SHA256 24fc37fa6390340f08f4cf352a6fec34acf9d2bf0fc0f572a714466cc8ab4b68
 MD5 fadc9b915077bd3c9647ca8776505e60 files/DirectFB-0.9.24-CFLAGS.patch 570
 RMD160 e65704cfdedd20ba96544357ab89aeb26927e2af files/DirectFB-0.9.24-CFLAGS.patch 570
@@ -10,9 +13,19 @@ AUX DirectFB-1.0.0-headers.patch 698 RMD160 abda64eded24e06125d53b07ee6b0ab39583
 MD5 21a032b1dc5f6f78563ab7195790cbfb files/DirectFB-1.0.0-headers.patch 698
 RMD160 abda64eded24e06125d53b07ee6b0ab39583139f files/DirectFB-1.0.0-headers.patch 698
 SHA256 40bcf37f11e79b23325fcea626246cb1d4b86ce31dde439cab322d69b9538fc8 files/DirectFB-1.0.0-headers.patch 698
+AUX DirectFB-1.1.0-headers.patch 1033 RMD160 8cc1ee682b4edb94aafcfcf80ed941922bf21b7b SHA1 f13cce3db5bb664ce43b95e615fdaef0cf134027 SHA256 3681494add3219b759b14377263dbcd59c776554311866fad0f9b42c894a4d4a
+MD5 2725af899c36148c69180797b4c3ce7f files/DirectFB-1.1.0-headers.patch 1033
+RMD160 8cc1ee682b4edb94aafcfcf80ed941922bf21b7b files/DirectFB-1.1.0-headers.patch 1033
+SHA256 3681494add3219b759b14377263dbcd59c776554311866fad0f9b42c894a4d4a files/DirectFB-1.1.0-headers.patch 1033
+AUX DirectFB-1.1.0-pkgconfig.patch 796 RMD160 81690a710267dfbdc1885d42a94c4843c18c5e05 SHA1 a3da1e2c52b4fa8b5a93aad255de81dcee159403 SHA256 a011052050c3b5cc608bcfe02b47acce1379a8562183107a6bdfe11736c62c18
+MD5 d25c80c719e36d9408ea5b27802c443a files/DirectFB-1.1.0-pkgconfig.patch 796
+RMD160 81690a710267dfbdc1885d42a94c4843c18c5e05 files/DirectFB-1.1.0-pkgconfig.patch 796
+SHA256 a011052050c3b5cc608bcfe02b47acce1379a8562183107a6bdfe11736c62c18 files/DirectFB-1.1.0-pkgconfig.patch 796
 DIST DirectFB-0.9.24.tar.gz 1938861 RMD160 262b300cc00b3385f15532004aa332253d525522 SHA1 95fbde03792d21c2ac4247108b09a861ce6532dc SHA256 d2717cbd1a85a48eba9522491bbe2c74579a91af2a938dea601ef2a8c28b7f9f
 DIST DirectFB-0.9.25.1.tar.gz 2064010 RMD160 558e3eabc41635c054314d8a4c8365d648ec588d SHA1 40654da2fde2fd5539f5a0c5cdac50e1a8a52bb4 SHA256 aa1e9710ca18633ffcb74a0383fdfa39aba63e873ec9fa2ba4b7589ed2e5c56b
 DIST DirectFB-1.0.0.tar.gz 2432000 RMD160 43e8b73f2a751e8dcb240e6b6c4c34055c5337c0 SHA1 8ac354cabd9c279e8bd3cf352daddf1b19f2007f SHA256 125941749103c08a5263f2ace01aac1533420d2ff6741d2bdde79689e5d02a05
+DIST DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2 7167 RMD160 08327bca85e6d133c282e1da19addba46adf6102 SHA1 cc353a8c027107bb037e4e384bce30ccf728d0ad SHA256 b009646ad5fc4131f73ffa549258fbfcb5ca6ff8bf93aa2abfcea5d4fa639fb8
+DIST DirectFB-1.1.0.tar.gz 2624473 RMD160 9e5dd3b44ec828dd1b2cc739d14670d7d9e7f7a9 SHA1 3d63dca2eb0325d2be567f594b7d72fe1d3734df SHA256 0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a
 EBUILD DirectFB-0.9.24.ebuild 3820 RMD160 5487a7f235ea1e6fad0b0b4247fbda96a9c0ef32 SHA1 3bebdb41fa316ef9b552dd4d22a201412c293144 SHA256 2284d2013feac6b06a37e41f1ac4a35a53c0f98795c3b1b9240b8dffe9d4c0d9
 MD5 b06154f9f35313d9db5f50c65c2662d7 DirectFB-0.9.24.ebuild 3820
 RMD160 5487a7f235ea1e6fad0b0b4247fbda96a9c0ef32 DirectFB-0.9.24.ebuild 3820
@@ -25,10 +38,14 @@ EBUILD DirectFB-1.0.0.ebuild 3841 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3f
 MD5 97522c69bfe54e73d1a48c01b45b252d DirectFB-1.0.0.ebuild 3841
 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3ff DirectFB-1.0.0.ebuild 3841
 SHA256 30c51a8afd8b9b29273f94aa1688beafe47aeaad11e3a643f06361d938f32379 DirectFB-1.0.0.ebuild 3841
-MISC ChangeLog 9541 RMD160 2f7e42c35f91bb8149d4ab2906e2682df9bbe8eb SHA1 918bf02c82f796bc8c4bc740915e885a07d676cf SHA256 603300a4e27094d90de21b4f1c5633434e666f5b543c0278bd54ee1444221dbc
-MD5 1dbf3fe2882baeb04e1759eb28774379 ChangeLog 9541
-RMD160 2f7e42c35f91bb8149d4ab2906e2682df9bbe8eb ChangeLog 9541
-SHA256 603300a4e27094d90de21b4f1c5633434e666f5b543c0278bd54ee1444221dbc ChangeLog 9541
+EBUILD DirectFB-1.1.0.ebuild 4025 RMD160 31ddee5e7e22569264562f19b21c012d0e1f7b4c SHA1 3e58409dc64120bc78cd9d2ea2343a545d72eefd SHA256 948e41250cda307814f64208e2201e7f5eb8d4db27339c5d037802b3da81e5bc
+MD5 9fc89c3276d09dc36306a23f631a5db8 DirectFB-1.1.0.ebuild 4025
+RMD160 31ddee5e7e22569264562f19b21c012d0e1f7b4c DirectFB-1.1.0.ebuild 4025
+SHA256 948e41250cda307814f64208e2201e7f5eb8d4db27339c5d037802b3da81e5bc DirectFB-1.1.0.ebuild 4025
+MISC ChangeLog 9822 RMD160 d3f2d402489663bb6af860cd4a10e5039f17ad19 SHA1 0b1dfa5440964ec1c2f15e68db9b1481b7ac0057 SHA256 3b19d7b42d10b70acdd0f9d1e35d77f1d901de47eb8729ae7e170ab323c30268
+MD5 edc0d366d2749946ca976f7388103f0a ChangeLog 9822
+RMD160 d3f2d402489663bb6af860cd4a10e5039f17ad19 ChangeLog 9822
+SHA256 3b19d7b42d10b70acdd0f9d1e35d77f1d901de47eb8729ae7e170ab323c30268 ChangeLog 9822
 MISC metadata.xml 754 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 SHA1 d5238147a8dc90d5171dae8675f243fe5e6a8d10 SHA256 13a9cd8be775e849708c9377176d52f107a2eed78ef2ba3917188ae9cf2aeffc
 MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 metadata.xml 754
@@ -42,3 +59,13 @@ SHA256 12103ab1135d8e247eb85bb1f5511d69b09d277abb5c126b9923c70ab79e4f6d files/di
 MD5 e7dfae5ab777b8f8d091d3739582419b files/digest-DirectFB-1.0.0 247
 RMD160 0387ce1f0771ec6b7bbdb3f1a42016337004ca6e files/digest-DirectFB-1.0.0 247
 SHA256 b15baf4009961edb14a2beaa69ec2d65181fb3e905f0417b2be9e5dc176c5b6c files/digest-DirectFB-1.0.0 247
+MD5 9f36c287fd2dddd5f7e4c61c6a73b4f7 files/digest-DirectFB-1.1.0 584
+RMD160 2f484febff634d32cc8bacafb8f9305f98a876c4 files/digest-DirectFB-1.1.0 584
+SHA256 9794cc965c920f29a9082a915134e0e485f639bd18a96017f0cf6441b16e2d19 files/digest-DirectFB-1.1.0 584
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHUzAgp/wUKkr7RBoRAu4hAJ4rOV6ivQmdpf0aovVeWMu9H8BWPQCeJOy7
+Gw42gc6kjgwZ58B5gENrPus=
+=HFf+
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.0-headers.patch b/dev-libs/DirectFB/files/DirectFB-1.1.0-headers.patch
new file mode 100644
index 000000000000..0e93de3c9d7f
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.1.0-headers.patch
@@ -0,0 +1,46 @@
+Don't rely on the kernel to tell us what the cpu target is ... we'll just
+use the default values all the time instead.
+
+http://bugs.gentoo.org/152614
+
+--- lib/direct/ppcasm_memcpy_cachable.S
++++ lib/direct/ppcasm_memcpy_cachable.S
+@@ -34,8 +34,6 @@
+ 
+ #define __ASSEMBLY__
+ 
+-#include <linux/config.h>
+-
+ #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
+ #define L1_CACHE_LINE_SIZE       16
+ #define LG_L1_CACHE_LINE_SIZE     4 
+
+Don't pollute the namespace with define hacks, just use the real deal.
+
+--- include/dfb_types.h
++++ include/dfb_types.h
+@@ -60,6 +60,8 @@
+ 
+ #endif
+ 
++#include <asm/types.h>
++#define DIRECTFB_NO_CRUFT
+ #ifndef DIRECTFB_NO_CRUFT
+ #define __u8   u8
+ #define __u16  u16
+
+some arches (*cough* powerpc *cough*) are retarded and export a completely
+worthless asm/page.h ... so set a fallback for PAGE_SIZE
+
+--- lib/direct/system.c
++++ lib/direct/system.c
+@@ -35,7 +35,8 @@
+ 
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+-#else
++#endif
++#ifndef PAGE_SIZE
+ #define PAGE_SIZE   sysconf( _SC_PAGESIZE )
+ #endif
+ 
diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.0-pkgconfig.patch b/dev-libs/DirectFB/files/DirectFB-1.1.0-pkgconfig.patch
new file mode 100644
index 000000000000..f28d263fa79e
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.1.0-pkgconfig.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/200661
+
+--- DirectFB/directfb-config.in
++++ DirectFB/directfb-config.in
+@@ -300,7 +300,7 @@
+       libs=-L@libdir@
+ 
+       if test "$lib_directfb" = "yes"; then
+-	 libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@"
++	 libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
+ 
+ 	 if test -z "$echo_static"; then
+ 	    libs="$libs @DYNLIB@"
+--- DirectFB/directfb.pc.in
++++ DirectFB/directfb.pc.in
+@@ -7,5 +7,5 @@
+ Description: Graphics and windowing library for the Linux frame buffer device
+ Version: @VERSION@
+ Requires: fusion direct
+-Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
++Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@ @OSX_LIBS@
+ Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-1.1.0 b/dev-libs/DirectFB/files/digest-DirectFB-1.1.0
new file mode 100644
index 000000000000..56d66956d5fb
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-1.1.0
@@ -0,0 +1,6 @@
+MD5 4d05469904126e9cd60e5d36970775bc DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2 7167
+RMD160 08327bca85e6d133c282e1da19addba46adf6102 DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2 7167
+SHA256 b009646ad5fc4131f73ffa549258fbfcb5ca6ff8bf93aa2abfcea5d4fa639fb8 DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2 7167
+MD5 da30fa2748c7501913c8832a83e654ab DirectFB-1.1.0.tar.gz 2624473
+RMD160 9e5dd3b44ec828dd1b2cc739d14670d7d9e7f7a9 DirectFB-1.1.0.tar.gz 2624473
+SHA256 0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a DirectFB-1.1.0.tar.gz 2624473