Fix building with newer DirectFB #132945 by ferret.

Package-Manager: portage-2.1_pre10-r5

3 files changed, 57 insertions, 14 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index ab9856e0ee60..7d7713e615dd 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.30 2006/03/26 19:53:36 tupone Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.31 2006/05/13 02:36:47 vapier Exp $
+
+  13 May 2006; Mike Frysinger <vapier@gentoo.org>
+  files/clanlib-0.6.5-DirectFB-update.patch:
+  Fix building with newer DirectFB #132945 by ferret.
 
 *clanlib-0.7.8-r2 (26 Mar 2006)
 
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 9dce794796ff..6ae2edffa475 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -9,10 +9,10 @@ AUX 0.7.8-port.patch 305 RMD160 1cc87ddb0c022eb4083d11a63f130b7154526c28 SHA1 4a
 MD5 940618fa67a1354533249defe3a89739 files/0.7.8-port.patch 305
 RMD160 1cc87ddb0c022eb4083d11a63f130b7154526c28 files/0.7.8-port.patch 305
 SHA256 6545f6e5463ff83e42c521a49fac300524b5283667e5bdcf30120d3b6cf01a0c files/0.7.8-port.patch 305
-AUX clanlib-0.6.5-DirectFB-update.patch 1103 RMD160 d3f5090e155b6ee023df27e83c364388d7fbba82 SHA1 7f2c4885c334f029b8a7f102a211d405d244d685 SHA256 6e65fdf625231f23d0405a8de32ea1d7008e3886edbac5ee38e2fa5cfe90ba74 size 1103
-MD5 f0d65c6800d4f5ff51260b66bbc08670 files/clanlib-0.6.5-DirectFB-update.patch 1103
-RMD160 d3f5090e155b6ee023df27e83c364388d7fbba82 files/clanlib-0.6.5-DirectFB-update.patch 1103
-SHA256 6e65fdf625231f23d0405a8de32ea1d7008e3886edbac5ee38e2fa5cfe90ba74 files/clanlib-0.6.5-DirectFB-update.patch 1103
+AUX clanlib-0.6.5-DirectFB-update.patch 2467 RMD160 52f3f123f895bacddfca3f218e9fe3b2e94ac79b SHA1 86b51f372330eb6cce90b21b5602091b630e5fa6 SHA256 107ae01c9c499c230f7d9fb8c1f2929cda81214de7d0832acbb873f6d75815fd size 2467
+MD5 73a7ad2b2241c3ec66720d2fa936ef4b files/clanlib-0.6.5-DirectFB-update.patch 2467
+RMD160 52f3f123f895bacddfca3f218e9fe3b2e94ac79b files/clanlib-0.6.5-DirectFB-update.patch 2467
+SHA256 107ae01c9c499c230f7d9fb8c1f2929cda81214de7d0832acbb873f6d75815fd files/clanlib-0.6.5-DirectFB-update.patch 2467
 AUX clanlib-0.6.5-freetype.patch 354 RMD160 acd601555318cf6b5d6329ae5946336ad6c716e4 SHA1 fe6251df44716347dc28c018f6fd8bc9b1445f1b SHA256 8711a0017643a080b73d506a03e0865051e040348ac091eace0062bdab16d4e1 size 354
 MD5 c700c77d44839f9d8bfda3e4faedfb75 files/clanlib-0.6.5-freetype.patch 354
 RMD160 acd601555318cf6b5d6329ae5946336ad6c716e4 files/clanlib-0.6.5-freetype.patch 354
@@ -43,10 +43,10 @@ EBUILD clanlib-0.7.8-r2.ebuild 2369 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390
 MD5 ee9ea6af33bd9154656e1ee012234b5b clanlib-0.7.8-r2.ebuild 2369
 RMD160 367e0228f1d72ab25fa68dd9a51d5769d1390281 clanlib-0.7.8-r2.ebuild 2369
 SHA256 752a81a5fbffe92dc98c3d1f593e24f4a56819bc088d5fdf82f648f4ec190c9d clanlib-0.7.8-r2.ebuild 2369
