pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/teeworlds teeworlds: Update to 0.7.3.1

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd45560a537b
branches:  trunk
changeset: 335798:bd45560a537b
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jul 01 14:01:27 2019 +0000

description:
teeworlds: Update to 0.7.3.1

Switch to a less obscure build system. Hopefully fixes the package.

diffstat:

 games/teeworlds/Makefile                                    |   59 +-
 games/teeworlds/PLIST                                       |  228 ++++++++---
 games/teeworlds/distinfo                                    |   13 +-
 games/teeworlds/patches/patch-bam.lua                       |   20 -
 games/teeworlds/patches/patch-src_base_detect.h             |   35 -
 games/teeworlds/patches/patch-src_engine_shared_storage.cpp |   27 -
 6 files changed, 201 insertions(+), 181 deletions(-)

diffs (truncated from 504 to 300 lines):

diff -r b4534dd557ff -r bd45560a537b games/teeworlds/Makefile
--- a/games/teeworlds/Makefile  Mon Jul 01 13:58:13 2019 +0000
+++ b/games/teeworlds/Makefile  Mon Jul 01 14:01:27 2019 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2019/04/26 13:13:59 maya Exp $
+# $NetBSD: Makefile,v 1.11 2019/07/01 14:01:27 nia Exp $
 
-DISTNAME=      teeworlds-0.6.3-src
+DISTNAME=      teeworlds-0.7.3.1-src
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   1
 CATEGORIES=    games
-MASTER_SITES=  http://downloads.teeworlds.com/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=teeworlds/}
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 
 MAINTAINER=    fstd.lkml%gmail.com@localhost
 HOMEPAGE=      https://www.teeworlds.com/
@@ -12,30 +12,41 @@
 LICENSE=       zlib AND 2-clause-bsd AND modified-bsd AND cc-by-sa-v3.0
 
 USE_LANGUAGES= c c++03
+USE_CMAKE=     yes
+USE_TOOLS+=    pkg-config
 
-BUILD_DEPENDS+=        bam>=0.4.0:../../devel/bam
-
-AUTO_MKDIRS=   yes
+INSTALLATION_DIRS+=    share/appdata
+INSTALLATION_DIRS+=    share/applications
+.for size in 256 128 48 32 24 16
+INSTALLATION_DIRS+=    share/icons/hicolor/${size}x${size}/apps
+.endfor
 
-CPIO=  cpio
+TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
 
-PYTHON_VERSIONS_INCOMPATIBLE=   36 37 # hardcoded to 2.7 in a patch
-
-do-configure:
-       set -e; cd ${WRKSRC}; bam config
+pre-configure:
+       convert ${WRKSRC}/other/icons/teeworlds.ico[0] ${WRKDIR}/teeworlds-256.png
+       convert ${WRKSRC}/other/icons/teeworlds.ico[1] ${WRKDIR}/teeworlds-128.png
+       convert ${WRKSRC}/other/icons/teeworlds.ico[2] ${WRKDIR}/teeworlds-48.png
+       convert ${WRKSRC}/other/icons/teeworlds.ico[3] ${WRKDIR}/teeworlds-32.png
+       convert ${WRKSRC}/other/icons/teeworlds.ico[4] ${WRKDIR}/teeworlds-24.png
+       convert ${WRKSRC}/other/icons/teeworlds.ico[5] ${WRKDIR}/teeworlds-16.png
 
-do-build:
-       set -e; cd ${WRKSRC}; bam server_release client_release
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/other/teeworlds.desktop ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/other/teeworlds.appdata.xml ${DESTDIR}${PREFIX}/share/appdata
+.for size in 256 128 48 32 24 16
+       ${INSTALL_DATA} ${WRKDIR}/teeworlds-${size}.png \
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/teeworlds.png
+.endfor
 
