diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2014-12-04 07:27:13 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2014-12-04 07:27:13 +0000 |
| commit | 11ce94d567fdf5b945533d15e6bc43f0cfc3cbcc (patch) | |
| tree | adc21c81f93142e9de97ca9d4d70bf8bcee2faad /games-strategy | |
| parent | Revision bump: EAPI 5, epatch_user, replace einstall with default src_install... (diff) | |
| download | historical-11ce94d567fdf5b945533d15e6bc43f0cfc3cbcc.tar.gz historical-11ce94d567fdf5b945533d15e6bc43f0cfc3cbcc.tar.bz2 historical-11ce94d567fdf5b945533d15e6bc43f0cfc3cbcc.zip | |
Fix build with jpeg-9 Bug #527508
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/scorched3d/Manifest | 15 | ||||
| -rw-r--r-- | games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch | 20 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-43.3d.ebuild | 10 |
4 files changed, 43 insertions, 8 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index a64644223678..f47c0ffa1748 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/scorched3d # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.91 2014/06/13 21:52:24 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.92 2014/12/04 07:27:06 tupone Exp $ + + 04 Dec 2014; Alfredo Tupone <tupone@gentoo.org> scorched3d-43.3d.ebuild, + +files/scorched3d-43.3d-jpeg9.patch: + Fix build with jpeg-9 Bug #527508 by flameeyes@gentoo.org 13 Jun 2014; Michael Sterrett <mr_bones_@gentoo.org> +files/scorched3d-43.3d-freetype.patch, files/scorched3d-43.3d-fixups.patch, diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest index 80681a90b6de..d163841751cd 100644 --- a/games-strategy/scorched3d/Manifest +++ b/games-strategy/scorched3d/Manifest @@ -1,11 +1,22 @@ +-----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 DIST Scorched3D-43.3d-src.tar.gz 93245939 SHA256 a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c SHA512 292cc1c8cabc981c5de9b0df5058be59f4264b803df7b1c34d79e5eee195dc6c3ba34a542bd909410fef64d9fa8f49b340f1e660669526753c19c3e3c71900a9 WHIRLPOOL 5ea176b756b4833e62d1e8a5835a53bcd1fec750e445589f64ee9c73cc48fb8e41a0666f3b85b8d4fb0e8226c95b966194a5512e07dd56c3f203e45b45ba79b8 -EBUILD scorched3d-43.3d.ebuild 1763 SHA256 68b622945384527703382a6189f361f9764f3016424082d09ccde47081f7ac32 SHA512 369221f4ddbac5037f144f0aeed41d615bfc3aa50e7cf695ed440d8ff6570905481d1445f34cc1f69074b88264bb560b3d3f8be66ee20b4ea712546a634c9dc8 WHIRLPOOL 585d14bd40a6ac8662f4780b91cb280f0ecf48afe9d89460c2db8340dad34b0cf97cff27b593949af486edbd0e727c383c4a0f127c302afc4d3c4509e10a9a5d -MISC ChangeLog 14836 SHA256 0ed094abdaf8252b12407bc356fea184c66825ea7aa406908aa7d69f936c98b6 SHA512 743d5840962994496d694a3ee49f436c46e71ab3361e8201393968dd764c33513f1c6dba938e8b930ff146b9cb042005e68e42eb8954c464069764aa48adc6e6 WHIRLPOOL c452c68744a15f909833290d875e18842dfd7fd4dde3825e6ebea5a9e93736cd4897f2d6bdede04b936939bf4f925e00bc41e138d8ce7fdc6a6b3ac08f825426 +EBUILD scorched3d-43.3d.ebuild 1724 SHA256 266eabe3dcef3f8ff883b989d2afd199d57fd51fa5fef2090d9fff0ffb20b28b SHA512 ed4837aa8ddff3ee40ededc6387e9bed5e8c397a2c96f58b197ceb2f19da6a07899c44a75d70db2a56da1222d024f8f4a862bf8bd9f5f68001a8447f18738093 WHIRLPOOL 8c58260515b96cabda59d52af2b6d0c1ccb1df478a501aa4e02c29003c1ea159d900dde97002feee6306e9459b8bb41afa3c9d39d67b0c2d857f6685bb7cff4e +MISC ChangeLog 15008 SHA256 cb6281c2d957a766f0a75e809d71e6d632d2639b76365ee208123c4e3008df34 SHA512 4f177dd78f7e42ec61e706196e1cb0c1317376479fbdf4915c9b088d66132040b23c9bec0e2cb35d5d712b9fae046bf3bb79bcc1d08ba51172080a2a0a217f12 WHIRLPOOL ac00a4fbf40f51b527a7fed35bdd0ddcc83aa638fd61a342ddbd3ff008c44b9584c4396aeecc4d8c14f707db556c21f298191d8b3bb8fc3e48099c287ec38085 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlSADM8ACgkQIY77eQFFFC1A4QCfYPGJlpk3qoevtiGb8BqHT/Rh +tOoAn0R+0xiIxryUyyhF81XLZ1e+gAar +=T2a3 +-----END PGP SIGNATURE----- diff --git a/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch new file mode 100644 index 000000000000..8255dd33f5d3 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch @@ -0,0 +1,20 @@ +--- 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/scorched3d-43.3d.ebuild b/games-strategy/scorched3d/scorched3d-43.3d.ebuild index a2943c52126a..067a48d2713a 100644 --- a/games-strategy/scorched3d/scorched3d-43.3d.ebuild +++ b/games-strategy/scorched3d/scorched3d-43.3d.ebuild @@ -1,8 +1,8 @@ # 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.8 2014/06/13 21:52:24 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-43.3d.ebuild,v 1.9 2014/12/04 07:27:06 tupone Exp $ -EAPI=2 +EAPI=4 WX_GTK_VER=2.8 inherit autotools eutils wxwidgets games @@ -43,13 +43,13 @@ src_prepare() { "${FILESDIR}"/${P}-png15.patch \ "${FILESDIR}"/${P}-win32.patch \ "${FILESDIR}"/${P}-gcc47.patch \ + "${FILESDIR}"/${P}-jpeg9.patch \ "${FILESDIR}"/${P}-freetype.patch eautoreconf } src_configure() { egamesconf \ - --disable-dependency-tracking \ --with-fftw=/usr \ --with-ogg=/usr \ --with-vorbis=/usr \ @@ -62,9 +62,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install if ! use dedicated ; then - newicon data/images/tank-old.bmp ${PN}.bmp || die + newicon data/images/tank-old.bmp ${PN}.bmp make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp fi prepgamesdirs |