From e7772bcf5c5027c7858ad94a7252620ab87ff3cd Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 14 Jan 2009 23:43:01 +0000 Subject: - Update to 0.5.0 --- games/teeworlds/Makefile | 48 ++++++++--------- games/teeworlds/distinfo | 12 ++--- games/teeworlds/files/patch-default.bam | 96 +++------------------------------ games/teeworlds/pkg-plist | 18 +++++++ 4 files changed, 53 insertions(+), 121 deletions(-) (limited to 'games/teeworlds') diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile index 62aef22a7ddf..32c4580fc9a8 100644 --- a/games/teeworlds/Makefile +++ b/games/teeworlds/Makefile @@ -6,10 +6,10 @@ # PORTNAME= teeworlds -PORTVERSION= 0.4.3 +PORTVERSION= 0.5.0 CATEGORIES= games -MASTER_SITES= http://mirror.amdmi3.ru/ \ - http://www.teeworlds.com/files/ +MASTER_SITES= http://www.teeworlds.com/files/ \ + http://mirror.amdmi3.ru/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX} @@ -18,8 +18,8 @@ COMMENT= Platform game featuring buggers equipped with weapons USE_PYTHON_BUILD= yes -BAM= ${WRKDIR}/bam.bin -BAM_VERSION= 20080326 +BAM_VERSION= 0.2.0 +BAM_WRKSRC= ${WRKDIR}/bam-${BAM_VERSION} BAM_TARGET= release OPTIONS= TEEWORLDS_SERVER_ONLY "Build dedicated server only" off @@ -30,38 +30,34 @@ OPTIONS= TEEWORLDS_SERVER_ONLY "Build dedicated server only" off BAM_TARGET= server_release PLIST_SUB+= CLIENT="@comment " .else -LIB_DEPENDS+= portaudio.2:${PORTSDIR}/audio/portaudio2 -USE_XORG= x11 xxf86vm -USE_GL= yes +USE_XORG= x11 +USE_GL= gl glu +USE_SDL= sdl PLIST_SUB+= CLIENT="" .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/default.bam - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/default.bam - @${REINPLACE_CMD} -e 's|\(s.cc.c_compiler = \).*|\1"${CC}"|; \ - s|\(s.cc.cxx_compiler = \).*|\1"${CXX}"|; \ - s|\(s.cc.flags = \).*|\1"${CFLAGS}"|; \ - s|\(s.linker.linker = \).*|\1"${CXX}"|' \ - ${WRKDIR}/bam/src/base.bam - @${FIND} ${WRKSRC}/src -name "*.c" -o -name "*.cpp" | \ - ${XARGS} ${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g' - @${REINPLACE_CMD} -e 's|"data/|"${DATADIR}/|g' ${WRKSRC}/datasrc/* -.if ${OSVERSION} < 700042 - @${REINPLACE_CMD} -e 's|-fstack-protector -fstack-protector-all||' \ + @${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|${PTHREAD_LIBS}|; s|^gcc|${CC} ${CFLAGS}|' \ + ${BAM_WRKSRC}/make_unix.sh + @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.bam + @${REINPLACE_CMD} -e '/sdirs\[\]/,/}/ s|"/.*"|"${DATADIR}"|' \ + ${WRKSRC}/src/engine/e_engine.c + + @${REINPLACE_CMD} -e 's|\(settings.cc.c_compiler = \).*|\1"${CC}"|; \ + s|\(settings.cc.cxx_compiler = \).*|\1"${CXX}"|' \ + ${BAM_WRKSRC}/src/driver_gcc.bam + @${REINPLACE_CMD} -e 's|\(settings.*linker = \).*|\1"${CXX}"|' \ + ${BAM_WRKSRC}/src/base.bam + @${REINPLACE_CMD} -e '/settings.cc.flags:Add/ s|-fno-exceptions|& ${CFLAGS}|' \ ${WRKSRC}/default.bam -.endif # build bam executable - teeworlds own build system pre-build: - cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/tools/txt2c.c -o src/tools/txt2c - cd ${WRKDIR}/bam && src/tools/txt2c < src/base.bam > src/internal_base.h - cd ${WRKDIR}/bam && ${CC} ${CFLAGS} src/lua/src/*.c src/lua/src/lib/*.c \ - src/*.c -Isrc/lua/include -o ${BAM} -lm ${PTHREAD_LIBS} + cd ${BAM_WRKSRC} && ${SH} -v make_unix.sh # build teeworlds do-build: - cd ${WRKSRC} && ${BAM} -v ${BAM_TARGET} + cd ${WRKSRC} && ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET} do-install: .if !defined(WITH_TEEWORLDS_SERVER_ONLY) diff --git a/games/teeworlds/distinfo b/games/teeworlds/distinfo index 8aff4ae6551d..93da34ceb7df 100644 --- a/games/teeworlds/distinfo +++ b/games/teeworlds/distinfo @@ -1,6 +1,6 @@ -MD5 (teeworlds-0.4.3-src.tar.gz) = a31a8cbd1af3f71a462122166e5872d6 -SHA256 (teeworlds-0.4.3-src.tar.gz) = 366418de9228818516edf9efbb3cb54dcd62e09e1354838ae010327e420924cc -SIZE (teeworlds-0.4.3-src.tar.gz) = 5056193 -MD5 (bam-20080326.tar.gz) = 7eb70ccacd95d05319eef4a73e485e8e -SHA256 (bam-20080326.tar.gz) = 1103142f2a0297541021a75e3df7e4b4c4a71afcf31ca53b46844b90d026485e -SIZE (bam-20080326.tar.gz) = 124493 +MD5 (teeworlds-0.5.0-src.tar.gz) = 39d7b5d41c2c7250201214a4ab6844ed +SHA256 (teeworlds-0.5.0-src.tar.gz) = bd8011c40066168d8faa16ba52a5e7e0deb59e0371123c3c4340485110d276aa +SIZE (teeworlds-0.5.0-src.tar.gz) = 5890654 +MD5 (bam-0.2.0.tar.gz) = d4efe74591a73c1cec8b34d76ffd1049 +SHA256 (bam-0.2.0.tar.gz) = ef6cddc1df47b0d8106265033ef4e55e61decabf2279a2acd7fdf016633c0758 +SIZE (bam-0.2.0.tar.gz) = 162342 diff --git a/games/teeworlds/files/patch-default.bam b/games/teeworlds/files/patch-default.bam index 208af794b1fd..c34809256485 100644 --- a/games/teeworlds/files/patch-default.bam +++ b/games/teeworlds/files/patch-default.bam @@ -1,93 +1,11 @@ ---- default.bam.orig 2008-08-31 17:30:59.000000000 +0400 -+++ default.bam 2008-09-06 03:08:34.000000000 +0400 -@@ -207,14 +207,16 @@ - if platform == "macosx" then - settings.cc.flags = "-Wall -fno-exceptions -mmacosx-version-min=10.4" +--- default.bam.orig 2009-01-13 22:36:11.000000000 +0300 ++++ default.bam 2009-01-14 17:42:42.000000000 +0300 +@@ -132,7 +132,7 @@ else -- settings.cc.flags = "-Wall -fstack-protector -fstack-protector-all -fno-exceptions" -+ settings.cc.flags = settings.cc.flags .. " -Wall -fstack-protector -fstack-protector-all -fno-exceptions" - end -- settings.linker.flags = "" -+ settings.linker.flags = "-L/usr/local/lib/portaudio2 -L/usr/local/lib -pthread" -+ settings.linker.libs:add("z") - end - - -- set some platform specific settings - settings.cc.includes:add("src") -- settings.cc.includes:add("src/external/zlib") -+ settings.cc.includes:add("/usr/local/include/portaudio2") -+ settings.cc.includes:add("/usr/local/include") - - if family == "unix" then - if platform == "macosx" then -@@ -230,8 +232,6 @@ - else - pa_hostapi = "oss" - end -- -- settings.linker.libs:add("pthread") + glfw_platform = "x11" + pa_platform = "unix" +- settings.link.libs:Add("pthread") ++ settings.link.flags:Add("-pthread") end elseif family == "windows" then glfw_platform = "win32" -@@ -263,11 +263,6 @@ - pa_settings.cc.includes:add("src/engine/external/portaudio/src/common") - pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" .. pa_platform) - -- portaudio = Compile(pa_settings, -- Collect("src/engine/external/portaudio/src/common/*.c"), -- Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"), -- Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c")) -- - -- build game components - engine_settings = settings:copy() - -@@ -277,9 +272,8 @@ - if platform == "macosx" then - engine_settings.cc.flags = "-Wall" - else -- engine_settings.cc.flags = "-Wall -pedantic-errors" -+ engine_settings.cc.flags = engine_settings.cc.flags .. " -Wall -pedantic-errors" - end -- engine_settings.linker.flags = "" - end - - -- server -@@ -299,10 +293,11 @@ - client_settings.linker.frameworks:add("AudioToolbox") - client_settings.linker.frameworks:add("AudioUnit") - else -- client_settings.linker.libs:add("asound") - client_settings.linker.libs:add("X11") -+ client_settings.linker.libs:add("Xxf86vm") - client_settings.linker.libs:add("GL") - client_settings.linker.libs:add("GLU") -+ client_settings.linker.libs:add("portaudio") - end - elseif family == "windows" then - client_settings.linker.libs:add("opengl32.lib") -@@ -311,7 +306,6 @@ - end - - external_settings = settings:copy() -- zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c")) - wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c")) - -@@ -338,7 +332,7 @@ - - -- build client, server, version server and master server - client_exe = Link(client_settings, "teeworlds", game_shared, game_client, -- engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack, -+ engine, client, game_editor, glfw, pnglite, wavpack, - client_link_other) - - server_exe = Link(server_settings, "teeworlds_srv", engine, server, -@@ -389,7 +383,7 @@ - release_settings.config_name = "release" - release_settings.config_ext = "" - release_settings.debug = 0 --release_settings.cc.optimize = 1 -+release_settings.cc.optimize = 0 - - DefaultTarget(build(debug_settings)) - build(release_settings) diff --git a/games/teeworlds/pkg-plist b/games/teeworlds/pkg-plist index 140ae0437789..77defb3e74a0 100644 --- a/games/teeworlds/pkg-plist +++ b/games/teeworlds/pkg-plist @@ -27,6 +27,9 @@ bin/teeworlds_srv %%DATADIR%%/audio/hook_attach-03.wv %%DATADIR%%/audio/hook_loop-01.wv %%DATADIR%%/audio/hook_loop-02.wv +%%DATADIR%%/audio/hook_noattach-01.wv +%%DATADIR%%/audio/hook_noattach-02.wv +%%DATADIR%%/audio/hook_noattach-03.wv %%DATADIR%%/audio/sfx_ctf_cap_pl.wv %%DATADIR%%/audio/sfx_ctf_drop.wv %%DATADIR%%/audio/sfx_ctf_grab_en.wv @@ -126,6 +129,7 @@ bin/teeworlds_srv %%DATADIR%%/audio/wp_switch-01.wv %%DATADIR%%/audio/wp_switch-02.wv %%DATADIR%%/audio/wp_switch-03.wv +%%DATADIR%%/blob.png %%DATADIR%%/browse_icons.png %%DATADIR%%/console.png %%DATADIR%%/console_bar.png @@ -180,11 +184,19 @@ bin/teeworlds_srv %%DATADIR%%/game.png %%DATADIR%%/gui_cursor.png %%DATADIR%%/gui_logo.png +%%DATADIR%%/mapres/bg_cloud1.png +%%DATADIR%%/mapres/bg_cloud2.png +%%DATADIR%%/mapres/bg_cloud3.png %%DATADIR%%/mapres/desert_main.png %%DATADIR%%/mapres/desert_mountains.png %%DATADIR%%/mapres/desert_sun.png +%%DATADIR%%/mapres/generic_unhookable.png %%DATADIR%%/mapres/grass_doodads.png %%DATADIR%%/mapres/grass_main.png +%%DATADIR%%/mapres/jungle_doodads.png +%%DATADIR%%/mapres/jungle_main.png +%%DATADIR%%/mapres/jungle_night.png +%%DATADIR%%/mapres/jungle_night2.png %%DATADIR%%/mapres/moon.png %%DATADIR%%/mapres/mountains.png %%DATADIR%%/mapres/snow.png @@ -194,9 +206,15 @@ bin/teeworlds_srv %%DATADIR%%/mapres/winter_main.png %%DATADIR%%/maps/ctf1.map %%DATADIR%%/maps/ctf2.map +%%DATADIR%%/maps/ctf3.map +%%DATADIR%%/maps/ctf4.map +%%DATADIR%%/maps/ctf5.map %%DATADIR%%/maps/dm1.map %%DATADIR%%/maps/dm2.map %%DATADIR%%/maps/dm6.map +%%DATADIR%%/maps/dm7.map +%%DATADIR%%/maps/dm8.map +%%DATADIR%%/maps/dm9.map %%DATADIR%%/particles.png %%DATADIR%%/skins/bluekitty.png %%DATADIR%%/skins/bluestripe.png -- cgit v1.2.3