-do-install:
-       ${INSTALL_GAME} ${WRKSRC}/teeworlds ${DESTDIR}${PREFIX}/bin/teeworlds
-       ${INSTALL_GAME} ${WRKSRC}/teeworlds_srv ${DESTDIR}${PREFIX}/bin/teeworlds_srv
-       cd ${WRKSRC} && ${FIND} data | \
-               ${CPIO} -p ${DESTDIR}${PREFIX}/share/teeworlds
-       cd ${DESTDIR}${PREFIX} && \
-       ${FIND} share/teeworlds -type f -print >${WRKDIR}/PLIST
-
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../audio/wavpack/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b4534dd557ff -r bd45560a537b games/teeworlds/PLIST
--- a/games/teeworlds/PLIST     Mon Jul 01 13:58:13 2019 +0000
+++ b/games/teeworlds/PLIST     Mon Jul 01 14:01:27 2019 +0000
@@ -1,6 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/12 18:53:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/01 14:01:27 nia Exp $
 bin/teeworlds
 bin/teeworlds_srv
+share/appdata/teeworlds.appdata.xml
+share/applications/teeworlds.desktop
+share/icons/hicolor/128x128/apps/teeworlds.png
+share/icons/hicolor/16x16/apps/teeworlds.png
+share/icons/hicolor/24x24/apps/teeworlds.png
+share/icons/hicolor/256x256/apps/teeworlds.png
+share/icons/hicolor/32x32/apps/teeworlds.png
+share/icons/hicolor/48x48/apps/teeworlds.png
 share/teeworlds/data/audio/foley_body_impact-01.wv
 share/teeworlds/data/audio/foley_body_impact-02.wv
 share/teeworlds/data/audio/foley_body_impact-03.wv
@@ -107,6 +115,12 @@
 share/teeworlds/data/audio/wp_hammer_swing-01.wv
 share/teeworlds/data/audio/wp_hammer_swing-02.wv
 share/teeworlds/data/audio/wp_hammer_swing-03.wv
+share/teeworlds/data/audio/wp_laser_bnce-01.wv
+share/teeworlds/data/audio/wp_laser_bnce-02.wv
+share/teeworlds/data/audio/wp_laser_bnce-03.wv
+share/teeworlds/data/audio/wp_laser_fire-01.wv
+share/teeworlds/data/audio/wp_laser_fire-02.wv
+share/teeworlds/data/audio/wp_laser_fire-03.wv
 share/teeworlds/data/audio/wp_ninja_attack-01.wv
 share/teeworlds/data/audio/wp_ninja_attack-02.wv
 share/teeworlds/data/audio/wp_ninja_attack-03.wv
@@ -120,22 +134,12 @@
 share/teeworlds/data/audio/wp_noammo-03.wv
 share/teeworlds/data/audio/wp_noammo-04.wv
 share/teeworlds/data/audio/wp_noammo-05.wv
-share/teeworlds/data/audio/wp_rifle_bnce-01.wv
-share/teeworlds/data/audio/wp_rifle_bnce-02.wv
-share/teeworlds/data/audio/wp_rifle_bnce-03.wv
-share/teeworlds/data/audio/wp_rifle_fire-01.wv
-share/teeworlds/data/audio/wp_rifle_fire-02.wv
-share/teeworlds/data/audio/wp_rifle_fire-03.wv
 share/teeworlds/data/audio/wp_shotty_fire-01.wv
 share/teeworlds/data/audio/wp_shotty_fire-02.wv
 share/teeworlds/data/audio/wp_shotty_fire-03.wv
 share/teeworlds/data/audio/wp_switch-01.wv
 share/teeworlds/data/audio/wp_switch-02.wv
 share/teeworlds/data/audio/wp_switch-03.wv
-share/teeworlds/data/blob.png
-share/teeworlds/data/browse_icons.png
-share/teeworlds/data/console.png
-share/teeworlds/data/console_bar.png
 share/teeworlds/data/countryflags/AD.png
 share/teeworlds/data/countryflags/AE.png
 share/teeworlds/data/countryflags/AF.png
@@ -314,6 +318,7 @@
 share/teeworlds/data/countryflags/PM.png
 share/teeworlds/data/countryflags/PN.png
 share/teeworlds/data/countryflags/PR.png
+share/teeworlds/data/countryflags/PS.png
 share/teeworlds/data/countryflags/PT.png
 share/teeworlds/data/countryflags/PW.png
 share/teeworlds/data/countryflags/PY.png
