* [gentoo-commits] gentoo-x86 commit in games-rpg/egoboo/files: egoboo-2.7.4-enet.patch
@ 2010-02-20 22:35 Alfredo Tupone (tupone)
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone (tupone) @ 2010-02-20 22:35 UTC (permalink / raw
To: gentoo-commits
tupone 10/02/20 22:35:17
Added: egoboo-2.7.4-enet.patch
Log:
Version bump to 2.7.4 Bug #193403
Fix ELF file installed in /usr/share. Bug #305243
(Portage version: 2.1.7.16/cvs/Linux i686)
Revision Changes Path
1.1 games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.1&content-type=text/plain
Index: egoboo-2.7.4-enet.patch
===================================================================
--- game/Makefile.unix.old 2010-02-20 22:53:56.000000000 +0100
+++ game/Makefile.unix 2010-02-20 22:56:07.000000000 +0100
@@ -22,16 +22,16 @@
CC := gcc
OPT := -Os -Wall
-INC := -I. -I../enet/include -I.. ${SDLCONF_I}
-CFLAGS := ${OPT} ${INC}
-LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+INC := -I. -I.. ${SDLCONF_I} -DENET11
+CFLAGS := ${CFLAGS} ${INC}
+LDFLAGS := ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
EGO_BIN := egoboo
all: ${EGO_BIN}
-${EGO_BIN}: ${EGO_OBJ} ${ENET_OBJ}
+${EGO_BIN}: ${EGO_OBJ}
${CC} -o $@ $^ ${LDFLAGS}
install: ${EGO_BIN}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-rpg/egoboo/files: egoboo-2.7.4-enet.patch
@ 2010-02-21 11:20 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-02-21 11:20 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/02/21 11:20:14
Modified: egoboo-2.7.4-enet.patch
Log:
touchups
(Portage version: 2.1.7.16/cvs/Linux i686)
Revision Changes Path
1.2 games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?r1=1.1&r2=1.2
Index: egoboo-2.7.4-enet.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- egoboo-2.7.4-enet.patch 20 Feb 2010 22:35:16 -0000 1.1
+++ egoboo-2.7.4-enet.patch 21 Feb 2010 11:20:13 -0000 1.2
@@ -1,23 +1,79 @@
---- game/Makefile.unix.old 2010-02-20 22:53:56.000000000 +0100
-+++ game/Makefile.unix 2010-02-20 22:56:07.000000000 +0100
-@@ -22,16 +22,16 @@
-
- CC := gcc
+diff -ur egoboo-2.7.4.orig/game/Makefile.unix egoboo-2.7.4/game/Makefile.unix
+--- egoboo-2.7.4.orig/game/Makefile.unix 2009-07-03 05:36:02.000000000 -0400
++++ egoboo-2.7.4/game/Makefile.unix 2010-02-21 06:11:32.096511264 -0500
+@@ -1,5 +1,5 @@
+-# note if you change the prefix also update egoboo.sh
+-PREFIX := ${HOME}/.local
++# note if you change the prefix also update egoboo.sh
++PREFIX := ${HOME}/.local
+ EGO_SRC := camera.c char.c client.c clock.c configfile.c egoboo_endian.c \
+ egoboo_fileutil.c egoboo_math.c egoboo_setup.c egoboo_strutil.c \
+ enchant.c file_common.c file_linux.c font.c game.c graphic.c\
+@@ -9,36 +9,35 @@
+ egoboo_console.c script_functions.c mad.c mpd.c egoboo_typedef.c \
+ ogl_texture.c ogl_extensions.c ogl_include.c ogl_debug.c \
+ SDL_extensions.c SDL_GL_extensions.c mesh.c
+-
+-EGO_OBJ := ${EGO_SRC:.c=.o}
+-ENET_SRC := ../enet/host.c ../enet/list.c ../enet/memory.c \
+- ../enet/packet.c ../enet/peer.c ../enet/protocol.c \
+- ../enet/unix.c
+-ENET_OBJ := ${ENET_SRC:.c=.o}
+-
+-SDL_CONF := sdl-config
+-SDLCONF_I := $(shell ${SDL_CONF} --cflags)
+-SDLCONF_L := $(shell ${SDL_CONF} --libs)
+-
+-CC := gcc
++
++EGO_OBJ := ${EGO_SRC:.c=.o}
++ENET_SRC := ../enet/host.c ../enet/list.c ../enet/memory.c \
++ ../enet/packet.c ../enet/peer.c ../enet/protocol.c \
++ ../enet/unix.c
++ENET_OBJ := ${ENET_SRC:.c=.o}
++
++SDL_CONF := sdl-config
++SDLCONF_I := $(shell ${SDL_CONF} --cflags)
++SDLCONF_L := $(shell ${SDL_CONF} --libs)
++
OPT := -Os -Wall
--INC := -I. -I../enet/include -I.. ${SDLCONF_I}
--CFLAGS := ${OPT} ${INC}
--LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+-INC := -I. -I../enet/include -I.. ${SDLCONF_I}
+-CFLAGS := ${OPT} ${INC}
+-LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+-
+-EGO_BIN := egoboo
+-
+-all: ${EGO_BIN}
+-
+-
+-${EGO_BIN}: ${EGO_OBJ} ${ENET_OBJ}
+- ${CC} -o $@ $^ ${LDFLAGS}
+-
+-install: ${EGO_BIN}
+- mkdir -p ${PREFIX}/bin
+- mkdir -p ${PREFIX}/libexec
+- install -m 755 ${EGO_BIN} ${PREFIX}/libexec
+- install -p -m 755 ${EGO_BIN}.sh ${PREFIX}/bin/${EGO_BIN}
+-
+-clean:
+- rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
+INC := -I. -I.. ${SDLCONF_I} -DENET11
+CFLAGS := ${CFLAGS} ${INC}
+LDFLAGS := ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
-
- EGO_BIN := egoboo
-
- all: ${EGO_BIN}
-
-
--${EGO_BIN}: ${EGO_OBJ} ${ENET_OBJ}
++
++EGO_BIN := egoboo
++
++all: ${EGO_BIN}
++
++
+${EGO_BIN}: ${EGO_OBJ}
- ${CC} -o $@ $^ ${LDFLAGS}
-
- install: ${EGO_BIN}
++ ${CC} -o $@ $^ ${LDFLAGS}
++
++install: ${EGO_BIN}
++ mkdir -p ${PREFIX}/bin
++ mkdir -p ${PREFIX}/libexec
++ install -m 755 ${EGO_BIN} ${PREFIX}/libexec
++ install -p -m 755 ${EGO_BIN}.sh ${PREFIX}/bin/${EGO_BIN}
++
++clean:
++ rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-rpg/egoboo/files: egoboo-2.7.4-enet.patch
@ 2010-07-15 4:24 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-07-15 4:24 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/07/15 04:24:03
Modified: egoboo-2.7.4-enet.patch
Log:
honor LDFLAGS (bug #328313)
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.3 games-rpg/egoboo/files/egoboo-2.7.4-enet.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch?r1=1.2&r2=1.3
Index: egoboo-2.7.4-enet.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-rpg/egoboo/files/egoboo-2.7.4-enet.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- egoboo-2.7.4-enet.patch 21 Feb 2010 11:20:13 -0000 1.2
+++ egoboo-2.7.4-enet.patch 15 Jul 2010 04:24:03 -0000 1.3
@@ -59,7 +59,7 @@
- rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
+INC := -I. -I.. ${SDLCONF_I} -DENET11
+CFLAGS := ${CFLAGS} ${INC}
-+LDFLAGS := ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
++LDFLAGS += ${SDLCONF_L} -lenet -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image
+
+EGO_BIN := egoboo
+
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-15 4:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-15 4:24 [gentoo-commits] gentoo-x86 commit in games-rpg/egoboo/files: egoboo-2.7.4-enet.patch Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2010-02-21 11:20 Michael Sterrett (mr_bones_)
2010-02-20 22:35 Alfredo Tupone (tupone)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox