summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-12-08 18:50:44 +0000
committerMike Frysinger <vapier@gentoo.org>2007-12-08 18:50:44 +0000
commitd0166139f6af09801398f4f6548c166939bb0dd0 (patch)
treeae0a719f171682f883cf2da35a94179bec3eb472 /dev-libs/DirectFB
parentamd64 stable wrt #201707 (diff)
downloadhistorical-d0166139f6af09801398f4f6548c166939bb0dd0.tar.gz
historical-d0166139f6af09801398f4f6548c166939bb0dd0.tar.bz2
historical-d0166139f6af09801398f4f6548c166939bb0dd0.zip
Delete /usr/X11R6/ flags from build #201626 by Arfrever Frehtes Taifersar Arahesis.
Package-Manager: portage-2.1.4_rc4
Diffstat (limited to 'dev-libs/DirectFB')
-rw-r--r--dev-libs/DirectFB/ChangeLog6
-rw-r--r--dev-libs/DirectFB/DirectFB-1.1.0.ebuild15
-rw-r--r--dev-libs/DirectFB/Manifest22
3 files changed, 30 insertions, 13 deletions
diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index a1ee2c530b3d..5013de29f7e5 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,10 @@
# 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.65 2007/12/02 22:22:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.66 2007/12/08 18:50:44 vapier Exp $
+
+ 08 Dec 2007; Mike Frysinger <vapier@gentoo.org> DirectFB-1.1.0.ebuild:
+ Delete /usr/X11R6/ flags from build #201626 by Arfrever Frehtes Taifersar
+ Arahesis.
*DirectFB-1.1.0 (02 Dec 2007)
diff --git a/dev-libs/DirectFB/DirectFB-1.1.0.ebuild b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
index 70a9b7706db5..7f471ee1b67c 100644
--- a/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.1.0.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.0.ebuild,v 1.2 2007/12/08 18:50:44 vapier Exp $
inherit eutils toolchain-funcs
@@ -48,6 +48,19 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
epatch "${FILESDIR}"/${P}-headers.patch
epatch "${FILESDIR}"/${P}-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() {
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 67e7c73bf9e6..11599fa096ac 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -38,14 +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
-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
+EBUILD DirectFB-1.1.0.ebuild 4551 RMD160 0937bbe5cb3618c62a9fac569279c4eb3dc0d161 SHA1 a7a82ea79dd87dc36fa366e52663ea8fba80c876 SHA256 e1da0f88f55d4f235affb16ead646c5d3969b5006bbd2d13bdab7201b2696594
+MD5 a685db1112b99d71bf34850121cf68fa DirectFB-1.1.0.ebuild 4551
+RMD160 0937bbe5cb3618c62a9fac569279c4eb3dc0d161 DirectFB-1.1.0.ebuild 4551
+SHA256 e1da0f88f55d4f235affb16ead646c5d3969b5006bbd2d13bdab7201b2696594 DirectFB-1.1.0.ebuild 4551
+MISC ChangeLog 9984 RMD160 9d888aabf244e9f890daa76082535a006db7cadc SHA1 39b31f2ac7d64a9dc16deb84abcd3133e95cfe0b SHA256 ef3aebff7a19595831c7785210c3711a4c55232d8aebc32930eb0a63398ce81a
+MD5 9feb001477a1cc68ba49b08f8818f566 ChangeLog 9984
+RMD160 9d888aabf244e9f890daa76082535a006db7cadc ChangeLog 9984
+SHA256 ef3aebff7a19595831c7785210c3711a4c55232d8aebc32930eb0a63398ce81a ChangeLog 9984
MISC metadata.xml 754 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 SHA1 d5238147a8dc90d5171dae8675f243fe5e6a8d10 SHA256 13a9cd8be775e849708c9377176d52f107a2eed78ef2ba3917188ae9cf2aeffc
MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 metadata.xml 754
@@ -65,7 +65,7 @@ SHA256 9794cc965c920f29a9082a915134e0e485f639bd18a96017f0cf6441b16e2d19 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHUzAgp/wUKkr7RBoRAu4hAJ4rOV6ivQmdpf0aovVeWMu9H8BWPQCeJOy7
-Gw42gc6kjgwZ58B5gENrPus=
-=HFf+
+iD8DBQFHWueKp/wUKkr7RBoRArykAKCYL1fkDa8iB7EBd1y6vAEavhM9YgCeN1zm
+bq9GucOZXovC/aeirvkqXEo=
+=HQXs
-----END PGP SIGNATURE-----