[gentoo-commits] proj/gamerlay:master commit in: games-arcade/frogatto/, games-arcade/frogatto/files/

[gentoo-commits] proj/gamerlay:master commit in: games-arcade/frogatto/, games-arcade/frogatto/files/

[Piotr Szymaniak]

commit:     390f84c0321cb204e1fe565784cc3cf1dd65db60
Author:     Piotr Szymaniak <szarpaj <AT> grubelek <DOT> pl>
AuthorDate: Sun Dec  4 22:34:46 2011 +0000
Commit:     Piotr Szymaniak <lazy_bum <AT> o2 <DOT> pl>
CommitDate: Sun Dec  4 22:34:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=390f84c0

frogatto: Version bump, modifed makefile patch, added libpng patch.

---
 .../frogatto/files/frogatto-1.1.1-gentoo.patch     |   53 ++++++++++++++++++++
 .../frogatto/files/frogatto-1.1.1-libpng.patch     |   21 ++++++++
 ...frogatto-1.0.3.ebuild => frogatto-1.1.1.ebuild} |    4 +-
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/games-arcade/frogatto/files/frogatto-1.1.1-gentoo.patch b/games-arcade/frogatto/files/frogatto-1.1.1-gentoo.patch
new file mode 100644
index 0000000..fb55998
--- /dev/null
+++ b/games-arcade/frogatto/files/frogatto-1.1.1-gentoo.patch
@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 292ce9f..121c3fe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,8 @@
+-CC  = ccache gcc
+-CXX = ccache g++
++CC  = gcc
++CXX = g++
+ 
+-OPT = -O2 -fno-inline-functions
++OPT =
++OPTX =
+ 
+ objects = IMG_savepng.o achievements.o background.o blur.o border_widget.o button.o character_editor_dialog.o checkbox.o current_generator.o decimal.o editor_dialogs.o editor_formula_functions.o editor_layers_dialog.o editor_stats_dialog.o editor_variable_info.o collision_utils.o color_utils.o controls.o controls_dialog.o custom_object.o custom_object_callable.o custom_object_functions.o custom_object_type.o debug_console.o dialog.o draw_number.o draw_scene.o draw_tile.o editor.o editor_level_properties_dialog.o entity.o filesystem.o font.o formula.o formula_callable_definition.o formula_constants.o formula_function.o formula_profiler.o formula_tokenizer.o formula_variable_storage.o frame.o framed_gui_element.o game_registry.o geometry.o globals.o graphical_font.o graphical_font_label.o grid_widget.o group_property_editor_dialog.o gui_formula_functions.o gui_section.o i18n.o image_widget.o input.o inventory.o iphone_controls.o joystick.o key.o key_button.o label.o level.o l
 evel_logic.o level_object.o level_runner.o level_solid_map.o light.o load_level.o main.o message_dialog.o movement_script.o multi_tile_pattern.o multiplayer.o object_events.o options_dialog.o package.o particle_system.o pause_game_dialog.o playable_custom_object.o player_info.o powerup.o preferences.o preprocessor.o preview_tileset_widget.o property_editor_dialog.o random.o raster.o raster_distortion.o rectangle_rotator.o scrollbar_widget.o scrollable_widget.o segment_editor_dialog.o settings_dialog.o slider.o solid_map.o sound.o speech_dialog.o stats.o string_utils.o surface_cache.o surface_formula.o surface_palette.o surface_scaling.o surface.o texture.o texture_frame_buffer.o text_entry_widget.o thread.o tile_map.o tileset_editor_dialog.o tooltip.o translate.o utils.o variant.o water.o water_particle_system.o weather_particle_system.o widget.o wml_formula_adapter.o wml_formula_callable.o wml_modify.o wml_node.o wml_parser.o wml_schema.o wml_utils.o wml_writer.o unit_test.
 o formula_test.o wml_parser_test.o loading_screen.o utility_object_compiler.o utility_object_editor.o
+ 
+@@ -13,28 +14,28 @@ wml_modify_test_objects = filesystem.o string_utils.o wml_node.o wml_parser.o wm
+ wml_schema_test_objects = filesystem.o string_utils.o wml_node.o wml_parser.o wml_utils.o
+ 
+ %.o : src/%.cpp
+-	$(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
++	$(CXX) -DIMPLEMENT_SAVE_PNG $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -c $<
+ 
+ game: $(objects)
+-	$(CXX) -g $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics $(objects) -o game
++	$(CXX) $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=1 -D_REENTRANT -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread $(objects) -o game
+ 
+ server: $(server_objects)
+-	$(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsafe-statics $(server_objects) -o server
++	$(CXX) $(OPT) -L/sw/lib -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt $(server_objects) -o server
+ 
+ poolalloc.o: src/poolalloc.c
+-	$(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wreturn-type -c src/poolalloc.c
++	$(CC) $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -c src/poolalloc.c
+ 
+ malloc.o: src/malloc.c
+-	$(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -DUSE_LOCKS=1 -Wreturn-type -c src/malloc.c
++	$(CC) $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -DUSE_LOCKS=1 -c src/malloc.c
+ 
+ formula_test: $(formula_test_objects)
+-	$(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
++	$(CXX) $(OPTX) -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formula_test_objects) -o test
+ 
+ wml_modify_test: $(wml_modify_test_objects)
+-	$(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
++	$(CXX) $(OPTX) -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modify_test_objects) -o test
+ 
+ wml_schema_test: $(wml_schema_test_objects)
+-	$(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
++	$(CXX) $(OPTX) -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_schema_test_objects) -o test
+ 
+ update-pot:
+ 	utils/make-pot.sh > po/frogatto.pot

diff --git a/games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch b/games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch
new file mode 100644
index 0000000..2cf30c0
--- /dev/null
+++ b/games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch
@@ -0,0 +1,21 @@
+diff --git a/src/IMG_savepng.cpp b/src/IMG_savepng.cpp
+index b46db5e..9640167 100644
+--- a/src/IMG_savepng.cpp
++++ b/src/IMG_savepng.cpp
+@@ -27,6 +27,7 @@
+ 
+ #ifdef IMPLEMENT_SAVE_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ 
+ #include <stdlib.h>
+@@ -135,7 +136,7 @@ int IMG_SavePNG_RW(SDL_RWops *src, SDL_Surface *surf,int compression){
+ 		goto savedone;
+ 	}
+ 	/* setup custom writer functions */
+-	png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
++	png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL);
+ 
+ 	if (setjmp(png_jmpbuf(png_ptr))){
+ 		SDL_SetError("Unknown error writing PNG");

diff --git a/games-arcade/frogatto/frogatto-1.0.3.ebuild b/games-arcade/frogatto/frogatto-1.1.1.ebuild
similarity index 93%
rename from games-arcade/frogatto/frogatto-1.0.3.ebuild
rename to games-arcade/frogatto/frogatto-1.1.1.ebuild
index 9f51ab8..ab20bfe 100644
--- a/games-arcade/frogatto/frogatto-1.0.3.ebuild
+++ b/games-arcade/frogatto/frogatto-1.1.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="media-libs/sdl-image
 	virtual/glu"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-gentoo.patch || die
+	epatch "${FILESDIR}"/${P}-{gentoo,libpng}.patch || die
 	# respect ${GAMES_DATADIR}
 	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:.\/images/:"${GAMES_DATADIR}"/"${PN}"/images/:g"; done
 	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}"/data/:g"; done
@@ -37,7 +37,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake OPT="${CFLAGS}" || die
+	emake OPT="${CFLAGS}" OPTX="${CXXFLAGS}" || die
 }
 
 src_install() {