Version bump #233272 by Benjamin Schleinzer.

(Portage version: 2.2_rc6/cvs/Linux 2.6.26.1 x86_64)

3 files changed, 167 insertions, 1 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 7f2d8dcf1082..a1a686caddaa 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.70 2008/08/06 07:02:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.71 2008/08/16 15:15:01 vapier Exp $
+
+*DirectFB-1.2.2 (16 Aug 2008)
+
+  16 Aug 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/DirectFB-1.2.0-headers.patch, +DirectFB-1.2.2.ebuild:
+  Version bump #233272 by Benjamin Schleinzer.
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-libs/DirectFB/DirectFB-1.2.2.ebuild b/dev-libs/DirectFB/DirectFB-1.2.2.ebuild
new file mode 100644
index 000000000000..d27d553df17b
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-1.2.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.2.2.ebuild,v 1.1 2008/08/16 15:15:01 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 i830 mach64 matrox neomagic none 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"
+
+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 X zlib"
+
+#	fusion? ( >=dev-libs/linux-fusion-8.0.0 )
+RDEPEND="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 )
+	X? ( x11-libs/libXext x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto x11-proto/xproto )"
+
+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 "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.2.0-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch
+
+	# This is only a partial fix to the X11 order issue #201626.  It's just
+	# the only part we need in order to make the issue go away.  Upstream
+	# bug tracker is currently broken, so list things to do here:
+	#  configure.in:
+	#   - only add -I/usr/X11R6/include to X11_CFLAGS as needed
+	#   - only add -L/usr/X11R6/lib to X11_LIBS as needed
+	#  systems/x11/Makefile.am:
+	#   - add $(X11_LIBS) to end of _LIBADD variables
+	sed -i \
+		-e '/X11_LIBS/s:-L/usr/X11R6/lib::' \
+		-e '/CFLAGS/s:-I/usr/X11R6/include::' \
+		configure
+}
+
+src_compile() {
+	local vidcards card input inputdrivers
+	if [[ ${VIDEO_CARDS+set} == "set" ]] ; then
+		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="none" \
+			|| vidcards=${vidcards:1}
+	else
+		vidcards="all"
+	fi
+	if [[ ${INPUT_DEVICES+set} == "set" ]] ; then
+		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="none" \
+			|| inputdrivers=${inputdrivers:1}
+	else
+		inputdrivers="all"
+	fi
+
+	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 X x11) \
+		$(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/files/DirectFB-1.2.0-headers.patch b/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
new file mode 100644
index 000000000000..dc2e6d33be28
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.2.0-headers.patch
@@ -0,0 +1,16 @@
+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