Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-rpg/freedroidrpg/files: freedroidrpg-0.13-syslibs.patch
Date: Mon, 25 Jan 2010 17:50:42
Message-Id: E1NZT3D-0001bj-Ht@stork.gentoo.org
1 mr_bones_ 10/01/25 17:48:35
2
3 Added: freedroidrpg-0.13-syslibs.patch
4 Log:
5 version bump
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch?rev=1.1&content-type=text/plain
13
14 Index: freedroidrpg-0.13-syslibs.patch
15 ===================================================================
16 diff -ru freedroidrpg-0.13.orig/configure.ac freedroidrpg-0.13/configure.ac
17 --- freedroidrpg-0.13.orig/configure.ac 2010-01-21 07:56:26.000000000 -0500
18 +++ freedroidrpg-0.13/configure.ac 2010-01-25 11:32:51.795551904 -0500
19 @@ -109,6 +109,14 @@
20 AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
21 see http://www.libsdl.org/]))
22
23 +AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
24 + AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
25 +see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
26 +
27 +AC_CHECK_LIB([lua], [luaL_openlibs],,
28 + AC_MSG_ERROR([lua library needed to run FreedroidRPG
29 +see http://www.lua.org/]))
30 +
31 AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
32 AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
33 --------------------------------------------------
34 diff -ru freedroidrpg-0.13.orig/src/Makefile.am freedroidrpg-0.13/src/Makefile.am
35 --- freedroidrpg-0.13.orig/src/Makefile.am 2010-01-21 07:31:29.000000000 -0500
36 +++ freedroidrpg-0.13/src/Makefile.am 2010-01-25 11:34:48.618487853 -0500
37 @@ -1,9 +1,7 @@
38 ## Process this file with automake to produce Makefile.in
39
40 -freedroidRPG_LDADD = ../lua/liblua.a
41 -
42 if WIN32
43 -freedroidRPG_LDADD += ../win32/freedroidRPG.coff
44 +freedroidRPG_LDADD = ../win32/freedroidRPG.coff
45 endif
46
47 bin_PROGRAMS = freedroidRPG
48 @@ -18,7 +16,7 @@
49 enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
50 defs.h map.h vars.h takeover.h global.h \
51 proto.h struct.h system.h BFont.h \
52 - SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \
53 + open_gl.c open_gl_atlas.c mission.c chat.c light.c \
54 getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
55 lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \
56 benchmark.c \
57 @@ -45,12 +43,3 @@
58
59 savestruct.c savestruct.h: struct.h gen_savestruct.py
60 python gen_savestruct.py struct.h savestruct
61 -
62 -clean-local:
63 - cd ../lua; make clean
64 -
65 -../lua/liblua.a:
66 - cd ../lua; make CC=${CC} AR="${AR} rcu" liblua.a
67 -if WIN32
68 - i686-pc-mingw32-ranlib ../lua/liblua.a
69 -endif
70 diff -ru freedroidrpg-0.13.orig/src/lua.c freedroidrpg-0.13/src/lua.c
71 --- freedroidrpg-0.13.orig/src/lua.c 2010-01-21 07:31:29.000000000 -0500
72 +++ freedroidrpg-0.13/src/lua.c 2010-01-25 11:33:27.344703642 -0500
73 @@ -37,9 +37,9 @@
74 #include "lvledit/lvledit_actions.h"
75 #include "lvledit/lvledit_map.h"
76
77 -#include "../lua/lua.h"
78 -#include "../lua/lauxlib.h"
79 -#include "../lua/lualib.h"
80 +#include <lua.h>
81 +#include <lauxlib.h>
82 +#include <lualib.h>
83
84 /* Our Lua state for event execution */
85 lua_State *global_lua_state;
86 diff -ru freedroidrpg-0.13.orig/src/struct.h freedroidrpg-0.13/src/struct.h
87 --- freedroidrpg-0.13.orig/src/struct.h 2010-01-21 07:31:29.000000000 -0500
88 +++ freedroidrpg-0.13/src/struct.h 2010-01-25 11:35:34.764604580 -0500
89 @@ -30,16 +30,7 @@
90 #include "system.h"
91 #include "defs.h"
92
93 -typedef struct tColorRGBA {
94 - Uint8 r;
95 - Uint8 g;
96 - Uint8 b;
97 - Uint8 a;
98 -} tColorRGBA, myColor;
99 -
100 -typedef struct tColorY {
101 - Uint8 y;
102 -} tColorY;
103 +typedef tColorRGBA myColor;
104
105 /**
106 * Simple doubly linked list implementation.
107 diff -ru freedroidrpg-0.13.orig/src/system.h freedroidrpg-0.13/src/system.h
108 --- freedroidrpg-0.13.orig/src/system.h 2010-01-21 07:31:29.000000000 -0500
109 +++ freedroidrpg-0.13/src/system.h 2010-01-25 11:35:53.944486530 -0500
110 @@ -111,6 +111,7 @@
111
112 #include "SDL.h"
113 #include "SDL_image.h"
114 +#include "SDL_rotozoom.h"
115
116 #ifdef HAVE_LIBSDL_MIXER
117 #include "SDL_mixer.h"