* [gentoo-commits] repo/gentoo:master commit in: games-sports/gracer/, games-sports/gracer/files/
@ 2016-01-15 19:33 Michael Sterrett
0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett @ 2016-01-15 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 3274f359229667e7774af70e956cac3a81b58920
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 22:43:09 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 19:33:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3274f359
games-sports/gracer: fix building against latest giflib (bug #571936)
Package-Manager: portage-2.2.26
games-sports/gracer/files/gracer-0.1.5-giflib.patch | 14 ++++++++++++++
.../gracer/files/gracer-0.1.5-warnings.patch | 21 +++++++++++++++++++++
games-sports/gracer/gracer-0.1.5.ebuild | 4 +++-
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/games-sports/gracer/files/gracer-0.1.5-giflib.patch b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
new file mode 100644
index 0000000..2d62b8c
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
@@ -0,0 +1,14 @@
+--- gracer-0.1.5.orig/common/gr_texture.c
++++ gracer-0.1.5/common/gr_texture.c
+@@ -274,7 +274,11 @@
+ int index;
+ int width, height;
+
++#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
++ file = DGifOpenFileName (filename, &i);
++#else
+ file = DGifOpenFileName (filename);
++#endif
+ if (!file)
+ return -1;
+
diff --git a/games-sports/gracer/files/gracer-0.1.5-warnings.patch b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
new file mode 100644
index 0000000..5886ef7
--- /dev/null
+++ b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
@@ -0,0 +1,21 @@
+--- gracer-0.1.5.orig/src/glbind.c
++++ gracer-0.1.5/src/glbind.c
+@@ -142,7 +142,7 @@
+ return NULL;
+
+ entry = Tcl_FindHashEntry (&cache_hash, key);
+- if (&entry)
++ if (!entry)
+ return NULL;
+
+ return Tcl_GetHashValue (entry);
+--- gracer-0.1.5.orig/src/joystick.c
++++ gracer-0.1.5/src/joystick.c
+@@ -20,6 +20,7 @@
+ */
+
+ #include <unistd.h>
++#include <string.h>
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index 46a3f67..4fa9e7a 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.ebuild
@@ -34,7 +34,9 @@ src_prepare() {
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}"/${P}-as-needed.patch \
"${FILESDIR}"/${P}-libpng14.patch \
- "${FILESDIR}"/${P}-png15.patch
+ "${FILESDIR}"/${P}-png15.patch \
+ "${FILESDIR}"/${P}-giflib.patch \
+ "${FILESDIR}"/${P}-warnings.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-sports/gracer/, games-sports/gracer/files/
@ 2016-09-28 21:14 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-09-28 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 113d000a4b43db6742196ff6983b0bb74e4b30f1
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 18:52:01 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:13:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113d000a
games-sports/gracer: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
games-sports/gracer/files/0.1.5-gldefs.patch | 8 ++--
.../gracer/files/gracer-0.1.5-as-needed.patch | 4 +-
games-sports/gracer/files/gracer-0.1.5-gcc41.patch | 4 +-
.../gracer/files/gracer-0.1.5-giflib.patch | 2 +-
.../gracer/files/gracer-0.1.5-libpng14.patch | 4 +-
games-sports/gracer/files/gracer-0.1.5-png15.patch | 4 +-
.../gracer/files/gracer-0.1.5-warnings.patch | 4 +-
games-sports/gracer/files/gracer-gcc-3.4.patch | 16 +++----
games-sports/gracer/gracer-0.1.5-r1.ebuild | 51 ++++++++++++++++++++++
9 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/games-sports/gracer/files/0.1.5-gldefs.patch b/games-sports/gracer/files/0.1.5-gldefs.patch
index 825edff..43fe738 100644
--- a/games-sports/gracer/files/0.1.5-gldefs.patch
+++ b/games-sports/gracer/files/0.1.5-gldefs.patch
@@ -1,5 +1,5 @@
---- src/glbind.c.orig 2003-07-30 00:18:37.000000000 -0400
-+++ src/glbind.c 2003-07-30 00:19:32.000000000 -0400
+--- a/src/glbind.c 2003-07-30 00:18:37.000000000 -0400
++++ b/src/glbind.c 2003-07-30 00:19:32.000000000 -0400
@@ -22,6 +22,8 @@
#include <unistd.h>
#include <GL/gl.h>
@@ -9,8 +9,8 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
---- src/glhash.h.orig 2003-07-30 00:20:32.000000000 -0400
-+++ src/glhash.h 2003-07-30 00:20:58.000000000 -0400
+--- a/src/glhash.h 2003-07-30 00:20:32.000000000 -0400
++++ b/src/glhash.h 2003-07-30 00:20:58.000000000 -0400
@@ -1,4 +1,5 @@
/* this file is generated automaticaly from GL/gl.h */
+#undef GL_EXT_paletted_texture
diff --git a/games-sports/gracer/files/gracer-0.1.5-as-needed.patch b/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
index 3d3c53b..1b8b21f 100644
--- a/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.old 2009-02-11 14:31:56.000000000 +0100
-+++ src/Makefile.in 2009-02-11 14:32:29.000000000 +0100
+--- a/src/Makefile.in 2009-02-11 14:31:56.000000000 +0100
++++ b/src/Makefile.in 2009-02-11 14:32:29.000000000 +0100
@@ -109,7 +109,7 @@
INCLUDES = -I$(top_srcdir) @X_CFLAGS@ @GL_CFLAGS@ @GLUT_CFLAGS@ @TCL_CFLAGS@ @GIF_CFLAGS@ @JPEG_CFLAGS@ @PNG_CFLAGS@ @PLIB_CFLAGS@
diff --git a/games-sports/gracer/files/gracer-0.1.5-gcc41.patch b/games-sports/gracer/files/gracer-0.1.5-gcc41.patch
index 7d47f96..3877e76 100644
--- a/games-sports/gracer/files/gracer-0.1.5-gcc41.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-gcc41.patch
@@ -1,5 +1,5 @@
---- common/gr_memory.h.old 2006-05-23 09:16:21.000000000 +0200
-+++ common/gr_memory.h 2006-05-23 09:16:40.000000000 +0200
+--- a/common/gr_memory.h 2006-05-23 09:16:21.000000000 +0200
++++ b/common/gr_memory.h 2006-05-23 09:16:40.000000000 +0200
@@ -64,7 +64,7 @@
void gr_dlist_free (GrDList *list);
diff --git a/games-sports/gracer/files/gracer-0.1.5-giflib.patch b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
index 2d62b8c..a5ce023 100644
--- a/games-sports/gracer/files/gracer-0.1.5-giflib.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
@@ -1,4 +1,4 @@
---- gracer-0.1.5.orig/common/gr_texture.c
+--- gracer-0.1.5/common/gr_texture.c
+++ gracer-0.1.5/common/gr_texture.c
@@ -274,7 +274,11 @@
int index;
diff --git a/games-sports/gracer/files/gracer-0.1.5-libpng14.patch b/games-sports/gracer/files/gracer-0.1.5-libpng14.patch
index 6230eb2..618c987 100644
--- a/games-sports/gracer/files/gracer-0.1.5-libpng14.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-libpng14.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/show_bug.cgi?id=308885
---- common/gr_texture.c
-+++ common/gr_texture.c
+--- a/common/gr_texture.c
++++ b/common/gr_texture.c
@@ -419,7 +419,7 @@ read_png_file (GrTexture *texture, char
if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
goto ERROR;
diff --git a/games-sports/gracer/files/gracer-0.1.5-png15.patch b/games-sports/gracer/files/gracer-0.1.5-png15.patch
index 1efaec3..d606c14 100644
--- a/games-sports/gracer/files/gracer-0.1.5-png15.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-png15.patch
@@ -1,5 +1,5 @@
---- common/gr_texture.c.old 2011-09-14 14:23:46.820207882 +0200
-+++ common/gr_texture.c 2011-09-14 14:24:22.861203604 +0200
+--- a/common/gr_texture.c 2011-09-14 14:23:46.820207882 +0200
++++ b/common/gr_texture.c 2011-09-14 14:24:22.861203604 +0200
@@ -431,7 +431,7 @@
if (!info_ptr) {
goto ERROR;
diff --git a/games-sports/gracer/files/gracer-0.1.5-warnings.patch b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
index 5886ef7..b5ede40 100644
--- a/games-sports/gracer/files/gracer-0.1.5-warnings.patch
+++ b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
@@ -1,4 +1,4 @@
---- gracer-0.1.5.orig/src/glbind.c
+--- gracer-0.1.5/src/glbind.c
+++ gracer-0.1.5/src/glbind.c
@@ -142,7 +142,7 @@
return NULL;
@@ -9,7 +9,7 @@
return NULL;
return Tcl_GetHashValue (entry);
---- gracer-0.1.5.orig/src/joystick.c
+--- gracer-0.1.5/src/joystick.c
+++ gracer-0.1.5/src/joystick.c
@@ -20,6 +20,7 @@
*/
diff --git a/games-sports/gracer/files/gracer-gcc-3.4.patch b/games-sports/gracer/files/gracer-gcc-3.4.patch
index 354f986..c12cb9a 100644
--- a/games-sports/gracer/files/gracer-gcc-3.4.patch
+++ b/games-sports/gracer/files/gracer-gcc-3.4.patch
@@ -1,5 +1,5 @@
---- src/glbind.c.old 2004-11-05 01:15:07.141221016 +0000
-+++ src/glbind.c 2004-11-05 01:15:32.808319024 +0000
+--- a/src/glbind.c 2004-11-05 01:15:07.141221016 +0000
++++ b/src/glbind.c 2004-11-05 01:15:32.808319024 +0000
@@ -2150,6 +2150,7 @@
return 3;
@@ -24,8 +24,8 @@
}
ERROR:
---- src/glutwidgets.c.old 2004-11-05 01:17:17.941336376 +0000
-+++ src/glutwidgets.c 2004-11-05 01:18:42.059548464 +0000
+--- a/src/glutwidgets.c 2004-11-05 01:17:17.941336376 +0000
++++ b/src/glutwidgets.c 2004-11-05 01:18:42.059548464 +0000
@@ -255,6 +255,7 @@
widget->width += (width - screen_width);
break;
@@ -74,8 +74,8 @@
}
glColor4fv (widget->fg_color[GR_STATE_NORMAL]);
---- src/gr_world.c.old 2004-11-05 01:19:30.766143936 +0000
-+++ src/gr_world.c 2004-11-05 01:19:07.717647840 +0000
+--- a/src/gr_world.c 2004-11-05 01:19:30.766143936 +0000
++++ b/src/gr_world.c 2004-11-05 01:19:07.717647840 +0000
@@ -169,6 +169,7 @@
break;
@@ -84,8 +84,8 @@
}
tlist = entry->triggers;
---- ac2scene/ac2scene.c.old 2004-11-05 01:13:55.845059680 +0000
-+++ ac2scene/ac2scene.c 2004-11-05 01:14:32.526483256 +0000
+--- a/ac2scene/ac2scene.c 2004-11-05 01:13:55.845059680 +0000
++++ b/ac2scene/ac2scene.c 2004-11-05 01:14:32.526483256 +0000
@@ -162,6 +162,7 @@
break;
diff --git a/games-sports/gracer/gracer-0.1.5-r1.ebuild b/games-sports/gracer/gracer-0.1.5-r1.ebuild
new file mode 100644
index 00000000..d841e11
--- /dev/null
+++ b/games-sports/gracer/gracer-0.1.5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="3D motor sports simulator"
+HOMEPAGE="http://gracer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gracer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="joystick"
+
+DEPEND="
+ dev-lang/tcl:0
+ media-libs/freeglut
+ media-libs/giflib
+ media-libs/libpng:0
+ media-libs/plib
+ x11-libs/libXi
+ x11-libs/libXmu
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl"
+
+RDEPEND=${DEPEND}
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-gldefs.patch
+ "${FILESDIR}"/${PN}-gcc-3.4.patch
+ "${FILESDIR}/${P}"-gcc41.patch
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-png15.patch
+ "${FILESDIR}"/${P}-giflib.patch
+ "${FILESDIR}"/${P}-warnings.patch
+)
+
+src_configure() {
+ econf \
+ --enable-gif \
+ --enable-jpeg \
+ --enable-png \
+ $(use_enable joystick)
+ sed -i \
+ -e 's:-lplibsl:-lplibsl -lplibul:' \
+ $(find -name Makefile) || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-28 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-15 19:33 [gentoo-commits] repo/gentoo:master commit in: games-sports/gracer/, games-sports/gracer/files/ Michael Sterrett
-- strict thread matches above, loose matches on Subject: below --
2016-09-28 21:14 Austin English
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox