From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RXKeM-0002Xr-7j for garchives@archives.gentoo.org; Sun, 04 Dec 2011 22:35:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D0B921C08A; Sun, 4 Dec 2011 22:35:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D888F21C08A for ; Sun, 4 Dec 2011 22:35:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18FCE1B400C for ; Sun, 4 Dec 2011 22:35:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5AA5C80042 for ; Sun, 4 Dec 2011 22:35:00 +0000 (UTC) From: "Piotr Szymaniak" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Piotr Szymaniak" Message-ID: <390f84c0321cb204e1fe565784cc3cf1dd65db60.lazy_bum@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-arcade/frogatto/, games-arcade/frogatto/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-arcade/frogatto/files/frogatto-1.1.1-gentoo.patch games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch games-arcade/frogatto/frogatto-1.0.3.ebuild games-arcade/frogatto/frogatto-1.1.1.ebuild X-VCS-Directories: games-arcade/frogatto/ games-arcade/frogatto/files/ X-VCS-Committer: lazy_bum X-VCS-Committer-Name: Piotr Szymaniak X-VCS-Revision: 390f84c0321cb204e1fe565784cc3cf1dd65db60 Date: Sun, 4 Dec 2011 22:35:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4b3e7fb5-8c8a-43c7-86ac-83cc3ff473c7 X-Archives-Hash: 283dda6cc6f7f6fde0bce610f9005a16 commit: 390f84c0321cb204e1fe565784cc3cf1dd65db60 Author: Piotr Szymaniak grubelek pl> AuthorDate: Sun Dec 4 22:34:46 2011 +0000 Commit: Piotr Szymaniak o2 pl> CommitDate: Sun Dec 4 22:34:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D390f84c0 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 =3D> 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/ga= mes-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 =3D ccache gcc +-CXX =3D ccache g++ ++CC =3D gcc ++CXX =3D g++ +=20 +-OPT =3D -O2 -fno-inline-functions ++OPT =3D ++OPTX =3D +=20 + objects =3D IMG_savepng.o achievements.o background.o blur.o border_wid= get.o button.o character_editor_dialog.o checkbox.o current_generator.o d= ecimal.o editor_dialogs.o editor_formula_functions.o editor_layers_dialog= .o editor_stats_dialog.o editor_variable_info.o collision_utils.o color_u= tils.o controls.o controls_dialog.o custom_object.o custom_object_callabl= e.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_propertie= s_dialog.o entity.o filesystem.o font.o formula.o formula_callable_defini= tion.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 g= rid_widget.o group_property_editor_dialog.o gui_formula_functions.o gui_s= ection.o i18n.o image_widget.o input.o inventory.o iphone_controls.o joys= tick.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 loa= d_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 pr= eferences.o preprocessor.o preview_tileset_widget.o property_editor_dialo= g.o random.o raster.o raster_distortion.o rectangle_rotator.o scrollbar_w= idget.o scrollable_widget.o segment_editor_dialog.o settings_dialog.o sli= der.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 t= exture.o texture_frame_buffer.o text_entry_widget.o thread.o tile_map.o t= ileset_editor_dialog.o tooltip.o translate.o utils.o variant.o water.o wa= ter_particle_system.o weather_particle_system.o widget.o wml_formula_adap= ter.o wml_formula_callable.o wml_modify.o wml_node.o wml_parser.o wml_sch= ema.o wml_utils.o wml_writer.o unit_test. o formula_test.o wml_parser_test.o loading_screen.o utility_object_compi= ler.o utility_object_editor.o +=20 +@@ -13,28 +14,28 @@ wml_modify_test_objects =3D filesystem.o string_util= s.o wml_node.o wml_parser.o wm + wml_schema_test_objects =3D filesystem.o string_utils.o wml_node.o wml_= parser.o wml_utils.o +=20 + %.o : src/%.cpp +- $(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-confi= g --cflags` -D_GNU_SOURCE=3D1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-ty= pe -fthreadsafe-statics -c $< ++ $(CXX) -DIMPLEMENT_SAVE_PNG $(OPT) `sdl-config --cflags` -D_GNU_SOURCE= =3D1 -D_REENTRANT -c $< +=20 + game: $(objects) +- $(CXX) -g $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=3D1 -D_REENTRANT -Wno= n-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lS= DL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_rege= x-mt -lboost_system-mt -lpthread -fthreadsafe-statics $(objects) -o game ++ $(CXX) $(OPT) -L. -L/sw/lib -L. -D_GNU_SOURCE=3D1 -D_REENTRANT -L/usr/= lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lS= DL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread $(o= bjects) -o game +=20 + server: $(server_objects) +- $(CXX) -fno-inline-functions -g $(OPT) -L/sw/lib -D_GNU_SOURCE=3D1 -D_= REENTRANT -Wnon-virtual-dtor -Wreturn-type -L/usr/lib `sdl-config --libs`= -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_reg= ex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt -fthreadsa= fe-statics $(server_objects) -o server ++ $(CXX) $(OPT) -L/sw/lib -D_GNU_SOURCE=3D1 -D_REENTRANT -Wnon-virtual-d= tor -Wreturn-type -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lG= LU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -= lboost_thread-mt -lboost_iostreams-mt $(server_objects) -o server +=20 + poolalloc.o: src/poolalloc.c +- $(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOU= RCE=3D1 -D_REENTRANT -Wreturn-type -c src/poolalloc.c ++ $(CC) $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=3D1 -D_REENTRANT -c s= rc/poolalloc.c +=20 + malloc.o: src/malloc.c +- $(CC) -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOU= RCE=3D1 -D_REENTRANT -DUSE_LOCKS=3D1 -Wreturn-type -c src/malloc.c ++ $(CC) $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=3D1 -D_REENTRANT -DUS= E_LOCKS=3D1 -c src/malloc.c +=20 + formula_test: $(formula_test_objects) +- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=3D1 -D_REENTRANT -DUNIT= _TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lSDL -lGL -lGL= U -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex src/formula.cpp $(formu= la_test_objects) -o test ++ $(CXX) $(OPTX) -I/usr/include/SDL -D_GNU_SOURCE=3D1 -D_REENTRANT -DUNI= T_TEST_FORMULA -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mi= xer -lboost_regex src/formula.cpp $(formula_test_objects) -o test +=20 + wml_modify_test: $(wml_modify_test_objects) +- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/i= nclude/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=3D1 -D_REENTRANT -DUNI= T_TEST_WML_MODIFY -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_reg= ex 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=3D1 -D_REENTRANT -DUN= IT_TEST_WML_MODIFY -L/usr/lib -lboost_regex src/wml_modify.cpp $(wml_modi= fy_test_objects) -o test +=20 + wml_schema_test: $(wml_schema_test_objects) +- $(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/i= nclude/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=3D1 -D_REENTRANT -DUNI= T_TEST_WML_SCHEMA -Wnon-virtual-dtor -Wreturn-type -L/usr/lib -lboost_reg= ex 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=3D1 -D_REENTRANT -DUN= IT_TEST_WML_SCHEMA -L/usr/lib -lboost_regex src/wml_schema.cpp $(wml_sche= ma_test_objects) -o test +=20 + update-pot: + utils/make-pot.sh > po/frogatto.pot diff --git a/games-arcade/frogatto/files/frogatto-1.1.1-libpng.patch b/ga= mes-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 @@ +=20 + #ifdef IMPLEMENT_SAVE_PNG + #include ++#include + #endif +=20 + #include +@@ -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); +=20 + 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/f= rogatto/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=3D"media-libs/sdl-image virtual/glu" =20 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/:"${GAM= ES_DATADIR}"/"${PN}"/images/:g"; done for i in `find src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DA= TADIR}"/"${PN}"/data/:g"; done @@ -37,7 +37,7 @@ src_prepare() { } =20 src_compile() { - emake OPT=3D"${CFLAGS}" || die + emake OPT=3D"${CFLAGS}" OPTX=3D"${CXXFLAGS}" || die } =20 src_install() {