Author: lisu Date: Fri Apr 9 11:42:20 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 0.6.0
---- Files affected:
packages/stone_soup:
stone_soup-systemlua.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/stone_soup/stone_soup-systemlua.patch
diff -u packages/stone_soup/stone_soup-systemlua.patch:1.4
packages/stone_soup/stone_soup-systemlua.patch:1.5
--- packages/stone_soup/stone_soup-systemlua.patch:1.4 Fri Aug 14 10:21:41 2009
+++ packages/stone_soup/stone_soup-systemlua.patch Fri Apr 9 13:42:15 2010
@@ -1,88 +1,15 @@
---- stone_soup-0.5.1-src/source/makefile.unix~ 2009-08-12 15:50:27.000000000
+0200
-+++ stone_soup-0.5.1-src/source/makefile.unix 2009-08-12 15:50:06.000000000
+0200
-@@ -53,8 +53,8 @@
- LEX := flex
- YACC := bison -y
-
--LUASRC := util/lua/src
--LUALIB = lua
-+LUASRC := /usr/include/lua51
-+LUALIB = lua51
- LUALIBA = l$(LUALIB).a
-
- SQLSRC := util/sqlite
-@@ -66,7 +66,7 @@
- EXTRA_INCLUDES += -I$(SQLSRC)
- EXTRA_DEPENDS += $(FSQLLIBA)
-
--LIB = -l$(LIBCURS) -L$(LUASRC) -l$(LUALIB) $(LIBDBM)
-+LIB = -l$(LIBCURS) -l$(LUALIB) $(LIBDBM)
-
- INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
-
-@@ -135,7 +135,7 @@
- DOYACC :=
+--- stone_soup-0.6.0/source/makefile~ 2010-04-09 13:32:53.939477805 +0200
++++ stone_soup-0.6.0/source/makefile 2010-04-09 13:33:39.472831138 +0200
+@@ -387,9 +385,9 @@
endif
--GAME_DEPENDS := $(LUASRC)$(LUALIBA) $(EXTRA_DEPENDS) $(OBJECTS)
-+GAME_DEPENDS := $(EXTRA_DEPENDS) $(OBJECTS)
- SRC_PKG_BASE := stone_soup
- SRC_VERSION := $(shell egrep 'VER_NUM *".*"' version.h | \
- egrep -o '[0-9]\.[0-9](\.[0-9])?')
-@@ -278,9 +278,9 @@
- #############################################################################
- # Build Lua
-
--$(LUASRC)$(LUALIBA):
-- echo Building Lua...
-- cd $(LUASRC) && $(MAKE) crawl_unix
-+#$(LUASRC)$(LUALIBA):
-+# echo Building Lua...
-+# cd $(LUASRC) && $(MAKE) crawl_unix
-
- #############################################################################
- # Build SQLite
---- stone_soup-0.5.1-src/source/makefile_tiles.unix~ 2009-07-29
01:31:27.000000000 +0200
-+++ stone_soup-0.5.1-src/source/makefile_tiles.unix 2009-08-13
16:42:51.000000000 +0200
-@@ -68,8 +68,8 @@
- LEX := flex
- YACC := bison -y
-
--LUASRC := util/lua/src
--LUALIB = lua
-+LUASRC := /usr/include/lua51
-+LUALIB = lua51
- LUALIBA = l$(LUALIB).a
-
- SQLSRC := util/sqlite
-@@ -101,7 +101,7 @@
-
- EXTRA_DEPENDS += $(DESTTILEFILES)
-
--LIB = -L$(LUASRC) -l$(LUALIB) $(LIBDBM) -lpng $(SDL_LDFLAGS) -lGL -lGLU
-lSDL_image -lfreetype
-+LIB = -l$(LUALIB) $(LIBDBM) -lpng $(SDL_LDFLAGS) -lGL -lGLU -lSDL_image
-lfreetype
-
- INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
$(PNG_INCLUDE) $(FREETYPE_INCLUDE)
-
-@@ -142,7 +142,7 @@
- DOYACC :=
- endif
-
--GAME_DEPENDS := $(LUASRC)$(LUALIBA) $(EXTRA_DEPENDS) $(OBJECTS)
-+GAME_DEPENDS := $(EXTRA_DEPENDS) $(OBJECTS)
- SRC_PKG_BASE := stone_soup
- SRC_VERSION := $(shell egrep 'VER_NUM *".*"' version.h | \
- egrep -o '[0-9]\.[0-9](\.[0-9])?')
-@@ -312,9 +312,9 @@
- #############################################################################
- # Build Lua
-
--$(LUASRC)$(LUALIBA):
-- echo Building Lua...
-- cd $(LUASRC) && $(MAKE) crawl_unix
-+#$(LUASRC)$(LUALIBA):
-+# echo Building Lua...
-+# cd $(LUASRC) && $(MAKE) crawl_unix
-
- #############################################################################
- # Build SQLite
+ ifndef BUILD_LUA
+- ifneq (,$(wildcard /usr/include/lua5.1))
+- INCLUDES_L += -I/usr/include/lua5.1
+- LIBS += -llua5.1
++ ifneq (,$(wildcard /usr/include/lua51))
++ INCLUDES_L += -I/usr/include/lua51
++ LIBS += -llua51
+ else
+ ifneq (,$(wildcard /usr/include/lua.h))
+ LIBS += -llua
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-systemlua.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
