packages: stone_soup/stone_soup-cflags.patch, stone_soup/stone_soup-makefil...

lisu lisu at pld-linux.org
Fri Aug 14 10:21:46 CEST 2009 

Author: lisu                         Date: Fri Aug 14 08:21:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for tiles version

---- Files affected:
packages/stone_soup:
   stone_soup-cflags.patch (1.1 -> 1.2) , stone_soup-makefile.patch (1.3 -> 1.4) , stone_soup-systemlua.patch (1.3 -> 1.4) , stone_soup-systemsqlite3.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/stone_soup/stone_soup-cflags.patch
diff -u packages/stone_soup/stone_soup-cflags.patch:1.1 packages/stone_soup/stone_soup-cflags.patch:1.2
--- packages/stone_soup/stone_soup-cflags.patch:1.1	Wed Aug 12 15:46:16 2009
+++ packages/stone_soup/stone_soup-cflags.patch	Fri Aug 14 10:21:41 2009
@@ -46,3 +46,56 @@
  
  #############################################################################
  # Build Lua
+--- stone_soup-0.5.1-src/source/makefile_tiles.unix~	2009-08-13 16:54:03.000000000 +0200
++++ stone_soup-0.5.1-src/source/makefile_tiles.unix	2009-08-13 16:56:59.000000000 +0200
+@@ -112,7 +112,7 @@
+ ifneq ($(HURRY),y)
+ ifneq ($(DEBUG_CRAWL),y)
+ CFWARN += -Wuninitialized
+-CFOTHERS += -O2
++CFOTHERS +=
+ endif
+ endif
+ 
+@@ -167,7 +167,7 @@
+ 	rm -f $(DEPENDENCY_MKF).tmp
+ 	@for i in $^; do \
+ 	    echo "Updating dependencies for $$i"; \
+-	    $(CXX) -MM $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
++	    $(CXX) -MM $(OPTFLAGS) $(CFLAGS) $$i >>$(DEPENDENCY_MKF).tmp 2>/dev/null; \
+ 	done
+ 	mv -f $(DEPENDENCY_MKF).tmp $(DEPENDENCY_MKF)
+ 
+@@ -280,27 +280,27 @@
+ 	$(DELETE) $(DEPENDENCY_MKF)
+ 
+ $(GAME): $(GAME_DEPENDS)
+-	${CXX} ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} ${LDFLAGS} $(OPTFLAGS) $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+ 
+ .PHONY : debug
+ 
+ debug: $(GAME)
+ 
+ profile: $(GAME_DEPENDS)
+-	${CXX} -g -p ${LDFLAGS} $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
++	${CXX} -g -p ${LDFLAGS} $(OPTFLAGS) $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
+ 
+ %.o: %.cc $(TILEDEFHDRS)
+-	${CXX} ${CFLAGS} -c $< -o $@
++	${CXX} $(OPTFLAGS) ${CFLAGS} -c $< -o $@
+ 
+ # STL is bad in debug.  Always compile this file with optimizations.
+ tilebuf.o: tilebuf.cc $(TILEDEFHDRS)
+-	${CXX} ${CFLAGS} -O2 -c $< -o $@
++	${CXX} $(OPTFLAGS) ${CFLAGS} -O2 -c $< -o $@
+ 
+ # [ds] Note we don't use the standard CFLAGS here; that's intentional, most
+ # flex/bison combos I've tried don't produce code that passes the warnings
+ # test.
+ $(UTIL)%.o: $(UTIL)%.cc $(TILEDEFHDRS)
+-	$(CXX) $(YCFLAGS) -o $@ -c $<
++	$(CXX) $(OPTFLAGS) $(YCFLAGS) -o $@ -c $<
+ 
+ #############################################################################
+ # Build Lua

================================================================
Index: packages/stone_soup/stone_soup-makefile.patch
diff -u packages/stone_soup/stone_soup-makefile.patch:1.3 packages/stone_soup/stone_soup-makefile.patch:1.4
--- packages/stone_soup/stone_soup-makefile.patch:1.3	Thu Aug 13 14:20:24 2009
+++ packages/stone_soup/stone_soup-makefile.patch	Fri Aug 14 10:21:41 2009
@@ -13,8 +13,8 @@
  
 -# SAVEDIR := /usr/games/crawl/saves/
 -# DATADIR := /usr/games/crawl/data/
