reinit the tree, so we can have metadata

3 files changed, 208 insertions, 0 deletions

diff --git a/games-strategy/ja2-stracciatella/files/ja2-convert.sh b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
new file mode 100644
index 000000000000..4f337ca75351
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Convert names of data-files to lower-case
+
+# location of the data-files
+GAMES_DATADIR=@GAMES_DATADIR@
+
+cd "${GAMES_DATADIR}" || exit 1
+
+# convert to lowercase
+find . -exec sh -c 'echo "${1}"
+lower="`echo "${1}" | tr [:upper:] [:lower:]`"
+[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
+[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
+
+# remove leftover
+rm -r ./TILECACHE ./STSOUNDS
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
new file mode 100644
index 000000000000..2661b19d6c77
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/600082
+
+--- a/Build/Laptop/BobbyRGuns.cc
++++ b/Build/Laptop/BobbyRGuns.cc
+@@ -700,7 +700,7 @@
+ 	//center picture in frame
+ 	ETRLEObject const& pTrav   = uiImage->SubregionProperties(0);
+ 	UINT32      const  usWidth = pTrav.usWidth;
+-	INT16       const  sCenX   = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
++	INT16       const  sCenX   = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
+ 	INT16       const  sCenY   = PosY + 8;
+ 
+ 	//blt the shadow of the item
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
new file mode 100644
index 000000000000..0475773bd361
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
@@ -0,0 +1,179 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue May  8 19:16:08 UTC 2012
+Subject: build system
+
+--- Makefile
++++ Makefile
+@@ -16,106 +16,94 @@
+ MANPREFIX ?= $(PREFIX)
+ 
+ INSTALL         ?= install
+-INSTALL_PROGRAM ?= $(INSTALL) -m 555 -s
+-INSTALL_MAN     ?= $(INSTALL) -m 444
+-INSTALL_DATA    ?= $(INSTALL) -m 444
++INSTALL_PROGRAM ?= $(INSTALL) -m 755
++INSTALL_MAN     ?= $(INSTALL) -m 644
++INSTALL_DATA    ?= $(INSTALL) -m 644
+ 
++# compiler CFLAGS
++CFLAGS += -std=gnu99
+ 
++# sdl-flags
+ SDL_CONFIG  ?= sdl-config
+ ifndef CFLAGS_SDL
+ CFLAGS_SDL  := $(shell $(SDL_CONFIG) --cflags)
+ endif
+ ifndef LDFLAGS_SDL
+-LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs)
++LIBS_SDL := $(shell $(SDL_CONFIG) --libs)
+ endif
+ 
++# LIBS
++LIBS += $(LIBS_SDL)
++LIBS += -lm
++
++ifdef WITH_ZLIB
++LIBS += -lz
++endif
+ 
+-CFLAGS += $(CFLAGS_SDL)
+-CFLAGS += -I Build
+-CFLAGS += -I Build/Tactical
+-CFLAGS += -I Build/Strategic
+-CFLAGS += -I Build/Editor
+-CFLAGS += -I Build/Res
+-CFLAGS += -I Build/Laptop
+-CFLAGS += -I Build/Utils
+-CFLAGS += -I Build/TileEngine
+-CFLAGS += -I Build/TacticalAI
+-CFLAGS += -I sgp
+-
+-#CFLAGS += -Wall
+-#CFLAGS += -W
+-CFLAGS += -Wpointer-arith
+-CFLAGS += -Wreturn-type
+-CFLAGS += -Wunused-label
+-CFLAGS += -Wunused-variable
+-CFLAGS += -Wwrite-strings
+ 
+-CFLAGS += -DJA2
++# preprocessor flags
++CPPFLAGS += $(CFLAGS_SDL)
++CPPFLAGS += -I Build
++CPPFLAGS += -I Build/Tactical
++CPPFLAGS += -I Build/Strategic
++CPPFLAGS += -I Build/Editor
++CPPFLAGS += -I Build/Res
++CPPFLAGS += -I Build/Laptop
++CPPFLAGS += -I Build/Utils
++CPPFLAGS += -I Build/TileEngine
++CPPFLAGS += -I Build/TacticalAI
++CPPFLAGS += -I sgp
+ 
++CPPFLAGS += -DJA2
+ 
+ ifdef WITH_DEMO
+-  CFLAGS += -DJA2DEMO
++  CPPFLAGS += -DJA2DEMO
+ endif
+ 
+ ifdef WITH_DEMO_ADS
+   ifndef WITH_DEMO
+     $(error WITH_DEMO_ADS needs WITH_DEMO)
+   endif
+-  CFLAGS += -DJA2DEMOADS
++  CPPFLAGS += -DJA2DEMOADS
+ endif
+ 
+ ifdef WITH_FIXMES
+-  CFLAGS += -DWITH_FIXMES
++  CPPFLAGS += -DWITH_FIXMES
+ endif
+ 
+ ifdef WITH_MAEMO
+-  CFLAGS += -DWITH_MAEMO
++  CPPFLAGS += -DWITH_MAEMO
+ endif
+ 
+ ifdef WITH_SOUND_DEBUG
+-  CFLAGS += -DWITH_SOUND_DEBUG
++  CPPFLAGS += -DWITH_SOUND_DEBUG
+ endif
+ 
+ ifdef _DEBUG
+-  CFLAGS += -D_DEBUG
++  CPPFLAGS += -D_DEBUG
+   ifndef JA2TESTVERSION
+     JA2TESTVERSION := yes
+   endif
+ endif
+ 
+ ifdef JA2TESTVERSION
+-  CFLAGS += -DJA2TESTVERSION
++  CPPFLAGS += -DJA2TESTVERSION
+   ifndef JA2BETAVERSION
+   	JA2BETAVERSION := yes
+   endif
+ endif
+ 
+ ifdef JA2BETAVERSION
+-CFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
++CPPFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
+ endif
+ 
+ ifdef JA2EDITOR
+-CFLAGS += -DJA2EDITOR
++CPPFLAGS += -DJA2EDITOR
+ endif
+ 
+-CFLAGS += -D$(LNG)
+-
+-CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
+-
+-CCFLAGS += $(CFLAGS)
+-CCFLAGS += -std=gnu99
+-CCFLAGS += -Werror-implicit-function-declaration
+-CCFLAGS += -Wimplicit-int
+-CCFLAGS += -Wmissing-prototypes
++CPPFLAGS += -D$(LNG)
++CPPFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
+ 
+-CXXFLAGS += $(CFLAGS)
+-
+-LDFLAGS += $(LDFLAGS_SDL)
+-LDFLAGS += -lm
+-
+-ifdef WITH_ZLIB
+-LDFLAGS += -lz
+-endif
+ 
+ SRCS :=
+ SRCS += Build/AniViewScreen.cc
+@@ -468,7 +456,7 @@
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .d .o
+ 
+-Q ?= @
++Q = 
+ 
+ all: $(BINARY)
+ 
+@@ -476,15 +464,15 @@
+ 
+ $(BINARY): $(OBJS)
+ 	@echo '===> LD $@'
+-	$(Q)$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@
++	$(Q)$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $@ $(LIBS)
+ 
+ .c.o:
+ 	@echo '===> CC $<'
+-	$(Q)$(CC) $(CCFLAGS) -c -MMD -o $@ $<
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
+ 
+ .cc.o:
+ 	@echo '===> CXX $<'
+-	$(Q)$(CXX) $(CXXFLAGS) -c -MMD -o $@ $<
++	$(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
+ 
+ clean distclean:
+ 	@echo '===> CLEAN'