@@ -373,7 +378,11 @@
 share/teeworlds/data/countryflags/VU.png
 share/teeworlds/data/countryflags/WF.png
 share/teeworlds/data/countryflags/WS.png
+share/teeworlds/data/countryflags/XBZ.png
+share/teeworlds/data/countryflags/XCA.png
 share/teeworlds/data/countryflags/XEN.png
+share/teeworlds/data/countryflags/XES.png
+share/teeworlds/data/countryflags/XGA.png
 share/teeworlds/data/countryflags/XNI.png
 share/teeworlds/data/countryflags/XSC.png
 share/teeworlds/data/countryflags/XWA.png
@@ -382,52 +391,62 @@
 share/teeworlds/data/countryflags/ZM.png
 share/teeworlds/data/countryflags/ZW.png
 share/teeworlds/data/countryflags/default.png
-share/teeworlds/data/countryflags/index.txt
-share/teeworlds/data/debug_font.png
-share/teeworlds/data/demo_buttons.png
+share/teeworlds/data/countryflags/index.json
+share/teeworlds/data/deadtee.png
+share/teeworlds/data/editor/automap/desert_main.json
+share/teeworlds/data/editor/automap/grass_doodads.json
+share/teeworlds/data/editor/automap/grass_main.json
+share/teeworlds/data/editor/automap/jungle_main.json
+share/teeworlds/data/editor/automap/winter_main.json
 share/teeworlds/data/editor/background.png
 share/teeworlds/data/editor/checker.png
 share/teeworlds/data/editor/cursor.png
-share/teeworlds/data/editor/desert_main.rules
 share/teeworlds/data/editor/entities.png
-share/teeworlds/data/editor/grass_main.rules
-share/teeworlds/data/editor/jungle_main.rules
-share/teeworlds/data/editor/winter_main.rules
 share/teeworlds/data/emoticons.png
-share/teeworlds/data/file_icons.png
 share/teeworlds/data/fonts/DejaVuSans.ttf
-share/teeworlds/data/fonts/LICENSE
-share/teeworlds/data/fonts/VERSION
 share/teeworlds/data/game.png
-share/teeworlds/data/gui_buttons.png
-share/teeworlds/data/gui_cursor.png
-share/teeworlds/data/gui_icons.png
-share/teeworlds/data/gui_logo.png
-share/teeworlds/data/languages/belarusian.txt
-share/teeworlds/data/languages/bosnian.txt
-share/teeworlds/data/languages/brazilian_portuguese.txt
-share/teeworlds/data/languages/bulgarian.txt
-share/teeworlds/data/languages/czech.txt
-share/teeworlds/data/languages/danish.txt
-share/teeworlds/data/languages/dutch.txt
-share/teeworlds/data/languages/finnish.txt
-share/teeworlds/data/languages/french.txt
-share/teeworlds/data/languages/german.txt
-share/teeworlds/data/languages/hungarian.txt
-share/teeworlds/data/languages/index.txt
-share/teeworlds/data/languages/italian.txt
-share/teeworlds/data/languages/kyrgyz.txt
-share/teeworlds/data/languages/norwegian.txt
-share/teeworlds/data/languages/polish.txt
-share/teeworlds/data/languages/portuguese.txt
-share/teeworlds/data/languages/romanian.txt
-share/teeworlds/data/languages/russian.txt
-share/teeworlds/data/languages/serbian.txt
-share/teeworlds/data/languages/slovak.txt
-share/teeworlds/data/languages/spanish.txt
-share/teeworlds/data/languages/swedish.txt
-share/teeworlds/data/languages/turkish.txt
-share/teeworlds/data/languages/ukrainian.txt
+share/teeworlds/data/languages/belarusian.json
+share/teeworlds/data/languages/bosnian.json
+share/teeworlds/data/languages/brazilian_portuguese.json
+share/teeworlds/data/languages/breton.json
+share/teeworlds/data/languages/bulgarian.json
+share/teeworlds/data/languages/catalan.json
+share/teeworlds/data/languages/chuvash.json
+share/teeworlds/data/languages/czech.json
+share/teeworlds/data/languages/danish.json
+share/teeworlds/data/languages/dutch.json
+share/teeworlds/data/languages/esperanto.json
+share/teeworlds/data/languages/estonian.json
+share/teeworlds/data/languages/finnish.json
+share/teeworlds/data/languages/french.json
+share/teeworlds/data/languages/gaelic_scottish.json
+share/teeworlds/data/languages/galician.json
+share/teeworlds/data/languages/german.json
+share/teeworlds/data/languages/greek.json
+share/teeworlds/data/languages/hungarian.json
+share/teeworlds/data/languages/index.json
+share/teeworlds/data/languages/irish.json
+share/teeworlds/data/languages/italian.json
+share/teeworlds/data/languages/japanese.json
+share/teeworlds/data/languages/korean.json
+share/teeworlds/data/languages/kyrgyz.json
+share/teeworlds/data/languages/license.txt
+share/teeworlds/data/languages/lithuanian.json
+share/teeworlds/data/languages/norwegian.json
+share/teeworlds/data/languages/polish.json
+share/teeworlds/data/languages/portuguese.json
+share/teeworlds/data/languages/readme.txt
+share/teeworlds/data/languages/romanian.json
+share/teeworlds/data/languages/russian.json
+share/teeworlds/data/languages/serbian.json
+share/teeworlds/data/languages/simplified_chinese.json
+share/teeworlds/data/languages/slovak.json
+share/teeworlds/data/languages/slovenian.json
+share/teeworlds/data/languages/spanish.json
+share/teeworlds/data/languages/swedish.json
+share/teeworlds/data/languages/traditional_chinese.json
+share/teeworlds/data/languages/turkish.json
+share/teeworlds/data/languages/ukrainian.json
 share/teeworlds/data/mapres/bg_cloud1.png
 share/teeworlds/data/mapres/bg_cloud2.png
 share/teeworlds/data/mapres/bg_cloud3.png
