From: Michael Sterrett Date: Thu, 12 Mar 2015 18:35:56 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=87374fed1a3ec37cd8959e0955099f9be3689f68;p=gentoo.git old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index 9808611c8b39..81a019498299 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-strategy/scorched3d # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.99 2015/02/23 11:17:59 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.100 2015/03/12 18:35:49 mr_bones_ Exp $ + + 12 Mar 2015; Michael Sterrett + -files/scorched3d-43.3d-fixups.patch, -files/scorched3d-43.3d-freetype.patch, + -files/scorched3d-43.3d-gcc43.patch, -files/scorched3d-43.3d-gcc47.patch, + -files/scorched3d-43.3d-jpeg9.patch, -files/scorched3d-43.3d-odbc.patch, + -files/scorched3d-43.3d-png15.patch, -files/scorched3d-43.3d-win32.patch, + -scorched3d-43.3d.ebuild: + old 23 Feb 2015; Agostino Sarubbo scorched3d-44.ebuild: Stable for ppc64, wrt bug #538986 diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest index 22ffd87dae83..d6e0303acd61 100644 --- a/games-strategy/scorched3d/Manifest +++ b/games-strategy/scorched3d/Manifest @@ -1,40 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX scorched3d-43.3d-fixups.patch 698 SHA256 bbcfb87334913ff96db76aded98665203ddb44903c2846e03fbe2fed0b2b2429 SHA512 70a324e197d02ec385cdc399be9b39a202930507f4efeb913330cdbf1caaa8fbfe8e408b07f8fafb67e6418d53190e53c045ab24859449629ea8ed86474910ee WHIRLPOOL 84a362998bc35df1c4450cdcd86ea5f468b5645690f6a171c1c96a25f2cf81d8816e77bf269b04530dd8084e6930286772a8f266d495c338cc3007f677a969c0 -AUX scorched3d-43.3d-freetype.patch 1375 SHA256 8cc61f9065b9472e201fe1f565226663e5431e1b874f3618da7cc5f9b1bca817 SHA512 2bed88489bef318b6003384de678c633ea5df97087c2d71e3c10fde13330282a810c26c7d69d705a71a56a65b65f3660664c9feb0a628370f87025b4b2321074 WHIRLPOOL 531314a2b34bf14d95b58ed5b03f02f5920fd663dc5ab2624aa7686cfbf47f9dc72dc5b6740c4e85349c84860785969afa66d208693e456781ffecf382ea8f56 -AUX scorched3d-43.3d-gcc43.patch 561 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 WHIRLPOOL 5a5b045001e21410e66b026896d990013f22507ebe15637f1139016f8d0d61de3fc08773706ab4eb942fb6e4b7ce6fa2baede0d4c2c688a05f338da6e7db614d -AUX scorched3d-43.3d-gcc47.patch 751 SHA256 f77f2293bf9eaac560520978ce7b74e7d7e8463e8bdb8b8d4eab9842d663fb19 SHA512 58793b52603a4e79778c636e640a87f3ed2900b44a552ab95ebdc562d660b8e22c5a2ef910906b7fcb7f3819e3d41062aefed3359b2df865dc3bc911938597f7 WHIRLPOOL 359ec8cb3f6bc4c0167a30ab0735d3c48d5908749c154895be0b64f43b530bade0b12317f84ff6bdc7ce8d615662c7f19a0be15a5934f67d543dab7a15a309aa -AUX scorched3d-43.3d-jpeg9.patch 610 SHA256 66b3bc4a22dbc54df011d26e4aa416249f510f4c53d892b7cedf55787ad4036b SHA512 03f6ded93ff28351672a30b75f4837bbc750187d8cc6cb168df0b52fe75c9a21eec7ae89421aed3559e75990bd151493965cd843cca17508effbeed01eca91a7 WHIRLPOOL 59eae6f92029eb64e6079ca348d2848b65a372a5b2186035880afd86049f76daa116ed3488c1abdf81e208023643d243efc934d4143c9daf7bb575856c750f50 -AUX scorched3d-43.3d-odbc.patch 503 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e WHIRLPOOL b4ee72c4b69f08f7342bac21382ef279ec54a2c06c6026889c0ba611d05e4ffbd4b4ebf601f1dbba7e72aef0bb8b0f5f48c133e18402e3b345b2b72338a441ef -AUX scorched3d-43.3d-png15.patch 2438 SHA256 104fec74e6617581444b73f4076e288773d7d7bf469221d0cf51dae09a61f53f SHA512 eea949c649c6067f6d6856fd3b5976d375327adca1e7c5771bad1c82fb562c8e9627d0ed2052604f5f33982e4e82303329163b5da74a7b8c0459435037199b8f WHIRLPOOL bd87f05f19babb2d37dea6a0ef1309c15acb006bdd8a0bf56e1ab3afe32b541f65eb38111c22214911649587c3b926ab0d69a5a4483adf27c4a03cdda119ed65 -AUX scorched3d-43.3d-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd WHIRLPOOL 888a17bba56ea17bf6961a79e6a8ad81a70baece753ff05be0549312bef712b1f743db249f3a287992586be215afe82522fdf3f757bf49c0ea6b6065767f3d57 AUX scorched3d-44-fixups.patch 717 SHA256 5eb531b97c2520fb3dcd1bbec0ad684228c0d4183a9fd3641629846351f02875 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7 WHIRLPOOL 50aa87c84e1a70fb59ef81da9c952d9b8abb05e9b9e7b5af528a560108d8c94e37aec35764302382b411e403e0402acf4c8efb096c8c39bcebaea0ad9516d258 AUX scorched3d-44-freetype.patch 1375 SHA256 8cc61f9065b9472e201fe1f565226663e5431e1b874f3618da7cc5f9b1bca817 SHA512 2bed88489bef318b6003384de678c633ea5df97087c2d71e3c10fde13330282a810c26c7d69d705a71a56a65b65f3660664c9feb0a628370f87025b4b2321074 WHIRLPOOL 531314a2b34bf14d95b58ed5b03f02f5920fd663dc5ab2624aa7686cfbf47f9dc72dc5b6740c4e85349c84860785969afa66d208693e456781ffecf382ea8f56 AUX scorched3d-44-gcc43.patch 561 SHA256 7ee76b89705292ecd2ef55e416dd58a64d3bc5310bc369a26b5eb0ce469ba59e SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1 WHIRLPOOL 5a5b045001e21410e66b026896d990013f22507ebe15637f1139016f8d0d61de3fc08773706ab4eb942fb6e4b7ce6fa2baede0d4c2c688a05f338da6e7db614d AUX scorched3d-44-jpeg9.patch 610 SHA256 66b3bc4a22dbc54df011d26e4aa416249f510f4c53d892b7cedf55787ad4036b SHA512 03f6ded93ff28351672a30b75f4837bbc750187d8cc6cb168df0b52fe75c9a21eec7ae89421aed3559e75990bd151493965cd843cca17508effbeed01eca91a7 WHIRLPOOL 59eae6f92029eb64e6079ca348d2848b65a372a5b2186035880afd86049f76daa116ed3488c1abdf81e208023643d243efc934d4143c9daf7bb575856c750f50 AUX scorched3d-44-odbc.patch 503 SHA256 56d5fa2e0b59e19b74248c3a0a081e7139476305dfbfc5c905abaa1de3681d15 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e WHIRLPOOL b4ee72c4b69f08f7342bac21382ef279ec54a2c06c6026889c0ba611d05e4ffbd4b4ebf601f1dbba7e72aef0bb8b0f5f48c133e18402e3b345b2b72338a441ef AUX scorched3d-44-win32.patch 464 SHA256 325ec09315a102ebb2290007c28fe263771991a5c82908a0ef084f1f6f209b1f SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd WHIRLPOOL 888a17bba56ea17bf6961a79e6a8ad81a70baece753ff05be0549312bef712b1f743db249f3a287992586be215afe82522fdf3f757bf49c0ea6b6065767f3d57 -DIST Scorched3D-43.3d-src.tar.gz 93245939 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c SHA512 292cc1c8cabc981c5de9b0df5058be59f4264b803df7b1c34d79e5eee195dc6c3ba34a542bd909410fef64d9fa8f49b340f1e660669526753c19c3e3c71900a9 WHIRLPOOL 5ea176b756b4833e62d1e8a5835a53bcd1fec750e445589f64ee9c73cc48fb8e41a0666f3b85b8d4fb0e8226c95b966194a5512e07dd56c3f203e45b45ba79b8 DIST Scorched3D-44-src.tar.gz 41689613 SHA256 1c8320bb2210030be71dd713c214fbd32f7dd663ea82031383e6b3636f8a8dba SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca WHIRLPOOL 6b7c744702b86df856d8879454e7c9616e31dc3a9f539bd97c53cba4bea0e59f44e3c703f847f3cd505ba0e90386887f7134f9500421b3d58ba12a9cc1fdbc0e -EBUILD scorched3d-43.3d.ebuild 1724 SHA256 266eabe3dcef3f8ff883b989d2afd199d57fd51fa5fef2090d9fff0ffb20b28b SHA512 ed4837aa8ddff3ee40ededc6387e9bed5e8c397a2c96f58b197ceb2f19da6a07899c44a75d70db2a56da1222d024f8f4a862bf8bd9f5f68001a8447f18738093 WHIRLPOOL 8c58260515b96cabda59d52af2b6d0c1ccb1df478a501aa4e02c29003c1ea159d900dde97002feee6306e9459b8bb41afa3c9d39d67b0c2d857f6685bb7cff4e EBUILD scorched3d-44.ebuild 2116 SHA256 f016f99722c599c16609aca0f089bc094105dc388d8dfb57a64369adef1d4a6c SHA512 e0bd0d401ee99304ac8f9d82b8e72a2f0ea324149a026d797115723d734cc07f43d1e1cd7da202d9a7237da88427eb16881c28e9d2ebadf25eecf97d6afb0d95 WHIRLPOOL fd7934c9b4813c05a4106e1646a7cf818db6c7dfc4d24cd8e4be80442c418576fd85cf5aafc4a18ceedffcbd1e79a7f5db26a7c9ab146ae0bd5f5018fec418f0 -MISC ChangeLog 15981 SHA256 40da09f19baefd5736ef96f97d8aa49971576e9c888510958314ac69f93ebfc0 SHA512 659b7c120f7744d1f07fb28dea947c4bf46e97036c5a9b83b33d96dad7fdbb7b658265544587f5331fc00da12ab28191b46de415ed77d729d8ca4aa672a35f4b WHIRLPOOL 03aba2da4f9c608d0b2270f2c3e34e9fd1e2454ec79b4343e37105bffb9c5a48ece16c070afe986e001fc01b53c9b628739f80a4f701087c8a44f763a2959f0a +MISC ChangeLog 16385 SHA256 a4bbf80de049d02acd34341baac4e19aa020e88d37f73bca668ba963951ab87a SHA512 7bcf80ac0e1b26f825e829fbb8d748de5672067f0a83ed0518d9b8e4600c9a227cdad3acbc27d5c2efb4b61898d3b30a4c20933a5004727aefecd83a4a5f52ba WHIRLPOOL b6ae93961727860e049c475ce1c590aa7ea2662d688cc54d2558e0926bb8154d6070dda837c5e77225b345591639631f93897f174727404b40635edcba527822 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU6wxoAAoJELp701BxlEWfo0cQAI8CMvyuTdE8skUakJ36pFMg -D5E2Q5+yRsUPmH9v0jHXjc+CIpN/9vZqsNMqcllzgGUZBkA24lh9qsHoMTkXuVsH -PInR9PBK1ccVvKC57+k3o/6fNk2lG/puDD9mNwiwk6heRAnoV+cQT3pobp3bI+dn -Wu+K0SnqIfsf2pECyrpPB5P1ghcWuCCZtqxonxvYx9w2iXgD4Npk09y64FXamgZf -QVehpeO0TjweAEESA23e7O6P/zd3vpcunm2GfXQTKnMp546LXdK7c/fnsjKHWGTK -xy1yJAkq3E+1xwYaLMuq338i2Wg1T9eCrght7msQW8sWkcB2EksIrw4PCIs/076i -+xHdyFAtnAJ4MhMlc3CI0K5mr2kJWDrn7c+YFRspHfA3MCKBa17I+Af1oVDwGO9y -7QHbtMRjaHj1c9QkvfJ2yNQvjgZjpou63tzI5HZdvkmcry65HVh9zKWY/HYdw09V -xjH6SKvfqE5v4ogrk6xa19JG5lSVOQuQHyq70xf4zk0nVrWV4HPGes2VXwL1vPyx -WAMa9LITDKKzwqX2IkBiu5xFreAHLoUrAved9yPAqTBeDKaq9SIxueGdX6UR0bky -/2l1bSOcjw8awVcFhsGXpLO1/EuR094X/V4p4tcj9NJdj8Mwofqy8t5OnryOjdwE -frog9PIXgsCStuzpDn/K -=eFY9 ------END PGP SIGNATURE----- diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch deleted file mode 100644 index f7a835fd8df2..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-fixups.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- scorched.orig/configure.ac -+++ scorched/configure.ac -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch deleted file mode 100644 index 93c8ca358b31..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-freetype.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- acinclude.m4.orig -+++ acinclude.m4 -@@ -437,7 +437,7 @@ - if test "$FT2_CONFIG" = "no" ; then - no_ft=yes - else -- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` -+ FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`" - FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` - ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ---- src.orig/client/GLEXT/GLFont2dFreeType.h -+++ src/client/GLEXT/GLFont2dFreeType.h -@@ -23,10 +23,10 @@ - - #include - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - #include - - class GLFont2dFreeType ---- src.orig/launcher/wxdialogs/TrueTypeFont.h -+++ src/launcher/wxdialogs/TrueTypeFont.h -@@ -25,10 +25,10 @@ - #include - #include - #include --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - class TrueTypeFont - { diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch deleted file mode 100644 index 79f40b70e652..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- scorched.old/src/common/common/main.h -+++ scorched/src/common/common/main.h -@@ -40,7 +40,7 @@ - void _no_storage() - { - printf("Failed to allocate memory!!"); -- std::exit(1); -+ exit(1); - } - - void run_main(int argc, char *argv[], OptionsParameters ¶ms) ---- scorched.old/src/common/porting/windows.h -+++ scorched/src/common/porting/windows.h -@@ -20,7 +20,7 @@ - typedef unsigned short WORD; - typedef unsigned char BYTE; - --typedef int HWND; -+// typedef int HWND; - typedef void * HINSTANCE; - typedef int WPARAM; - typedef int LPARAM; diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch deleted file mode 100644 index ceb47bf3e5fd..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-gcc47.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix build failure against gcc-4.7 (missing for close()) - -../client/SecureID.cpp: In member function 'std::string SecureID::GetPrivateKey()': -../client/SecureID.cpp:92:13: error: 'close' was not declared in this scope -../client/SecureID.cpp:102:14: error: 'close' was not declared in this scope -../client/SecureID.cpp:115:13: error: 'close' was not declared in this scope -../client/SecureID.cpp:124:12: error: 'close' was not declared in this scope - -make[3]: *** [SecureID.o] Error 1 ---- a/src/client/client/SecureID.cpp -+++ b/src/client/client/SecureID.cpp -@@ -75,6 +75,7 @@ std::string SecureID::GetPrivateKey(void) - - #include - #include -+#include - - std::string SecureID::GetPrivateKey(void) - { diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch deleted file mode 100644 index 8255dd33f5d3..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/common/image/ImageJpgFactory.cpp.old 2014-12-03 09:52:03.306552513 +0100 -+++ src/common/image/ImageJpgFactory.cpp 2014-12-03 09:53:22.117786304 +0100 -@@ -79,7 +79,7 @@ - src->next_input_byte = FakeEOI; - src->bytes_in_buffer = 2; - -- return TRUE; -+ return (boolean)TRUE; - } - - METHODDEF(void) -@@ -166,7 +166,7 @@ - src->bytes_in_buffer = buffer.getBufferUsed(); - src->next_input_byte = (JOCTET *) buffer.getBuffer(); - -- jpeg_read_header(&cinfo, TRUE); -+ jpeg_read_header(&cinfo, (boolean)TRUE); - jpeg_start_decompress(&cinfo); - - if ((cinfo.output_components == 3 && !readalpha) || diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch deleted file mode 100644 index e7f3833bf897..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-odbc.patch +++ /dev/null @@ -1,16 +0,0 @@ -When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build. -bug #285384 - patch from Bob Johnson - ---- scorched/src/common/porting/windows.h -+++ fix_scorched/src/common/porting/windows.h -@@ -11,8 +11,8 @@ - - typedef char * LPSTR; - typedef const char * LPCTSTR; --typedef unsigned int DWORD; --typedef unsigned int * LPDWORD; -+typedef unsigned long DWORD; -+typedef DWORD * LPDWORD; - typedef unsigned char * LPBYTE; - typedef int INT; - typedef long LONG; diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch deleted file mode 100644 index d349532a35d8..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-png15.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ./src/common/image/ImagePngFactory.cpp.old -+++ ./src/common/image/ImagePngFactory.cpp -@@ -104,7 +104,7 @@ - - static void user_png_error(png_structp png_ptr, png_const_charp msg) - { -- longjmp(png_ptr->jmpbuf,1); -+ longjmp(png_jmpbuf(png_ptr),1); - } - - static void user_png_warning(png_structp png_ptr, png_const_charp msg) ---- ./src/client/client/LoadPNG.cpp.old -+++ ./src/client/client/LoadPNG.cpp -@@ -28,6 +28,8 @@ - int row, i; - volatile int ckey = -1; - png_color_16 *transv; -+ png_colorp png_palette; -+ int num_palette; - - if ( !src ) { - /* The error message has been set in SDL_RWFromFile */ -@@ -58,7 +60,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+ if ( setjmp(png_jmpbuf(png_ptr)) ) { - error = "Error reading the PNG file."; - goto done; - } -@@ -127,9 +129,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -137,7 +139,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -185,12 +187,15 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0 ) { -- palette->ncolors = info_ptr->num_palette; -- for( i=0; inum_palette; ++i ) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else { -+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); -+ if (num_palette > 0 ) { -+ palette->ncolors = num_palette; -+ for( i=0; icolors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; -+ } - } - } - } diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch deleted file mode 100644 index 05f9c806b1c7..000000000000 --- a/games-strategy/scorched3d/files/scorched3d-43.3d-win32.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- scorched.old/src/common/porting/windows.h -+++ scorched/src/common/porting/windows.h -@@ -9,6 +9,7 @@ - #include - #include - -+#ifdef _WIN32 - typedef char * LPSTR; - typedef const char * LPCTSTR; - typedef unsigned int DWORD; -@@ -27,6 +28,7 @@ - typedef int LRESULT; - typedef void * HDC; - typedef void * HGLRC; -+#endif /* _WIN32 */ - - #define _strnicmp(a,b,c) strncasecmp(a,b,c) - #define stricmp(a,b) strcasecmp(a,b) diff --git a/games-strategy/scorched3d/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild deleted file mode 100644 index 067a48d2713a..000000000000 --- a/games-strategy/scorched3d/scorched3d-43.3d.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.9 2014/12/04 07:27:06 tupone Exp $ - -EAPI=4 -WX_GTK_VER=2.8 -inherit autotools eutils wxwidgets games - -DESCRIPTION="Multi-player tank battle in 3D (OpenGL)" -HOMEPAGE="http://www.scorched3d.co.uk/" -SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="dedicated mysql" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-net - media-libs/libpng - virtual/jpeg:0 - dev-libs/expat - !dedicated? ( - virtual/opengl - virtual/glu - media-libs/libogg - media-libs/libvorbis - media-libs/openal - media-libs/freealut - x11-libs/wxGTK:2.8[X] - media-libs/freetype:2 - sci-libs/fftw:3.0 - ) - mysql? ( virtual/mysql )" - -S=${WORKDIR}/scorched - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-fixups.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-odbc.patch \ - "${FILESDIR}"/${P}-png15.patch \ - "${FILESDIR}"/${P}-win32.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${FILESDIR}"/${P}-jpeg9.patch \ - "${FILESDIR}"/${P}-freetype.patch - eautoreconf -} - -src_configure() { - egamesconf \ - --with-fftw=/usr \ - --with-ogg=/usr \ - --with-vorbis=/usr \ - --datadir="${GAMES_DATADIR}/${PN}" \ - --with-docdir="/usr/share/doc/${PF}" \ - --with-wx-config="${WX_CONFIG}" \ - --without-pgsql \ - $(use_with mysql) \ - $(use_enable dedicated serveronly) -} - -src_install() { - emake DESTDIR="${D}" install - if ! use dedicated ; then - newicon data/images/tank-old.bmp ${PN}.bmp - make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp - fi - prepgamesdirs -}