frogatto: Version bump, modifed makefile patch, added libpng patch.
authorPiotr Szymaniak <szarpaj@grubelek.pl>
Sun, 4 Dec 2011 22:34:46 +0000 (23:34 +0100)
committerPiotr Szymaniak <szarpaj@grubelek.pl>
Sun, 4 Dec 2011 22:34:46 +0000 (23:34 +0100)
games-arcade/frogatto/Manifest
games-arcade/frogatto/files/frogatto-1.1.1-gentoo.patch [new file with mode: 0644]
games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch [new file with mode: 0644]
games-arcade/frogatto/frogatto-1.1.1.ebuild [moved from games-arcade/frogatto/frogatto-1.0.3.ebuild with 93% similarity]

index 291d446..3c4e5c2 100644 (file)
@@ -1,8 +1,10 @@
 AUX frogatto-1.0-gentoo.patch 4245 RMD160 52e0a5ca3bdbdf02a5cd61034d2c8efc05a2be02 SHA1 2d774ff314c7cb7d9d2ebfa4490341317dd370ab SHA256 9d028aedbfc12c0fabf57008a3c8429b52b318c5be71f35d50bc4c05a02f281d
+AUX frogatto-1.1.1-gentoo.patch 6123 RMD160 edd5371f6069802221db115c58354d9e7d04494d SHA1 43eddd4341a6a0937a03da6e34c0af2a8a7d93ab SHA256 f481535acdd3d27068bb4dbd2b06c8aed6d340365a460e23b081cd2689011ed9
+AUX frogatto-1.1.1-libpng.patch 611 RMD160 b96f0b459a2c7450933560a8fc643d5866e5c552 SHA1 d1916bb50b9f757c0607f18db4f08b729c02e68a SHA256 38f8c9701b3fa2b94d5bfa817b7986265de8d863638526fb1814259577f62419
 DIST frogatto-1.0.2.tar.bz2 100857913 RMD160 12db2beb53c2230be2cc847639045ffa2a44e030 SHA1 dc39e129d648bab4649dc30f4de45360d8095d07 SHA256 4985f38fc07ac9e184539c222da9b85741b3ddf7f28b41b54b790c8c186526c2
-DIST frogatto-1.0.3.tar.bz2 100909023 RMD160 5e99afd76349af22cabc12b2cce0bdf13c121be5 SHA1 376371c1d16307b3ec753edc7eef4c6d06bbcb7f SHA256 0f21012fa8c8980de7c030c7de6302671d0fa1036f0fba11cbcfebaa3ceaa269
 DIST frogatto-1.0.tar.bz2 136213969 RMD160 7e4443d99f7fa8f5328ef07b01c4167874189dd7 SHA1 e277bf4ffb49dce7c9c25a242f0b9c5073f5fa3b SHA256 7a3dab049df8d4cd38a4fa0ab98ea001d5bae1d373d134fbd4e773132fb68c59
+DIST frogatto-1.1.1.tar.bz2 151088361 RMD160 de54cf496e7b7a61614d0044e978ed5a7d6d6692 SHA1 bc5576b96863562a0520453b5adb3f6f6be769c9 SHA256 d2404d8d83d5d5e2b42b25f632113d5fbfc22d2ef72c4a44ec7833257e550670
 EBUILD frogatto-1.0.2.ebuild 1706 RMD160 4abbdce64885d3c2aff390cc4607dcdcdcd2b252 SHA1 93743f2a18cbac90d4b355eaa6fb142fb3755bd5 SHA256 b4bd0036aceb439569654563bc7cfdc028f96a18be594a24f19951d152fc2b7b
-EBUILD frogatto-1.0.3.ebuild 1706 RMD160 4abbdce64885d3c2aff390cc4607dcdcdcd2b252 SHA1 93743f2a18cbac90d4b355eaa6fb142fb3755bd5 SHA256 b4bd0036aceb439569654563bc7cfdc028f96a18be594a24f19951d152fc2b7b
 EBUILD frogatto-1.0.ebuild 1722 RMD160 6a335605dade4c45fc5c8cea31cace6393a5dd01 SHA1 537dbdb849c574754a62cc935c4674595269b72f SHA256 aa9b065b76d9bd63137f2b6ac2225c048aaffc4b72531d008ef5b790226703b3
+EBUILD frogatto-1.1.1.ebuild 1729 RMD160 ee596170dfe03c6b3a3c25eeced6fac788b4a23b SHA1 3b095ea4659498f7b7abb209297fbd04de96209a SHA256 2549056199355c35d333c57193a076d4faefac662616b0c0001bf4348e7ebb54
 MISC metadata.xml 161 RMD160 734c72757bdba2e93d5c7cfa946fd9eb69e01681 SHA1 e721608e30cdca8dd809c1024687fe4887c49293 SHA256 5102a957a119374da719ca711f473e89fd4183d4e91e86f59e2fc4dce7e607dc
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 (file)
index 0000000..fb55998
--- /dev/null
@@ -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 level_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 (file)
index 0000000..2cf30c0
--- /dev/null
@@ -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");
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 (file)
@@ -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() {