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.14.1-syslibs.patch
Date: Sun, 28 Nov 2010 09:56:39
Message-Id: 20101128095619.D70DC20054@flycatcher.gentoo.org
1 mr_bones_ 10/11/28 09:56:19
2
3 Added: freedroidrpg-0.14.1-syslibs.patch
4 Log:
5 version bump (bug #346945)
6
7 (Portage version: 2.1.9.24/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch?rev=1.1&content-type=text/plain
14
15 Index: freedroidrpg-0.14.1-syslibs.patch
16 ===================================================================
17 diff -ru freedroidrpg-0.14.1.orig/configure.ac freedroidrpg-0.14.1/configure.ac
18 --- freedroidrpg-0.14.1.orig/configure.ac 2010-11-26 17:47:26.000000000 -0500
19 +++ freedroidrpg-0.14.1/configure.ac 2010-11-28 04:40:12.524987716 -0500
20 @@ -110,6 +110,14 @@
21 AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
22 see http://www.libsdl.org/]))
23
24 +AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
25 + AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
26 +see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
27 +
28 +AC_CHECK_LIB([lua], [luaL_openlibs],,
29 + AC_MSG_ERROR([lua library needed to run FreedroidRPG
30 +see http://www.lua.org/]))
31 +
32 AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
33 AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
34 --------------------------------------------------
35 diff -ru freedroidrpg-0.14.1.orig/src/Makefile.am freedroidrpg-0.14.1/src/Makefile.am
36 --- freedroidrpg-0.14.1.orig/src/Makefile.am 2010-11-26 17:41:13.000000000 -0500
37 +++ freedroidrpg-0.14.1/src/Makefile.am 2010-11-28 04:40:12.524987716 -0500
38 @@ -1,9 +1,7 @@
39 ## Process this file with automake to produce Makefile.in
40
41 -freedroidRPG_LDADD = ../lua/liblua.a
42 -
43 if WIN32
44 -freedroidRPG_LDADD += ../win32/freedroidRPG.coff
45 +freedroidRPG_LDADD = ../win32/freedroidRPG.coff
46 endif
47
48 bin_PROGRAMS = freedroidRPG
49 @@ -22,7 +20,7 @@
50 enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
51 defs.h map.h vars.h takeover.h global.h \
52 proto.h struct.h system.h BFont.h \
53 - SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \
54 + open_gl.c open_gl_atlas.c mission.c chat.c light.c \
55 getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
56 lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \
57 benchmark.c \
58 @@ -56,8 +54,3 @@
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" RANLIB="${RANLIB}" liblua.a
67 diff -ru freedroidrpg-0.14.1.orig/src/lua.c freedroidrpg-0.14.1/src/lua.c
68 --- freedroidrpg-0.14.1.orig/src/lua.c 2010-11-26 17:41:13.000000000 -0500
69 +++ freedroidrpg-0.14.1/src/lua.c 2010-11-28 04:40:12.525987480 -0500
70 @@ -37,9 +37,9 @@
71 #include "lvledit/lvledit_actions.h"
72 #include "lvledit/lvledit_map.h"
73
74 -#include "../lua/lua.h"
75 -#include "../lua/lauxlib.h"
76 -#include "../lua/lualib.h"
77 +#include <lua.h>
78 +#include <lauxlib.h>
79 +#include <lualib.h>
80
81 /* Our Lua state for event execution */
82 lua_State *global_lua_state;
83 diff -ru freedroidrpg-0.14.1.orig/src/luaconfig.c freedroidrpg-0.14.1/src/luaconfig.c
84 --- freedroidrpg-0.14.1.orig/src/luaconfig.c 2010-11-26 17:41:13.000000000 -0500
85 +++ freedroidrpg-0.14.1/src/luaconfig.c 2010-11-28 04:40:32.263348025 -0500
86 @@ -33,8 +33,8 @@
87 #include "global.h"
88 #include "proto.h"
89
90 -#include "../lua/lua.h"
91 -#include "../lua/lauxlib.h"
92 +#include <lua.h>
93 +#include <lauxlib.h>
94
95 /* Our Lua state for event execution (defined in lua.c) */
96 extern lua_State *global_lua_state;
97 diff -ru freedroidrpg-0.14.1.orig/src/system.h freedroidrpg-0.14.1/src/system.h
98 --- freedroidrpg-0.14.1.orig/src/system.h 2010-11-26 17:41:13.000000000 -0500
99 +++ freedroidrpg-0.14.1/src/system.h 2010-11-28 04:40:12.525987480 -0500
100 @@ -111,6 +111,7 @@
101
102 #include "SDL.h"
103 #include "SDL_image.h"
104 +#include "SDL_rotozoom.h"
105
106 #ifdef HAVE_LIBSDL_MIXER
107 #include "SDL_mixer.h"