rpms/egoboo/devel egoboo-2.7.5-unix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 egoboo.spec, 1.4, 1.5 sources, 1.3, 1.4 egoboo-2.4.3-unix.patch, 1.2, NONE egoboo-2.4.4-svn-fixes.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Dec 24 20:47:38 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/egoboo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3731
Modified Files:
.cvsignore egoboo.spec sources
Added Files:
egoboo-2.7.5-unix.patch
Removed Files:
egoboo-2.4.3-unix.patch egoboo-2.4.4-svn-fixes.patch
Log Message:
* Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.7.5-1
- New upstream release 2.7.5
egoboo-2.7.5-unix.patch:
--- NEW FILE egoboo-2.7.5-unix.patch ---
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
OPT := -Os
INC := -I. -I../enet/include ${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
--- ./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];
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 29 Oct 2007 20:43:10 -0000 1.3
+++ .cvsignore 24 Dec 2007 20:47:03 -0000 1.4
@@ -1 +1 @@
-egoboo-2.4.4b.tar.gz
+egoboo-2.7.5.tar.gz
Index: egoboo.spec
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/egoboo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- egoboo.spec 29 Oct 2007 20:43:10 -0000 1.4
+++ egoboo.spec 24 Dec 2007 20:47:03 -0000 1.5
@@ -1,5 +1,5 @@
Name: egoboo
-Version: 2.4.4b
+Version: 2.7.5
Release: 1%{?dist}
Summary: A top down graphical (3D) RPG in the spirit of Nethack
Group: Amusements/Games
@@ -9,11 +9,11 @@
Source0: %{name}-%{version}.tar.gz
Source1: %{name}.desktop
Source2: KNOWN-BUGS.txt
-Patch0: %{name}-2.4.3-unix.patch
+Patch0: %{name}-2.7.5-unix.patch
Patch1: %{name}-2.4.3-opengl-wrapper.patch
-Patch2: %{name}-2.4.4-svn-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_mixer-devel SDL_ttf-devel enet-devel desktop-file-utils
+BuildRequires: SDL_mixer-devel SDL_ttf-devel SDL_image-devel enet-devel
+BuildRequires: desktop-file-utils
Requires: %{name}-data = %{version}, opengl-games-utils
%description
@@ -25,10 +25,9 @@
%prep
-%setup -q -n ego244bsrc
-%patch0 -p1
+%setup -q
+%patch0 -p0
%patch1 -p1
-%patch2 -p1
cp -a %{SOURCE2} .
sed -i 's/\r//g' game/change.log game/Egoboodoc.txt
iconv -f ISO-8859-1 -t UTF8 game/change.log > ChangeLog
@@ -36,14 +35,15 @@
%build
# We override ENET_OBJ and LDFLAGS to use the system enet
-make -C game ENET_OBJ= \
+make -C game -f Makefile.unix ENET_OBJ= \
CFLAGS="$RPM_OPT_FLAGS `sdl-config --cflags` -DENET11" \
- LDFLAGS="`sdl-config --libs` -lSDL_ttf -lSDL_mixer -lGL -lGLU -lenet"
+ LDFLAGS="`sdl-config --libs` -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lenet"
%install
rm -rf $RPM_BUILD_ROOT
-make -C game ENET_OBJ= install PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make -C game -f Makefile.unix ENET_OBJ= PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+ install
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -66,6 +66,9 @@
%changelog
+* Sun Dec 23 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.7.5-1
+- New upstream release 2.7.5
+
* Mon Oct 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.4b-1
- New upstream release 2.4.4b
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/egoboo/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 29 Oct 2007 20:43:10 -0000 1.3
+++ sources 24 Dec 2007 20:47:03 -0000 1.4
@@ -1 +1 @@
-98f315f4c76ad56a2075e00938c21fe8 egoboo-2.4.4b.tar.gz
+3eb90e21b39f32437db7e5801b8ed6ad egoboo-2.7.5.tar.gz
--- egoboo-2.4.3-unix.patch DELETED ---
--- egoboo-2.4.4-svn-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list