Version bump and avoid running ld directly #300779 by Nathan Phillip Brink.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 159 insertions, 2 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 95d96a0392b2..cd18c946dcb3 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.96 2010/01/15 08:19:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.97 2010/01/16 05:21:06 vapier Exp $
+
+*DirectFB-1.4.3 (16 Jan 2010)
+
+  16 Jan 2010; Mike Frysinger <vapier@gentoo.org> +DirectFB-1.4.3.ebuild:
+  Version bump and avoid running ld directly #300779 by Nathan Phillip
+  Brink.
 
   15 Jan 2010; Mike Frysinger <vapier@gentoo.org> DirectFB-1.4.2.ebuild:
   Mark ia64 stable #296263.
diff --git a/dev-libs/DirectFB/DirectFB-1.4.3.ebuild b/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
new file mode 100644
index 000000000000..96a106b63472
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.4.3.ebuild,v 1.1 2010/01/16 05:21:06 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+# Map Gentoo IUSE expand vars to DirectFB drivers
+# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
+I_TO_D_intel="i810,i830"
+I_TO_D_mga="matrox"
+I_TO_D_r128="ati128"
+I_TO_D_s3="unichrome"
+I_TO_D_sis="sis315"
+I_TO_D_via="cle266"
+# cyber5k davinci ep9x gl omap pxa3xx sh772x
+IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 savage sis tdfx via vmware"
+IUV=${IUSE_VIDEO_CARDS// / video_cards_}
+# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ *::;s:\].*::;s:,::g;p}' configure.in`
+I_TO_D_elo2300="elo-input"
+I_TO_D_evdev="linuxinput"
+I_TO_D_mouse="ps2mouse serialmouse"
+# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 wm97xx zytronic
+IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch tslib"
+IUD=${IUSE_INPUT_DEVICES// / input_devices_}
+
+DESCRIPTION="Thin library on top of the Linux framebuffer devices"
+HOMEPAGE="http://www.directfb.org/"
+SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
+	http://directfb.org/downloads/Old/${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 ${IUV} ${IUD}"
+
+#	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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.7-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.2.0-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch
+
+	# Avoid invoking `ld` directly #300779
+	find -name Makefile.in -exec sed -i \
+		'/[$](LD)/s:$(LD) -o $@ -r:$(CC) $(CFLAGS) -Wl,-r -nostdlib -o $@:' {} +
+
+	# 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
+	# DirectFB-2.0 seems to be fixed though ...
+	sed -i \
+		-e '/X11_LIBS/s:-L/usr/X11R6/lib::' \
+		-e '/CFLAGS/s:-I/usr/X11R6/include::' \
+		configure
+}
+
+driver_list() {
+	local pfx=$1
+	local dev devs map
+	shift
+	for dev in "$@" ; do
+		use ${pfx}_${dev} || continue
+		map="I_TO_D_${dev}"
+		devs=${devs:+${devs},}${!map:-${dev}}
+	done
+	echo ${devs:-none}
+}
+
+src_compile() {
+	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="$(driver_list video_cards ${IUSE_VIDEO_CARDS})" \
+		--with-inputdrivers="$(driver_list input_devices ${IUSE_INPUT_DEVICES})" \
+		--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 5851500e6463..7ece29ad98e3 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX DirectFB-1.1.1-pkgconfig.patch 637 RMD160 b560f0cb45ab3e8938bce474f1331562ba3a96a1 SHA1 aa202a8452f48f1a8ce087201bcc26ef17c97faa SHA256 f824293e1ae8ed2e632ba0196cf760459006a1e110abac348476b3982a0db036
 AUX DirectFB-1.2.0-headers.patch 430 RMD160 a783b9d0169241d92504ceb9a41545afa986384a SHA1 78f0b76da583702e730fed19288eb5b94be996f2 SHA256 f1c3c6f420ca7864435d8c69a80c239c4ff9ed6d46ac9ba14b59c6ffa6970b45
 AUX DirectFB-1.2.7-CFLAGS.patch 430 RMD160 814bb14c60732dab762303e8a6d356bc59950424 SHA1 5b9e3220493f182ceb0b13747e8199cf0f82c319 SHA256 8b1520f87b5ece3d3694cc1fd5b7bb943ab746a55d423b4593213be2b3bd13e7
 DIST DirectFB-1.4.2.tar.gz 2900292 RMD160 44ead9b32a2583b79690b1cc1536a4df17361078 SHA1 29a5e5a82b1a9e2cbfe31af127a54767fffae975 SHA256 051847e21e88a9c32ee78f8920014602d8b21928602075c5266433cd58addbc6
+DIST DirectFB-1.4.3.tar.gz 2898215 RMD160 9dfedcebe7fa59a821754a51308d8927269b5276 SHA1 935ef75b4a9f682e41fc68c887d72dca1fe32875 SHA256 1435aae4f0eb70252dc25ee50e51aecfdc4527f2651db5f35b34eb833fa7e978
 EBUILD DirectFB-1.4.2.ebuild 4435 RMD160 86fad639857600cc317f225c09051a9e1b61b273 SHA1 51ea60c820a81b11c175cbaa5b98cebb04e8a5af SHA256 c3857b4865622a9198a441b726ac6d9abc2783e987ee37f54b13d7d21ab8aff4
-MISC ChangeLog 13740 RMD160 e5a7c1280b1453a8a6bcf8824659d2f701bf02db SHA1 90fee79c7856937528166da2d026e136f1865eb8 SHA256 a0bf49a60ad54705d645bef0c69e29293957855519df3f2d274fc6236b426b53
+EBUILD DirectFB-1.4.3.ebuild 4643 RMD160 734f59046e16dfb2c92b9522268bf8abd5ef1d50 SHA1 028f46ac8bb0db1197261985905124f63ab2317c SHA256 8b2c7ea51fed57c844a81e1c05a93c3f214ac7c0cad65e2ff64e2eaa2949cb44
+MISC ChangeLog 13926 RMD160 d1179c9e0ed10fdaee1b661ec1f94042f6beb30b SHA1 9eb92f47129a3cd1025a3c1933abb13af1fd4657 SHA256 57b76387b730339d22e083d561e05ceae9b8ab55c7b907c900a69865e05e8150
 MISC metadata.xml 874 RMD160 602100ad1d1d3d5882f64144024636eea56a89a9 SHA1 35a43722612b96313f79c7d431c00068eef6cc95 SHA256 81a0a55f0059aa1f51089edadd145016aa6f2c0dfd986bea718afb4e9900860f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktRTNUACgkQTwhj9JtAlp6s/wD/SYD+DgSiamDRwPOUB+XKuvm+
+ZMW0jwoHqrrtu4rSAsMA/0WZl5nbrGAdsDQLlzs8IjKWsQxQh5HY6JgFxKeQBd9t
+=JCaW
+-----END PGP SIGNATURE-----