rpms/egoboo/devel egoboo-2.7.5-unix.patch, 1.3, 1.4 egoboo.spec, 1.12, 1.13 sources, 1.4, 1.5
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Feb 15 21:54:11 UTC 2010
Author: jwrdegoede
Update of /cvs/pkgs/rpms/egoboo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15118
Modified Files:
egoboo-2.7.5-unix.patch egoboo.spec sources
Log Message:
* Mon Feb 15 2010 Hans de Goede <hdegoede at redhat.com> 2.7.5-9
- Switch to upstream unix tarbal release, which includes our unix patches
- Update URL to point to new upstream site (#559588)
- Fix FTBFS (#564797)
egoboo-2.7.5-unix.patch:
Makefile.unix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: egoboo-2.7.5-unix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/devel/egoboo-2.7.5-unix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- egoboo-2.7.5-unix.patch 24 Dec 2007 21:35:19 -0000 1.3
+++ egoboo-2.7.5-unix.patch 15 Feb 2010 21:54:11 -0000 1.4
@@ -1,245 +1,12 @@
-diff -up ./game/common-file.c~ ./game/common-file.c
---- ./game/common-file.c~ 2007-12-23 20:34:23.000000000 +0100
-+++ ./game/common-file.c 2007-12-23 20:34:23.000000000 +0100
-@@ -156,4 +156,4 @@ void fs_fileClose(FILE * pfile)
- {
- fclose(pfile);
- };
--};
-\ No newline at end of file
-+};
-diff -up ./game/gltexture.c~ ./game/gltexture.c
---- ./game/gltexture.c~ 2007-12-23 20:35:11.000000000 +0100
-+++ ./game/gltexture.c 2007-12-23 20:35:11.000000000 +0100
-@@ -305,4 +305,4 @@ void GLTexture_Bind(GLTexture *texture,
- };
- }
-
--};
-\ No newline at end of file
-+};
-diff -up ./game/Client.h~ ./game/Client.h
---- ./game/Client.h~ 2007-12-23 20:33:30.000000000 +0100
-+++ ./game/Client.h 2007-12-23 20:33:30.000000000 +0100
-@@ -24,7 +24,7 @@
- #define egoboo_Client_h
-
- #include "enet/enet.h"
--#include "network.h"
-+#include "Network.h"
- #include "egobootypedef.h"
- #include "egoboo.h"
-
-diff -up ./game/graphicmad.c~ ./game/graphicmad.c
---- ./game/graphicmad.c~ 2007-12-23 20:35:33.000000000 +0100
-+++ ./game/graphicmad.c 2007-12-23 20:35:33.000000000 +0100
-@@ -22,9 +22,8 @@ along with Egoboo. If not, see <http://
- #include "egoboo.h"
- #include "Md2.h"
- #include "id_md2.h"
--#include "log.h"
-+#include "Log.h"
- #include <SDL_opengl.h>
--#include "log.h"
-
- /* Storage for blended vertices */
- static GLfloat md2_blendedVertices[MD2_MAX_VERTICES][3];
-@@ -887,4 +886,4 @@ void render_refmad(int tnc, Uint8 trans)
- // glLoadMatrixf(mView.v);
- // glMultMatrixf(mWorld.v);
- //}
--//#endif
-\ No newline at end of file
-+//#endif
-diff -up ./game/Clock.c~ ./game/Clock.c
---- ./game/Clock.c~ 2007-12-23 20:34:03.000000000 +0100
-+++ ./game/Clock.c 2007-12-23 20:34:03.000000000 +0100
-@@ -30,7 +30,7 @@
- #include <string.h> // memcpy & memset
-
- // Clock data
--typedef struct clock_state_t
-+struct clock_state_t
- {
- // Clock data
- double(*timeSource)(); // Function that the clock get it's time values from
-@@ -47,7 +47,7 @@ typedef struct clock_state_t
- int frameHistorySize;
- int frameHistoryWindow;
- int frameHistoryHead;
--} ClockState;
-+};
-
- static void clock_state_init(ClockState * cs)
- {
-diff -up ./game/network.c~ ./game/network.c
---- ./game/network.c~ 2007-12-23 20:37:06.000000000 +0100
-+++ ./game/network.c 2007-12-23 20:37:06.000000000 +0100
-@@ -20,7 +20,7 @@
- along with Egoboo. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include "network.h"
-+#include "Network.h"
- #include "Client.h"
- #include "Server.h"
- #include "Log.h"
-diff -up ./game/Network.h~ ./game/Network.h
---- ./game/Network.h~ 2007-12-23 20:33:12.000000000 +0100
-+++ ./game/Network.h 2007-12-23 20:33:12.000000000 +0100
-@@ -183,4 +183,4 @@ void find_open_sessions();
- void stop_players_from_joining();
- //int create_player(int host);
- //void turn_on_service(int service);
--#endif
-\ No newline at end of file
-+#endif
-diff -up ./game/char.c~ ./game/char.c
---- ./game/char.c~ 2007-12-23 20:33:04.000000000 +0100
-+++ ./game/char.c 2007-12-23 20:33:04.000000000 +0100
-@@ -19,7 +19,7 @@ along with Egoboo. If not, see <http://
- */
-
- #include "mathstuff.h"
--#include "network.h"
-+#include "Network.h"
- #include "Client.h"
- #include "Server.h"
- #include "Log.h"
-diff -up ./game/Font.c~ ./game/Font.c
---- ./game/Font.c~ 2007-12-23 20:34:35.000000000 +0100
-+++ ./game/Font.c 2007-12-23 20:34:35.000000000 +0100
-@@ -29,15 +29,17 @@
- #include <SDL_opengl.h>
- #include <SDL_ttf.h>
-
-+#ifndef __unix__
- #define vsnprintf _vsnprintf
-+#endif
-
--typedef struct font_t
-+struct font_t
- {
- TTF_Font *ttfFont;
-
- GLuint texture;
- GLfloat texCoords[4];
--} Font;
-+};
-
- // The next two functions are borrowed from the gl_font.c test program from SDL_ttf
- static int powerOfTwo(int input)
-diff -up ./game/egoboo.h~ ./game/egoboo.h
---- ./game/egoboo.h~ 2007-12-23 20:40:16.000000000 +0100
-+++ ./game/egoboo.h 2007-12-23 20:40:16.000000000 +0100
-@@ -2308,7 +2308,7 @@ EXTERN int numscantag;
- EXTERN char tagname[MAXTAG][TAGSIZE]; // Scancode names
- EXTERN Uint32 tagvalue[MAXTAG]; // Scancode values
-
--typedef enum control_t
-+enum control_t
- {
- KEY_JUMP = 0,
- KEY_LEFT_USE,
-@@ -2351,7 +2351,7 @@ typedef enum control_t
- JOB_RIGHT_PACK,
- JOB_CAMERA,
- MAXCONTROL
--} CONTROL;
-+};
-
- EXTERN Uint32 controlvalue[MAXCONTROL]; // The scancode or mask
- EXTERN Uint32 controliskey[MAXCONTROL]; // Is it a key?
-diff -up ./game/Timer.h~ ./game/Timer.h
---- ./game/Timer.h~ 2007-12-23 20:43:00.000000000 +0100
-+++ ./game/Timer.h 2007-12-23 20:43:00.000000000 +0100
-@@ -23,7 +23,8 @@
- #ifndef Egoboo_Timer_h
- #define Egoboo_Timer_h
-
--typedef struct clock_state_t ClockState;
-+/* For ClockState */
-+#include "Clock.h"
-
- typedef struct timer_t
- {
-diff -up ./game/Ui.c~ ./game/Ui.c
---- ./game/Ui.c~ 2007-12-23 20:43:59.000000000 +0100
-+++ ./game/Ui.c 2007-12-23 20:43:59.000000000 +0100
-@@ -31,7 +31,7 @@ GLfloat ui_active_color[] = {0, 0, 0.9f,
- GLfloat ui_hot_color[] = {0.54f, 0, 0, 1.0f};
- GLfloat ui_normal_color[] = {0.66f, 0, 0, 0.6f};
-
--typedef struct ui_context_t
-+struct ui_context_t
- {
- // Tracking control focus stuff
- UI_ID active;
-@@ -44,7 +44,7 @@ typedef struct ui_context_t
-
- Font *defaultFont;
- Font *activeFont;
--} UiContext;
-+};
-
- static UiContext ui_context;
-
-diff -up ./game/Ui.h~ ./game/Ui.h
---- ./game/Ui.h~ 2007-12-23 22:59:01.000000000 +0100
-+++ ./game/Ui.h 2007-12-23 22:59:01.000000000 +0100
-@@ -101,7 +101,7 @@ bool_t ui_widgetSetMask(ui_Widget * pw,
- /*****************************************************************************/
-
- // Behaviors
--int ui_buttonBehavior(ui_Widget * pWidget);
-+ui_buttonValues ui_buttonBehavior(ui_Widget * pWidget);
-
- // Drawing
- void ui_drawButton(ui_Widget * pWidget);
-diff -up ./game/Makefile.unix~ ./game/Makefile.unix
---- ./game/Makefile.unix~ 2007-12-23 23:07:14.000000000 +0100
-+++ ./game/Makefile.unix 2007-12-23 23:07:14.000000000 +0100
-@@ -20,7 +20,7 @@ CC := gcc
+diff -ur orig/game/Makefile.unix egoboo-2.7.5/game/Makefile.unix
+--- orig/game/Makefile.unix 2008-01-01 22:35:35.000000000 +0100
++++ egoboo-2.7.5/game/Makefile.unix 2010-02-15 22:26:50.951732207 +0100
+@@ -18,7 +18,7 @@
+
+ CC := gcc
OPT := -Os
- INC := -I. -I../enet/include ${SDLCONF_I}
+-INC := -I. -I.. ${SDLCONF_I}
++INC := ${SDLCONF_I}
CFLAGS := ${OPT} ${INC}
--LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU
-+LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
-
- EGO_BIN := egoboo
+ LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
---- ./game/enchant.c~ 2007-12-24 17:35:27.000000000 +0100
-+++ ./game/enchant.c 2007-12-24 17:35:27.000000000 +0100
-@@ -525,7 +525,7 @@ void tilt_characters_to_terrain()
- cnt = 0;
- while (cnt < MAXCHR)
- {
-- if (chrstickybutt[cnt] && chron[cnt])
-+ if (chrstickybutt[cnt] && chron[cnt] && chronwhichfan[cnt] != OFFEDGE)
- {
- twist = meshtwist[chronwhichfan[cnt]];
- chrturnmaplr[cnt] = maplrtwist[twist];
---- ./game/game.c~ 2007-12-24 22:17:30.000000000 +0100
-+++ ./game/game.c 2007-12-24 22:17:30.000000000 +0100
-@@ -2255,6 +2255,21 @@ void fix_md2_normals(Uint16 modelindex)
- }
- }
-
-+#if SDL_BYTEORDER != SDL_LIL_ENDIAN
-+float LoadFloatByteswapped( float *ptr )
-+{
-+ union {
-+ float f;
-+ int i;
-+ } u;
-+
-+ u.f = *ptr;
-+ u.i = SDL_Swap32(u.i);
-+
-+ return u.f;
-+}
-+#endif
-+
- //---------------------------------------------------------------------------------------------
- void rip_md2_commands(Uint16 modelindex)
- {
Index: egoboo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/devel/egoboo.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- egoboo.spec 12 Dec 2009 03:26:11 -0000 1.12
+++ egoboo.spec 15 Feb 2010 21:54:11 -0000 1.13
@@ -1,12 +1,11 @@
Name: egoboo
Version: 2.7.5
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A top down graphical (3D) RPG in the spirit of Nethack
Group: Amusements/Games
License: GPLv3
-URL: http://home.no.net/egoboo/
-# this is http://home.no.net/egoboo/egosrc243.rar repackaged in tar.gz
-Source0: %{name}-%{version}.tar.gz
+URL: http://egoboo.sourceforge.net/
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Source2: KNOWN-BUGS.txt
Patch0: %{name}-2.7.5-unix.patch
@@ -26,7 +25,7 @@ dimension.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
cp -a %{SOURCE2} .
sed -i 's/\r//g' game/change.log game/Egoboodoc.txt
@@ -37,7 +36,7 @@ iconv -f ISO-8859-1 -t UTF8 game/change.
# We override ENET_OBJ and LDFLAGS to use the system enet
make -C game -f Makefile.unix ENET_OBJ= \
CFLAGS="$RPM_OPT_FLAGS `sdl-config --cflags` -DENET11" \
- LDFLAGS="`sdl-config --libs` -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lenet"
+ LDFLAGS="`sdl-config --libs` -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lenet -lm"
%install
@@ -66,6 +65,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Feb 15 2010 Hans de Goede <hdegoede at redhat.com> 2.7.5-9
+- Switch to upstream unix tarbal release, which includes our unix patches
+- Update URL to point to new upstream site (#559588)
+- Fix FTBFS (#564797)
+
* Sat Dec 12 2009 Rakesh Pandit <rakesh at fedoraproject.org> - 2.7.5-8
- Updated to consume new libenet
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/egoboo/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 24 Dec 2007 20:47:03 -0000 1.4
+++ sources 15 Feb 2010 21:54:11 -0000 1.5
@@ -1 +1 @@
-3eb90e21b39f32437db7e5801b8ed6ad egoboo-2.7.5.tar.gz
+570f70ce29b3b91f0b59503e84c0142e egoboo-2.7.5.tar.gz
More information about the scm-commits
mailing list