diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2014-12-04 07:27:07 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2014-12-04 07:27:07 +0000 |
| commit | 48ef1f842009a33e285c156bbcef4d96812b2a90 (patch) | |
| tree | 19ae74449615812800408337d1c14ba98a6edd32 /games-strategy | |
| parent | Revision bump: EAPI 5, epatch_user, replace einstall with default src_install... (diff) | |
| download | gentoo-2-48ef1f842009a33e285c156bbcef4d96812b2a90.tar.gz gentoo-2-48ef1f842009a33e285c156bbcef4d96812b2a90.tar.bz2 gentoo-2-48ef1f842009a33e285c156bbcef4d96812b2a90.zip | |
Fix build with jpeg-9 Bug #527508
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/scorched3d/files/scorched3d-43.3d-jpeg9.patch | 20 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-43.3d.ebuild | 10 |
3 files changed, 30 insertions, 6 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/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 |