summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-03-02 01:43:05 +0000
committerMike Frysinger <vapier@gentoo.org>2005-03-02 01:43:05 +0000
commitb747a2ea865b3551240defcfa44f4638746364f3 (patch)
tree5caf69816e88e254539ea6555d7e212ad60e7109 /dev-games
parenttouchup (diff)
downloadgentoo-2-b747a2ea865b3551240defcfa44f4638746364f3.tar.gz
gentoo-2-b747a2ea865b3551240defcfa44f4638746364f3.tar.bz2
gentoo-2-b747a2ea865b3551240defcfa44f4638746364f3.zip
Fix building with newer DirectFB #77034 by Andreas Bulling.
(Portage version: 2.0.51.18)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/clanlib/ChangeLog6
-rw-r--r--dev-games/clanlib/clanlib-0.6.5-r2.ebuild7
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch44
3 files changed, 53 insertions, 4 deletions
diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 6993733aebb6..f3532d697459 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/clanlib
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.22 2005/01/02 09:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.23 2005/03/02 01:43:05 vapier Exp $
+
+ 01 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/clanlib-0.6.5-DirectFB-update.patch, clanlib-0.6.5-r2.ebuild:
+ Fix building with newer DirectFB #77034 by Andreas Bulling.
02 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+files/0.7.8-install-opengl-wrap.patch, clanlib-0.7.8-r1.ebuild:
diff --git a/dev-games/clanlib/clanlib-0.6.5-r2.ebuild b/dev-games/clanlib/clanlib-0.6.5-r2.ebuild
index ddc3992b8049..9ff395834267 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-r2.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-games/clanlib/clanlib-0.6.5-r2.ebuild,v 1.3 2005/01/01 17:58:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r2.ebuild,v 1.4 2005/03/02 01:43:05 vapier Exp $
inherit eutils flag-o-matic
@@ -26,8 +26,9 @@ S=${WORKDIR}/ClanLib-${PV}
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}-gcc3.patch
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc3.patch
+ epatch "${FILESDIR}"/${P}-DirectFB-update.patch
}
src_compile() {
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch b/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch
new file mode 100644
index 000000000000..df4c33f181d8
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch
@@ -0,0 +1,44 @@
+DirectFB no longer defines DSPF_RGB15 since it was really just a
+ghetto shortcut to DSPF_ARGB1555.
+
+http://bugs.gentoo.org/show_bug.cgi?id=77034
+http://www.directfb.org/index.php/viewcvs.cgi/DirectFB/include/directfb.h.diff?r1=1.194&r2=1.195
+
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
+@@ -147,7 +147,7 @@
+ {
+ case DSPF_A8:
+ return 0;
+- case DSPF_RGB15:
++ case DSPF_ARGB1555:
+ return 0x007c00;
+ case DSPF_RGB16:
+ return 0x00f800;
+@@ -170,7 +168,7 @@
+ {
+ case DSPF_A8:
+ return 0;
+- case DSPF_RGB15:
++ case DSPF_ARGB1555:
+ return 0x0003e0;
+ case DSPF_RGB16:
+ return 0x0007e0;
+@@ -193,7 +189,7 @@
+ {
+ case DSPF_A8:
+ return 0;
+- case DSPF_RGB15:
++ case DSPF_ARGB1555:
+ case DSPF_RGB16:
+ return 0x00001f;
+ case DSPF_RGB24:
+@@ -215,7 +210,7 @@
+ {
+ case DSPF_A8:
+ return 0xff;
+- case DSPF_RGB15:
++ case DSPF_ARGB1555:
+ case DSPF_RGB16:
+ case DSPF_RGB24:
+ case DSPF_RGB32: