diff options
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/clanlib/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/clanlib/Manifest | 8 | ||||
| -rw-r--r-- | dev-games/clanlib/clanlib-0.6.5-r3.ebuild | 5 | ||||
| -rw-r--r-- | dev-games/clanlib/clanlib-0.7.8-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch | 56 | ||||
| -rw-r--r-- | dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch | 37 |
6 files changed, 110 insertions, 7 deletions
diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog index 9114bab757b5..6030cc29405d 100644 --- a/dev-games/clanlib/ChangeLog +++ b/dev-games/clanlib/ChangeLog @@ -1,6 +1,12 @@ # 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.26 2006/01/13 22:00:39 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.27 2006/01/14 04:53:16 halcy0n Exp $ + + 14 Jan 2006; Mark Loeser <halcy0n@gentoo.org> + +files/clanlib-0.6.5-gcc41.patch, +files/clanlib-0.7.8-gcc41.patch, + clanlib-0.6.5-r3.ebuild, clanlib-0.7.8-r1.ebuild: + Add patch by Kristiaan Lenaerts <kristiaan.lenaerts AT gmail DOT com> to fix + compilation with gcc-4.1; bug #115847 13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> clanlib-0.7.8-r1.ebuild: diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest index 6116554e97c1..a06dd6ccaae4 100644 --- a/dev-games/clanlib/Manifest +++ b/dev-games/clanlib/Manifest @@ -1,11 +1,13 @@ -MD5 5c4ff6c24aca12f4bd606d1c2c814b50 ChangeLog 5933 -MD5 e6db078f4e90d2db32070769edbbaa56 clanlib-0.6.5-r3.ebuild 2174 -MD5 92e9b6527a187713a92c4d1602e78b66 clanlib-0.7.8-r1.ebuild 2426 +MD5 a8dd31fa4a7f8c4ddd57d8aabd019a5c ChangeLog 6223 +MD5 de2d672bdc4db79d411407af376fe2aa clanlib-0.6.5-r3.ebuild 2213 +MD5 fedef05941e9506e1079397072eda290 clanlib-0.7.8-r1.ebuild 2465 MD5 7c2e9c0016e1bcd9daaa26d1dd55228a files/0.7.8-install-opengl-wrap.patch 346 MD5 940618fa67a1354533249defe3a89739 files/0.7.8-port.patch 305 MD5 f0d65c6800d4f5ff51260b66bbc08670 files/clanlib-0.6.5-DirectFB-update.patch 1103 MD5 c700c77d44839f9d8bfda3e4faedfb75 files/clanlib-0.6.5-freetype.patch 354 MD5 18bfa200838fa3b2398d70ba78ede344 files/clanlib-0.6.5-gcc3.patch 3225 +MD5 61c847d9c5d5486e2c0f9191f895bac0 files/clanlib-0.6.5-gcc41.patch 2330 +MD5 2b74f3abb88b08665766135f0e794ed6 files/clanlib-0.7.8-gcc41.patch 1663 MD5 3e439d751339f684be1c709644d71a4d files/digest-clanlib-0.6.5-r3 68 MD5 96c4aa6ca05f84d43464c80d9e7565d9 files/digest-clanlib-0.7.8-r1 69 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010 diff --git a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild b/dev-games/clanlib/clanlib-0.6.5-r3.ebuild index ec28d1350f81..535345f308c1 100644 --- a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild +++ b/dev-games/clanlib/clanlib-0.6.5-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 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-r3.ebuild,v 1.4 2005/07/25 11:46:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r3.ebuild,v 1.5 2006/01/14 04:53:16 halcy0n Exp $ inherit eutils flag-o-matic @@ -30,6 +30,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc3.patch epatch "${FILESDIR}"/${P}-DirectFB-update.patch epatch "${FILESDIR}"/${P}-freetype.patch + epatch "${FILESDIR}"/${P}-gcc41.patch sed -i 's:@comp_mode@::' Setup/Unix/clanlib-config.in } diff --git a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild index 71824d0282ef..3bbdac09afb0 100644 --- a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild +++ b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.7 2006/01/13 22:00:39 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.8 2006/01/14 04:53:16 halcy0n Exp $ inherit flag-o-matic eutils @@ -49,6 +49,7 @@ src_unpack() { find . -name .cvsignore -exec rm -f '{}' \; epatch "${FILESDIR}"/${PV}-port.patch epatch "${FILESDIR}"/${PV}-install-opengl-wrap.patch + epatch "${FILESDIR}"/${P}-gcc41.patch if ! use doc ; then sed -i \ -e '/^SUBDIRS/s:Documentation::' \ diff --git a/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch b/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch new file mode 100644 index 000000000000..b9acb24f41fb --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch @@ -0,0 +1,56 @@ +--- 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.7.8-gcc41.patch b/dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch new file mode 100644 index 000000000000..7dc4ca303f74 --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch @@ -0,0 +1,37 @@ +diff -ur ClanLib-0.7.8-orig/Sources/API/Display/Collision/collision_outline.h ClanLib-0.7.8/Sources/API/Display/Collision/collision_outline.h +--- ClanLib-0.7.8-orig/Sources/API/Display/Collision/collision_outline.h 2005-12-18 03:11:10.000000000 -0500 ++++ ClanLib-0.7.8/Sources/API/Display/Collision/collision_outline.h 2005-12-18 03:12:20.000000000 -0500 +@@ -104,7 +104,7 @@ + const std::vector<CL_Pointf> &get_collision_points() const; + + //: Return the normal vectors of the other outline, at the points of collision. +- const std::vector<CL_Pointf> &CL_CollisionOutline::get_collision_normals() const; ++ const std::vector<CL_Pointf> &get_collision_normals() const; + + //! Operations: + public: +diff -ur ClanLib-0.7.8-orig/Sources/GUI/inputdialog_generic.h ClanLib-0.7.8/Sources/GUI/inputdialog_generic.h +--- ClanLib-0.7.8-orig/Sources/GUI/inputdialog_generic.h 2005-12-18 03:11:13.000000000 -0500 ++++ ClanLib-0.7.8/Sources/GUI/inputdialog_generic.h 2005-12-18 03:17:00.000000000 -0500 +@@ -37,7 +37,7 @@ + const std::string &button2, + const std::string &button3); + +- CL_InputDialog_Generic::~CL_InputDialog_Generic(); ++ ~CL_InputDialog_Generic(); + + CL_InputDialog *inputdialog; + +diff -ur ClanLib-0.7.8-orig/Sources/GUI/messagebox_generic.h ClanLib-0.7.8/Sources/GUI/messagebox_generic.h +--- ClanLib-0.7.8-orig/Sources/GUI/messagebox_generic.h 2005-12-18 03:11:13.000000000 -0500 ++++ ClanLib-0.7.8/Sources/GUI/messagebox_generic.h 2005-12-18 03:20:26.000000000 -0500 +@@ -31,7 +31,7 @@ + const std::string &button2, + const std::string &button3); + +- CL_MessageBox_Generic::~CL_MessageBox_Generic(); ++ ~CL_MessageBox_Generic(); + + std::string text; + + |