-+SAVEDIR := /var/games/stone_soup
-+DATADIR := /usr/share/stone_soup
++SAVEDIR := /var/games/stone_soup/
++DATADIR := /usr/share/stone_soup/
  
  LEX  := flex
  YACC := bison -y
@@ -55,6 +55,75 @@
 +	$(COPY) dat/database/*.txt $(DESTDIR)$(DATADIR)/dat/database
 +	mkdir -p $(DESTDIR)$(DATADIR)/settings
 +	$(COPY) ../settings/* $(DESTDIR)$(DATADIR)/settings/
+ ifneq ($(SAVEDIR),)
+-	mkdir -p $(SAVEDIR)
+-	chown $(INSTALL_UGRP) $(SAVEDIR)
+-	chmod $(MCHMOD_SAVEDIR) $(SAVEDIR)
++	mkdir -p $(DESTDIR)$(SAVEDIR)
+ endif
+ 
+ clean:
+--- stone_soup-0.5.1-src/source/makefile_tiles.unix~	2009-08-13 16:45:55.000000000 +0200
++++ stone_soup-0.5.1-src/source/makefile_tiles.unix	2009-08-13 16:51:10.000000000 +0200
+@@ -56,14 +56,14 @@
+ # The user:group to install the game as.
+ INSTALL_UGRP := games:games
+ 
+-INSTALLDIR   := /usr/games/crawl
++INSTALLDIR   := /usr/bin
+ 
+ # If you're installing Crawl for multiple users, you *must* set this to a
+ # valid path before building Crawl. This is not necessary if you are building
+ # Crawl for a single user.
+ 
+-# SAVEDIR := /usr/games/crawl/saves/
+-# DATADIR := /usr/games/crawl/data/
++SAVEDIR := /var/games/stone_soup/
++DATADIR := /usr/share/stone_soup/
+ 
+ LEX  := flex
+ YACC := bison -y
+@@ -235,31 +235,24 @@
+ ifeq ($(DATADIR),)
+ 	$(error DATADIR not set! Set DATADIR and run make clean install again)
+ endif
+-	[ -d $(INSTALLDIR) ] || mkdir -p $(INSTALLDIR)
+-	$(COPY) $(GAME) $(INSTALLDIR)
+-	chown $(INSTALL_UGRP) $(INSTALLDIR)/$(GAME)
+-	chmod ${MCHMOD} ${INSTALLDIR}/$(GAME)
+-	mkdir -p $(DATADIR)/dat
+-	mkdir -p $(DATADIR)/dat/lua
+-	mkdir -p $(DATADIR)/dat/clua
+-	mkdir -p $(DATADIR)/dat/descript
+-	mkdir -p $(DATADIR)/dat/database
+-	$(COPY) dat/*.des $(DATADIR)/dat
+-	$(COPY) dat/lua/*.lua $(DATADIR)/dat/lua
+-	$(COPY) dat/clua/*.lua $(DATADIR)/dat/clua
+-	$(COPY) dat/descript/*.txt $(DATADIR)/dat/descript
+-	$(COPY) dat/database/*.txt $(DATADIR)/dat/database
+-	mkdir -p $(DATADIR)/settings
+-	$(COPY) ../settings/* $(DATADIR)/settings/
+-	mkdir -p $(DATADIR)/docs
+-	$(COPY) ../docs/*.txt $(DATADIR)/docs
+-	mkdir -p $(DATADIR)/dat/tiles
+-	$(COPY) dat/tiles/* $(DATADIR)/dat/tiles
+-	chown -R $(INSTALL_UGRP) $(DATADIR)
++	[ -d $(DESTDIR)$(INSTALLDIR) ] || mkdir -p $(DESTDIR)$(INSTALLDIR)
++	$(COPY) $(GAME) $(DESTDIR)$(INSTALLDIR)/stone_soup
++	mkdir -p $(DESTDIR)$(DATADIR)/dat
++	mkdir -p $(DESTDIR)$(DATADIR)/dat/lua
++	mkdir -p $(DESTDIR)$(DATADIR)/dat/clua
++	mkdir -p $(DESTDIR)$(DATADIR)/dat/descript
++	mkdir -p $(DESTDIR)$(DATADIR)/dat/database
++	$(COPY) dat/*.des $(DESTDIR)$(DATADIR)/dat
++	$(COPY) dat/lua/*.lua $(DESTDIR)$(DATADIR)/dat/lua
++	$(COPY) dat/clua/*.lua $(DESTDIR)$(DATADIR)/dat/clua
++	$(COPY) dat/descript/*.txt $(DESTDIR)$(DATADIR)/dat/descript
++	$(COPY) dat/database/*.txt $(DESTDIR)$(DATADIR)/dat/database
++	mkdir -p $(DESTDIR)$(DATADIR)/settings
++	$(COPY) ../settings/* $(DESTDIR)$(DATADIR)/settings/
++	mkdir -p $(DESTDIR)$(DATADIR)/dat/tiles
++	$(COPY) dat/tiles/* $(DESTDIR)$(DATADIR)/dat/tiles
  ifneq ($(SAVEDIR),)
 -	mkdir -p $(SAVEDIR)
 -	chown $(INSTALL_UGRP) $(SAVEDIR)

================================================================
Index: packages/stone_soup/stone_soup-systemlua.patch
diff -u packages/stone_soup/stone_soup-systemlua.patch:1.3 packages/stone_soup/stone_soup-systemlua.patch:1.4
--- packages/stone_soup/stone_soup-systemlua.patch:1.3	Wed Aug 12 16:09:49 2009
+++ packages/stone_soup/stone_soup-systemlua.patch	Fri Aug 14 10:21:41 2009
@@ -42,3 +42,47 @@
  
  #############################################################################
  # 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

================================================================
Index: packages/stone_soup/stone_soup-systemsqlite3.patch
diff -u packages/stone_soup/stone_soup-systemsqlite3.patch:1.1 packages/stone_soup/stone_soup-systemsqlite3.patch:1.2
--- packages/stone_soup/stone_soup-systemsqlite3.patch:1.1	Wed Aug 12 15:46:41 2009
+++ packages/stone_soup/stone_soup-systemsqlite3.patch	Fri Aug 14 10:21:41 2009
@@ -32,3 +32,37 @@
  
  #############################################################################
  # Packaging a source tarball for release
+--- stone_soup-0.5.1-src/source/makefile_tiles.unix~	2009-08-13 16:51:54.000000000 +0200
++++ stone_soup-0.5.1-src/source/makefile_tiles.unix	2009-08-13 16:53:26.000000000 +0200
+@@ -72,14 +72,14 @@
+ LUALIB = lua51
+ LUALIBA = l$(LUALIB).a
+ 
+-SQLSRC   := util/sqlite
++SQLSRC   := /usr/include
+ SQLLIB   := sqlite3
+ SQLLIBA  := lib$(SQLLIB).a
+ FSQLLIBA := $(SQLSRC)/$(SQLLIBA)
+ 
+-LIBDBM         := -L$(SQLSRC) -l$(SQLLIB)
+-EXTRA_INCLUDES += -I$(SQLSRC)
+-EXTRA_DEPENDS  += $(FSQLLIBA)
++LIBDBM         := -l$(SQLLIB)
++EXTRA_INCLUDES +=
++EXTRA_DEPENDS  +=
+ 
+ RLTILES = rltiles
+ 
+@@ -312,9 +312,9 @@
+ #############################################################################
+ # Build SQLite
+ 
+-$(FSQLLIBA):
+-	echo Building SQLite
+-	cd $(SQLSRC) && $(MAKE)
++#$(FSQLLIBA):
++#	echo Building SQLite
++#	cd $(SQLSRC) && $(MAKE)
+ 
+ #############################################################################
+ # Packaging a source tarball for release
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-cflags.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-makefile.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-systemlua.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stone_soup/stone_soup-systemsqlite3.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list