-MISC ChangeLog 6794 RMD160 42248d51d77c85e20299ddb9f07133c04d62b0a8 SHA1 4fd35b8e03434e9cca90c563282365a243cb2b7a SHA256 99c641f4cba7887ab4ceb901a0a2483ba838e171ded42f937fc2308c3792837b size 6794
-MD5 83a1765868b120c10e7571eda32925e6 ChangeLog 6794
-RMD160 42248d51d77c85e20299ddb9f07133c04d62b0a8 ChangeLog 6794
-SHA256 99c641f4cba7887ab4ceb901a0a2483ba838e171ded42f937fc2308c3792837b ChangeLog 6794
+MISC ChangeLog 6944 RMD160 a2952b504bfd5e8b0117710bac413248a21f4e7d SHA1 c41a563f69dc9b776fcda09b75d6270e6d3dff1a SHA256 096201d5e2881443f4c7104cbb1d7d14bbf0c157c958dd001cab7daeff3c846b size 6944
+MD5 b31f08c74635bab3b0857fc405500ede ChangeLog 6944
+RMD160 a2952b504bfd5e8b0117710bac413248a21f4e7d ChangeLog 6944
+SHA256 096201d5e2881443f4c7104cbb1d7d14bbf0c157c958dd001cab7daeff3c846b ChangeLog 6944
 MISC metadata.xml 3010 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 SHA1 44ca5cd8acbcf860a068802ceca92f39693846aa SHA256 3b9b77c59757bc65889103949b95597432d5e00f69fdf4bdc909f50dcbff98ac size 3010
 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010
 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 metadata.xml 3010
@@ -60,7 +60,7 @@ SHA256 2d33b72d6157f3dc50ef950fdae218e425b0faf6e38220dd98a64d46774779ac files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEZAXo2+ySkm8kpY0RAoIsAJ9nJrU6Q7ca8TE651NOsA9zh/x4mACfVPnW
-07/vk7XVA/dvxEq4KpjuPOA=
-=7EGw
+iD8DBQFEZUam2+ySkm8kpY0RAufwAJsET/HaUf4O2Lb/kICg74dpvupvSwCfTlQV
+oNzzeSr3InLkmpngMBON6Qo=
+=XLFR
 -----END PGP SIGNATURE-----
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
index df4c33f181d8..85e9f367f9f2 100644
--- a/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch
+++ b/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch
@@ -1,7 +1,7 @@
 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://bugs.gentoo.org/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
@@ -42,3 +42,42 @@ http://www.directfb.org/index.php/viewcvs.cgi/DirectFB/include/directfb.h.diff?r
      case DSPF_RGB16:
      case DSPF_RGB24:
      case DSPF_RGB32:
+
+The DIKI_ALTGR enum has been cut in favor of just using DIKI_ALT_R
+
+http://bugs.gentoo.org/132945
+
+--- ClanLib-0.6.5/Sources/Display/Input/DirectFB/keyboard_directfb.cpp
++++ ClanLib-0.6.5/Sources/Display/Input/DirectFB/keyboard_directfb.cpp
+@@ -17,6 +17,9 @@
+ #ifdef USE_DIRECTFB
+ 
+ #include <directfb.h>
++#include <directfb_version.h>
++#define DFB_V(a,b,c) (((a) << 16) + ((b) << 8) + (c))
++#define DFB_VERSION DFB_V(DIRECTFB_MAJOR_VERSION, DIRECTFB_MINOR_VERSION, DIRECTFB_MICRO_VERSION)
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -243,7 +244,9 @@
+     case DIKI_SHIFT_R:     return CL_KEY_RSHIFT;
+     case DIKI_ALT_L:       return CL_KEY_ALT;
+     case DIKI_ALT_R:       return CL_KEY_ALT;
++#if DFB_VERSION < DFB_V(0,9,25)
+     case DIKI_ALTGR:       return CL_KEY_ALTGR;
++#endif
+     case DIKI_TAB:         return CL_KEY_TAB;
+     case DIKI_ENTER:       return CL_KEY_ENTER;
+     case DIKI_SPACE:       return CL_KEY_SPACE;
+@@ -337,7 +340,11 @@
+     case CL_KEY_LSHIFT:    return DIKI_SHIFT_L;
+     case CL_KEY_RSHIFT:    return DIKI_SHIFT_R;
+     case CL_KEY_ALT:       return DIKI_ALT_L;
++#if DFB_VERSION < DFB_V(0,9,25)
+     case CL_KEY_ALTGR:     return DIKI_ALTGR;
++#else
++    case CL_KEY_ALTGR:     return DIKI_ALT_R;
++#endif
+     case CL_KEY_TAB:       return DIKI_TAB;
+     case CL_KEY_ENTER:     return DIKI_ENTER;
+     case CL_KEY_SPACE:     return DIKI_SPACE;