@@ -436,7 +455,10 @@
 share/teeworlds/data/mapres/desert_mountains.png
 share/teeworlds/data/mapres/desert_mountains2.png
 share/teeworlds/data/mapres/desert_sun.png
+share/teeworlds/data/mapres/easter.png
 share/teeworlds/data/mapres/generic_deathtiles.png
+share/teeworlds/data/mapres/generic_lamps.png
+share/teeworlds/data/mapres/generic_shadows.png
 share/teeworlds/data/mapres/generic_unhookable.png
 share/teeworlds/data/mapres/grass_doodads.png
 share/teeworlds/data/mapres/grass_main.png
@@ -446,6 +468,7 @@
 share/teeworlds/data/mapres/jungle_main.png
 share/teeworlds/data/mapres/jungle_midground.png
 share/teeworlds/data/mapres/jungle_unhookables.png
+share/teeworlds/data/mapres/light.png
 share/teeworlds/data/mapres/moon.png
 share/teeworlds/data/mapres/mountains.png
 share/teeworlds/data/mapres/snow.png
@@ -463,27 +486,98 @@
 share/teeworlds/data/maps/ctf5.map
 share/teeworlds/data/maps/ctf6.map
 share/teeworlds/data/maps/ctf7.map
+share/teeworlds/data/maps/ctf8.map
 share/teeworlds/data/maps/dm1.map
 share/teeworlds/data/maps/dm2.map
+share/teeworlds/data/maps/dm3.map
 share/teeworlds/data/maps/dm6.map
 share/teeworlds/data/maps/dm7.map
 share/teeworlds/data/maps/dm8.map
 share/teeworlds/data/maps/dm9.map
+share/teeworlds/data/maps/license.txt
+share/teeworlds/data/maps/lms1.map
+share/teeworlds/data/maps/readme.txt
 share/teeworlds/data/particles.png
-share/teeworlds/data/skins/bluekitty.png
-share/teeworlds/data/skins/bluestripe.png
-share/teeworlds/data/skins/brownbear.png
-share/teeworlds/data/skins/cammo.png
-share/teeworlds/data/skins/cammostripes.png
-share/teeworlds/data/skins/coala.png
-share/teeworlds/data/skins/default.png
-share/teeworlds/data/skins/limekitty.png
Home | Main Index | Thread Index | Old Index