Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-games/clanlib
diff options
context:
space:
mode:
Diffstat (limited to 'dev-games/clanlib')
-rw-r--r--dev-games/clanlib/Manifest19
-rw-r--r--dev-games/clanlib/clanlib-0.6.5-r4.ebuild94
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-64bit.patch37
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch83
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-bounds.patch11
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-freetype.patch17
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-gcc3.patch106
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch56
-rw-r--r--dev-games/clanlib/files/clanlib-0.6.5-uclibc.patch64
9 files changed, 10 insertions, 477 deletions
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index c2a3bb76e47b..e0f4551e51b5 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,22 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 0.7.8-install-opengl-wrap.patch 346 RMD160 9bc4dbf6ef3e75381c8de3eff571385d34e6dec0 SHA1 a1815885330a078e3b48a21c9cfa841c72e21870 SHA256 771d196e405f3e3d68a27030c80e1fc0d7b4c34e27fa8ed697deadfda42b6082
AUX 0.7.8-port.patch 305 RMD160 1cc87ddb0c022eb4083d11a63f130b7154526c28 SHA1 4a1cbbab8508535df50aa97f359a497d2fa4573b SHA256 6545f6e5463ff83e42c521a49fac300524b5283667e5bdcf30120d3b6cf01a0c
-AUX clanlib-0.6.5-64bit.patch 1576 RMD160 15e333ec70a77d70c66812f2c8b51acf8e8a0107 SHA1 cfa9b40393b9bb9ed7bf0dd1b9c24317765226a7 SHA256 aaf213505148e41a73de5b37b7d8098651ef08f051220205d8bb9d03baaffa5c
-AUX clanlib-0.6.5-DirectFB-update.patch 2467 RMD160 52f3f123f895bacddfca3f218e9fe3b2e94ac79b SHA1 86b51f372330eb6cce90b21b5602091b630e5fa6 SHA256 107ae01c9c499c230f7d9fb8c1f2929cda81214de7d0832acbb873f6d75815fd
-AUX clanlib-0.6.5-bounds.patch 402 RMD160 31073eaccf10e010b8dfeb435cb375b2de61f788 SHA1 817e2879fb2f5816ea7ec97664dabc119101a3d4 SHA256 20e2e263fcc4080510dae89cebcd8facca27d6e863d0f758e3fc0ed542964370
-AUX clanlib-0.6.5-freetype.patch 354 RMD160 acd601555318cf6b5d6329ae5946336ad6c716e4 SHA1 fe6251df44716347dc28c018f6fd8bc9b1445f1b SHA256 8711a0017643a080b73d506a03e0865051e040348ac091eace0062bdab16d4e1
-AUX clanlib-0.6.5-gcc3.patch 3225 RMD160 26311026537ea0f5df8e62c92b254a3d70e386c6 SHA1 682426d4826c47be9d92931a3957822b2da940d7 SHA256 71f97a2191ee2ef4a4a2f840d0364bdef51fe06b3bf3a1439751793c05fc6937
-AUX clanlib-0.6.5-gcc41.patch 2330 RMD160 2766ec8223730f76026a09c6f26cdfc393141b8c SHA1 e651201db3a78edf12465f395d4917c987495876 SHA256 6c4d075d90dd2efc98139eb00030a89e2d1cfd94059fdf4e249a7d5da74f38b7
-AUX clanlib-0.6.5-uclibc.patch 1670 RMD160 44a42cfc573629dc1596fd4c4777131e1fc6f8eb SHA1 d6eeecc1a789e816c7782cbb3062c97aec3d1499 SHA256 e4bbcb22dcec90e32238b649f4ac8e756ca9bfb5991f18f6c93920247b197b83
AUX clanlib-0.7.8-gcc41.patch 1663 RMD160 e3a0b0b66c849598bac2c082f0d6740693b046e8 SHA1 9ebc970d5bdf8db234cb4ea5c144c32931498dbf SHA256 9d092a6b3484c22d93fc066985ae092db37b3624ee9a11dec1046a48dc615815
AUX clanlib-0.7.8-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
AUX clanlib-0.7.8-refreshfix.patch 435 RMD160 e4562f30dea51c6b1f01014611f3a7ebf0976ca5 SHA1 2745951ebc37339188bf63af6949dd1869b57020 SHA256 1cb0bab20ef41f364d5bb4395a78213f4ad8fa187bc49cc5f85e80544f557ffa
AUX clanlib-0.8.0-gcc42.patch 744 RMD160 e902db2b7692afc386da0eacf3b8e37fe55aa780 SHA1 0ef10d301fa2974c11abf14e707a624529bea823 SHA256 1fd27babc3ca53e274a191bf30013be3290cdf222bef00aa543763b5376ec35a
AUX clanlib-0.8.0-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
-DIST ClanLib-0.6.5-1.tar.gz 2183097 RMD160 31f060f438925c9ec7dd2a9466ed6bb367549b3b SHA1 d3a8558c1f8b652742636e4712b5b9911f74e4d8 SHA256 62e16913423945475f3541fc97deaeb9b0f735b6c93c88725a6a771d5a882db5
DIST ClanLib-0.7.8-1.tar.bz2 6567261 RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 SHA1 1416b09d8aa3549b1adeef50ba00df59b20917e6 SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8
DIST ClanLib-0.8.0.tgz 7527581 RMD160 b78a86b853c12295fcf7d755c59183965bd563ac SHA1 e8b30bbb16d07d1cfd90525d60d9d2d8f3e74282 SHA256 def9bdbb20ea740e005134a77def721e969e230740e67937cc3ac201033059e6
-EBUILD clanlib-0.6.5-r4.ebuild 2479 RMD160 f251fbeef02b180c0a3ce03fc3369d2e2adf6bd0 SHA1 1ba45e9c37b36cdefdc13e567abb9e3bd6972ae5 SHA256 d8ed8c7ed6f95ed19d2f7ccdda045277eab2b87d02fcf7f035f5788191fad5be
EBUILD clanlib-0.7.8-r2.ebuild 2338 RMD160 fc61b0bad4e1a8fdcd9e6729b11c831eed37ab88 SHA1 9aa90fcbbd908c3673bb78037fb13ec333d73c20 SHA256 344a80a7ba96a32c05e364f179ffb39e5631c57bdcf9965f4b1278a422347e39
EBUILD clanlib-0.8.0.ebuild 2068 RMD160 d1cae5d994b92c6f8cdc3d8cb5e1d92421e8f585 SHA1 d6ebda41d200b633536a6004d3ea0ec41e3812d0 SHA256 a0209e9416c194e446d2f9e3e760c3af827eda96ee6dacc71245b95f6816ec1d
MISC ChangeLog 8539 RMD160 8ef760f2d2eb0f23d009eccba0534c0c407bc4c7 SHA1 5b1df177a7c0a42c1cb74721cbec9aaccc505a7c SHA256 20a46a2e1297d87948ae8fd9b267ed2d8a04508b324e0e62d8ae751cef7c6685
MISC metadata.xml 2920 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 SHA1 7b05a6cdc831e23c0679217a14e739acdea504b9 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHthwYdz7hIScOURERArQFAKCR4aKjpmdUwpCUBcKPcAC+ogjlxQCgr17E
+v1MRZSHGoU9vf/mvUWZo3Tk=
+=DleD
+-----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.6.5-r4.ebuild b/dev-games/clanlib/clanlib-0.6.5-r4.ebuild
deleted file mode 100644
index bde5d4835a91..000000000000
--- a/dev-games/clanlib/clanlib-0.6.5-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 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-r4.ebuild,v 1.3 2007/07/22 09:50:49 graaff Exp $
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="multi-platform game development library"
-HOMEPAGE="http://www.clanlib.org/"
-SRC_URI="http://www.clanlib.org/download/legacy/ClanLib-${PV}-1.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0.6"
-KEYWORDS="amd64 x86" #not big endian safe #82779
-IUSE="arts oss esd alsa png opengl truetype X vorbis mikmod jpeg directfb joystick"
-
-DEPEND=">=media-libs/hermes-1.3.2
- X? (
- media-libs/mesa
- x11-libs/libXt
- x11-proto/inputproto
- x11-proto/xf86vidmodeproto
- )
- png? ( media-libs/libpng )
- jpeg? ( >=media-libs/jpeg-6b )
- mikmod? ( >=media-libs/libmikmod-3.1.9 )
- truetype? ( >=media-libs/freetype-2.0 )
- directfb? ( dev-libs/DirectFB )
- vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}
- media-libs/mesa
- x11-libs/libXmu
- x11-libs/libXxf86vm"
-
-S=${WORKDIR}/ClanLib-${PV}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gcc3.patch
- epatch "${FILESDIR}"/${P}-DirectFB-update.patch
- epatch "${FILESDIR}"/${P}-freetype.patch
- epatch "${FILESDIR}"/${P}-gcc41.patch
- epatch "${FILESDIR}"/${P}-uclibc.patch
- epatch "${FILESDIR}"/${P}-{64bit,bounds}.patch
- sed -i 's:@comp_mode@::' Setup/Unix/clanlib-config.in
-}
-
-src_compile() {
- local myconf=""
-
- replace-flags -O? -O2
-
- use jpeg || myconf="${myconf} --enable-smalljpeg"
- use alsa || use oss || use esd || use arts \
- && myconf="${myconf} --enable-clansound" \
- || myconf="${myconf} --disable-clansound"
-
- econf \
- --libdir=/usr/$(get_libdir)/${P} \
- --includedir=/usr/include/${P} \
- --enable-network \
- $(use_enable x86 asm386) \
- --disable-lua \
- --enable-dyn \
- $(use_enable X x11) \
- $(use_enable directfb) \
- $(use_enable opengl) \
- $(use_enable vorbis) \
- $(use_enable png) \
- $(use_enable truetype ttf) \
- $(use_enable mikmod) \
- $(use_enable joystick) \
- --enable-vidmode \
- ${myconf} || die
-
- emake || die "emake failed"
-}
-
-src_install() {
- make install \
- prefix="${D}"/usr \
- LIB_PREFIX="${D}"/usr/$(get_libdir)/${P} \
- INC_PREFIX="${D}"/usr/include/${P} \
- || die "make install failed"
- mv "${D}"/usr/bin/clanlib{,0.6}-config
- dodoc BUGS CODING_STYLE HARDWARE NEWS PATCHES PORTING README* ROADMAP INSTALL.linux
-
- # setup links for runtime
- cd "${D}"/usr/$(get_libdir)
- local l
- for l in ${P}/*.2 ; do
- ln -s ${l}
- done
-}
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch b/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch
deleted file mode 100644
index 5cacb50c4fc8..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-64bit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Sources/SmallJPEG/jpgd/jpegdecoder.cpp.old 2006-09-13 00:08:55.000000000 +0200
-+++ Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2006-09-13 00:10:41.000000000 +0200
-@@ -19,6 +19,7 @@
- // License along with this library; if not, write to the Free Software
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- //------------------------------------------------------------------------------
-+#include <stdint.h>
- #include "jpegdecoder.h"
- //------------------------------------------------------------------------------
- // Coefficients are stored in this sequence in the data stream.
-@@ -102,7 +103,7 @@
- blocks[i] = q;
-
- // Round to qword boundry, to avoid misaligned accesses with MMX code
-- return ((void *)(((uint)q + 7) & ~7));
-+ return ((void *)(((uintptr_t)q + 7) & ~7));
- }
- //------------------------------------------------------------------------------
- // Clear buffer to word values.
-@@ -1870,7 +1871,7 @@
- q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
-
- // Align to 8-byte boundry, for MMX code
-- q = (uchar *)(((uint)q + 7) & ~7);
-+ q = (uchar *)(((uintptr_t)q + 7) & ~7);
-
- // The block_seg[] array's name dates back to the
- // 16-bit assembler implementation. "seg" stood for "segment".
-@@ -1880,7 +1881,7 @@
- for (i = 0; i < max_blocks_per_row; i++)
- block_max_zag_set[i] = 64;
-
-- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
-+ Psample_buf = (uchar *)(((uintptr_t)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
-
- total_lines_left = image_y_size;
-
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
deleted file mode 100644
index 85e9f367f9f2..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-DirectFB-update.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-DirectFB no longer defines DSPF_RGB15 since it was really just a
-ghetto shortcut to DSPF_ARGB1555.
-
-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
-+++ 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:
-
-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;
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-bounds.patch b/dev-games/clanlib/files/clanlib-0.6.5-bounds.patch
deleted file mode 100644
index c58df4c58cdd..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Display/Display/Generic/blit_transparent.cpp.old 2006-09-14 00:48:06.000000000 +0200
-+++ Sources/Display/Display/Generic/blit_transparent.cpp 2006-09-14 00:49:16.000000000 +0200
-@@ -278,6 +278,8 @@
- unsigned int dest_pitch = target->get_pitch();
-
- unsigned char *dest = (unsigned char *) target->get_data();
-+ if (y == 0)
-+ y = 1;
- dest += x*sizeof(T) + (y-1)*dest_pitch;
-
- // T *dd;
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-freetype.patch b/dev-games/clanlib/files/clanlib-0.6.5-freetype.patch
deleted file mode 100644
index d15b5c607931..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-freetype.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make sure freetype is included properly.
-Patch by Jim Ramsay.
-
-http://bugs.gentoo.org/show_bug.cgi?id=76533
-
---- Sources/TTF/font_ttf.cpp
-+++ Sources/TTF/font_ttf.cpp
-@@ -21,7 +21,8 @@
- #include <malloc.h>
- #include "Display/Font/font_generic.h"
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-
- #include "font_ttf.h"
-
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-gcc3.patch b/dev-games/clanlib/files/clanlib-0.6.5-gcc3.patch
deleted file mode 100644
index 932e1f244f98..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-gcc3.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- Sources/GL/GLX/displaycard_glx.cpp
-+++ Sources/GL/GLX/displaycard_glx.cpp
-@@ -14,6 +14,8 @@
-
- #ifdef USE_OPENGL
-
-+#define GLX_GLXEXT_PROTOTYPES
-+
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
---- Sources/Display/Display/DirectFB/target_directfb.cpp
-+++ Sources/Display/Display/DirectFB/target_directfb.cpp
-@@ -104,7 +104,7 @@
-
- unsigned int CL_Target_DirectFB::get_width() const
- {
-- unsigned int width = 0;
-+ int width = 0;
-
- surface->GetSize (surface, &width, NULL);
-
-@@ -113,7 +113,7 @@
-
- unsigned int CL_Target_DirectFB::get_height() const
- {
-- unsigned int height = 0;
-+ int height = 0;
-
- surface->GetSize (surface, NULL, &height);
-
-@@ -263,7 +263,7 @@
-
- void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
- {
-- unsigned int width, height;
-+ int width, height;
-
- surface->GetSize (surface, &width, &height);
-
---- Sources/Core/IOData/Unix/directory_scanner_unix.cpp
-+++ Sources/Core/IOData/Unix/directory_scanner_unix.cpp
-@@ -21,6 +21,7 @@
- #include <fnmatch.h>
- #include <unistd.h>
- #include "directory_scanner_unix.h"
-+#include <assert.h>
-
- CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix ()
- : dir_temp (NULL), entry (NULL)
---- Sources/Core/System/Unix/appconf.h
-+++ Sources/Core/System/Unix/appconf.h
-@@ -527,7 +527,9 @@
-
- //protected: --- if FileConfig::ConfigEntry is not public, functions in
- // ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
-+ protected:
- class ConfigGroup;
-+ public:
- class ConfigEntry
- {
- private:
---- Sources/Display/Display/Generic/blit_alphamask_rle.h
-+++ Sources/Display/Display/Generic/blit_alphamask_rle.h
-@@ -107,14 +107,14 @@
- {
- T a = alpha_data[x];
- T destval = dst_data[x];
-- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
-- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
-- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
-+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
-+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
-+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
-
- T amix =
-- (r<<rstart) +
-- (g<<gstart) +
-- (b<<bstart);
-+ (r<<this->rstart) +
-+ (g<<this->gstart) +
-+ (b<<this->bstart);
-
- dst_data[x] = amix + *(src_data++);
- }
-@@ -151,13 +151,13 @@
- {
- T a = alpha_data[x];
- T destval = dst_buf[x];
-- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
-- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
-- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
-+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
-+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
-+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
- T amix =
-- (r<<rstart) +
-- (g<<gstart) +
-- (b<<bstart);
-+ (r<<this->rstart) +
-+ (g<<this->gstart) +
-+ (b<<this->bstart);
- dst_buf[x] = amix + *(src_data++);
- }
- memcpy(dst_data, dst_buf, sizeof(T)*rep);
-
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch b/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch
deleted file mode 100644
index b9acb24f41fb..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Sources/GUI/messagebox_generic.h.old 2005-12-05 10:53:26.000000000 +0100
-+++ Sources/GUI/messagebox_generic.h 2005-12-05 10:53:56.000000000 +0100
-@@ -26,7 +26,7 @@
- const std::string &button2,
- const std::string &button3);
-
-- CL_MessageBox_Generic::~CL_MessageBox_Generic();
-+ ~CL_MessageBox_Generic();
-
- void set_text(const std::string &text);
-
---- Sources/SmallJPEG/jpgd/jpegdecoder.h.old 2005-12-05 10:58:53.000000000 +0100
-+++ Sources/SmallJPEG/jpgd/jpegdecoder.h 2005-12-05 11:00:50.000000000 +0100
-@@ -493,26 +493,26 @@
-
- void find_eoi(void);
- //------------------
-- /*inline*/ uint jpeg_decoder::rol(uint i, uchar j);
-- /*inline*/ uint jpeg_decoder::get_char(void);
-- /*inline*/ uint jpeg_decoder::get_char(bool *Ppadding_flag);
-- /*inline*/ void jpeg_decoder::stuff_char(uchar q);
-- /*inline*/ uchar jpeg_decoder::get_octet(void);
-- /*inline*/ uint jpeg_decoder::get_bits_1(int num_bits);
-- /*inline*/ uint jpeg_decoder::get_bits_2(int numbits);
-- /*inline*/ int jpeg_decoder::huff_decode(Phuff_tables_t Ph);
-+ /*inline*/ uint rol(uint i, uchar j);
-+ /*inline*/ uint get_char(void);
-+ /*inline*/ uint get_char(bool *Ppadding_flag);
-+ /*inline*/ void stuff_char(uchar q);
-+ /*inline*/ uchar get_octet(void);
-+ /*inline*/ uint get_bits_1(int num_bits);
-+ /*inline*/ uint get_bits_2(int numbits);
-+ /*inline*/ int huff_decode(Phuff_tables_t Ph);
- #ifdef SUPPORT_X86ASM
-- /*inline*/ uint jpeg_decoder::huff_extend(uint i, int c);
-+ /*inline*/ uint huff_extend(uint i, int c);
- #endif
-- /*inline*/ uchar jpeg_decoder::clamp(int i);
-+ /*inline*/ uchar clamp(int i);
-
- #ifdef SUPPORT_MMX
-- /*inline*/ uint jpeg_decoder::get_high_byte_mmx(void);
-- /*inline*/ uint jpeg_decoder::get_high_word_mmx(void);
-- /*inline*/ void jpeg_decoder::get_bits_2_mmx_init(void);
-- /*inline*/ void jpeg_decoder::get_bits_2_mmx_deinit(void);
-- /*inline*/ uint jpeg_decoder::get_bits_2_mmx(int numbits);
-- /*inline*/ int jpeg_decoder::huff_decode_mmx(Phuff_tables_t Ph);
-+ /*inline*/ uint get_high_byte_mmx(void);
-+ /*inline*/ uint get_high_word_mmx(void);
-+ /*inline*/ void get_bits_2_mmx_init(void);
-+ /*inline*/ void get_bits_2_mmx_deinit(void);
-+ /*inline*/ uint get_bits_2_mmx(int numbits);
-+ /*inline*/ int huff_decode_mmx(Phuff_tables_t Ph);
- #endif
- //------------------
- int image_x_size;
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-uclibc.patch b/dev-games/clanlib/files/clanlib-0.6.5-uclibc.patch
deleted file mode 100644
index 3bace3e396a4..000000000000
--- a/dev-games/clanlib/files/clanlib-0.6.5-uclibc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Add support for building on uClibc systems
-
-http://bugs.gentoo.org/135081
-
-Patch by James Le Cuirot
-
---- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/cdaudio_linux.cpp
-+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/cdaudio_linux.cpp
-@@ -19,7 +19,7 @@
- #include <fcntl.h>
-
- #ifndef Solaris // we'll need to define Solaris
--#include <fstab.h> // there's no fstab.h on Solaris...
-+#include <mntent.h> // not sure if mntent.h is on Solaris...
- #else
- #include <sys/vfstab.h> //...but vfstab.h
- #endif
-@@ -82,17 +82,17 @@
-
- // We start by looking the mounttab:
-
--#ifdef Solaris
- FILE *f_mnttab = fopen("/etc/mnttab", "r");
-+#ifdef Solaris
- vfstab *mount_file;
- getvfsent(f_mnttab, mount_file);
- #else
-- fstab *mount_file = getfsent();
-+ mntent *mount_file = getmntent(f_mnttab);
- #endif
- while(mount_file != NULL)
- {
- #ifndef Solaris
-- if(strncmp(mount_file->fs_vfstype,"iso9660",7)==0)
-+ if(strncmp(mount_file->mnt_type,"iso9660",7)==0)
- #else
- if(strncmp(mount_file->vfs_fstype,"iso9660",7)==0) // ugly code... suggestions ?
- #endif
-@@ -100,7 +100,7 @@
- try
- {
- #ifndef Solaris
-- CL_CDAudio::cd_drives.push_back(new CL_CDDrive_Linux(mount_file->fs_spec));
-+ CL_CDAudio::cd_drives.push_back(new CL_CDDrive_Linux(mount_file->mnt_fsname));
- #else
- CL_CDAudio::cd_drives.push_back(new CL_CDDrive_Linux(mount_file->vfs_special));
- #endif
-@@ -112,14 +112,14 @@
- }
- }
- #ifndef Solaris
-- mount_file = getfsent();
-+ mount_file = getmntent(f_mnttab);
- #else
- getvfsent(f_mnttab, mount_file);
- #endif
- // cout << mount_file->fs_vfstype << endl;
- }
- #ifndef Solaris
-- endfsent();
-+ endmntent(f_mnttab);
- #else
- fclose(f_mnttab);
- #endif