On Monday, December 19, 2022 15:13 CET, Stuart Henderson <s...@spacehopper.org> wrote:
> You can add tars to a github repo and fetch from there, see mail/greyscanner > thanks for that pointer. > But first check to see if upstream have made a tar release which includes > all the necessary files. Did you try the src-tar.gz link under Other at > https://gitlab.com/choria/code/-/releases ? > indeed the src-tar.gz contains the two submodules, hadn't noticed it before. Updated version with less patches below and attached. cheers, Sebastian Index: Makefile =================================================================== RCS file: /cvs/ports/games/choria/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 28 May 2022 06:19:59 -0000 1.14 +++ Makefile 19 Dec 2022 21:42:44 -0000 @@ -1,38 +1,52 @@ -BROKEN-mips64el = Bus error on startup, no core file left - -V = 0.4.1 -REVISION = 5 COMMENT = 2D MMORPG focused on grinding -DISTNAME = choria-${V}-src + +V = 1.0.1 +COMMIT = d3de66a6 +DISTNAME = choria-${V}-${COMMIT}-src PKGNAME = choria-${V} CATEGORIES = games x11 +MAINTAINER = Sebastian Reitenbach <sebas...@openbsd.org> + +HOMEPAGE = https://choria.gitlab.io/ -HOMEPAGE = https://github.com/jazztickets/choria # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX} +WANTLIB += c m pthread SDL2_image sqlite3 ${COMPILER_LIBCXX} +WANTLIB += GL GLU SDL2 freetype jsoncpp ogg tinyxml2 vorbis vorbisfile +WANTLIB += z openal ${MODLUA_WANTLIB} COMPILER = base-clang ports-gcc base-gcc MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib +MODLUA_VERSION = 5.3 -MASTER_SITES = ${MASTER_SITE_GOOGLECODE:=choria/} +MASTER_SITES = https://gitlab.com/jazztickets/uploads/-/raw/main/ -MODULES = devel/cmake +MODULES = devel/cmake lang/lua -LIB_DEPENDS = x11/irrlicht \ - databases/sqlite3 +BUILD_DEPENDS = graphics/glm \ + shells/bash +LIB_DEPENDS = audio/libogg \ + audio/libvorbis \ + audio/openal \ + devel/jsoncpp \ + devel/sdl2 \ + devel/sdl2-image \ + databases/sqlite3 \ + textproc/tinyxml2 RUN_DEPENDS = devel/desktop-file-utils NO_TEST = Yes +WRKDIST = ${WRKDIR}/choria-${V}-${COMMIT} + post-patch: perl -pi -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/deployment/choria perl -pi -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt - cp ${FILESDIR}/FindSqlite.cmake ${WRKSRC}/ - + ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt + .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/games/choria/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 23 Jun 2013 22:38:57 -0000 1.2 +++ distinfo 19 Dec 2022 21:42:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (choria-0.4.1-src.tar.gz) = bR5WjMrxZ4o76aukAAES0BwqbxMg9ylorWuhcEMHdxM= -SIZE (choria-0.4.1-src.tar.gz) = 564637 +SHA256 (choria-1.0.1-d3de66a6-src.tar.gz) = uJw9spEHASB23AsBdv1VibqRNFUGm01u/o1sTs2/GXk= +SIZE (choria-1.0.1-d3de66a6-src.tar.gz) = 18072921 Index: files/FindSqlite.cmake =================================================================== RCS file: files/FindSqlite.cmake diff -N files/FindSqlite.cmake --- files/FindSqlite.cmake 23 Sep 2016 09:16:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -# - Try to find Sqlite -# Once done this will define -# -# SQLITE_FOUND - system has Sqlite -# SQLITE_INCLUDE_DIR - the Sqlite include directory -# SQLITE_LIBRARIES - Link these to use Sqlite -# SQLITE_DEFINITIONS - Compiler switches required for using Sqlite -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# - - -# Copyright (c) 2008, Gilles Caulier, <caulier.gil...@gmail.com> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) - # in cache already - SET(Sqlite_FIND_QUIETLY TRUE) -endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) - -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls -if( NOT WIN32 ) - find_package(PkgConfig) - - pkg_check_modules(PC_SQLITE QUIET sqlite3) - - set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) -endif( NOT WIN32 ) - -find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h - PATHS - ${PC_SQLITE_INCLUDEDIR} - ${PC_SQLITE_INCLUDE_DIRS} -) - -find_library(SQLITE_LIBRARIES NAMES sqlite3 - PATHS - ${PC_SQLITE_LIBDIR} - ${PC_SQLITE_LIBRARY_DIRS} -) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Sqlite DEFAULT_MSG SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) - -# show the SQLITE_INCLUDE_DIR and SQLITE_LIBRARIES variables only in the advanced view -mark_as_advanced(SQLITE_INCLUDE_DIR SQLITE_LIBRARIES ) - Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/choria/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -r1.2 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 11 Mar 2022 19:04:12 -0000 1.2 +++ patches/patch-CMakeLists_txt 19 Dec 2022 21:42:44 -0000 @@ -1,15 +1,23 @@ ---- CMakeLists.txt.orig Tue Sep 20 07:49:53 2016 -+++ CMakeLists.txt Tue Sep 20 07:50:36 2016 -@@ -32,10 +32,11 @@ endif() - add_definitions("-DTIXML_USE_STL") - find_package(Irrlicht 1.8 REQUIRED) - find_package(Threads REQUIRED) --#find_package(sqlite REQUIRED) -+find_package(Sqlite REQUIRED) +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -132,7 +132,7 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/assets/source/process + list(APPEND DATA_SCRIPTS "${SCRIPT_OUTPUT}") + add_custom_command( + OUTPUT "${SCRIPT_OUTPUT}" +- COMMAND luac "${STRIP_LUA}" -o "${SCRIPT_OUTPUT}" "${SCRIPT_PATH}" ++ COMMAND luac${MODLUA_DEP_VERSION} "${STRIP_LUA}" -o "${SCRIPT_OUTPUT}" "${SCRIPT_PATH}" + DEPENDS "${SCRIPT_PATH}" + ) + endforeach() +@@ -172,8 +172,8 @@ if(WIN32) + else() - # set include directories - include_directories("src") -+include_directories(${SQLITE_INCLUDE_DIR}) - include_directories(${IRRLICHT_INCLUDE_DIRS}) - - # add source files + # linux installation +- install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION share/games/${CMAKE_PROJECT_NAME}) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ DESTINATION share/games/${CMAKE_PROJECT_NAME} PATTERN "working/choria" EXCLUDE PATTERN "working/*") ++ install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION share/${CMAKE_PROJECT_NAME}) ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ DESTINATION share/${CMAKE_PROJECT_NAME} PATTERN "working/choria" EXCLUDE PATTERN "working/*") + install(FILES ${PROJECT_SOURCE_DIR}/deployment/${CMAKE_PROJECT_NAME}.png DESTINATION share/pixmaps) + install(FILES ${PROJECT_SOURCE_DIR}/deployment/${CMAKE_PROJECT_NAME}.desktop DESTINATION share/applications) + install(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG DESTINATION share/doc/${CMAKE_PROJECT_NAME}) Index: patches/patch-ext_ae_ae_framelimit_h =================================================================== RCS file: patches/patch-ext_ae_ae_framelimit_h diff -N patches/patch-ext_ae_ae_framelimit_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-ext_ae_ae_framelimit_h 19 Dec 2022 21:42:44 -0000 @@ -0,0 +1,12 @@ +Index: ext/ae/ae/framelimit.h +--- ext/ae/ae/framelimit.h.orig ++++ ext/ae/ae/framelimit.h +@@ -63,7 +63,7 @@ class _FrameLimit { + + private: + +- std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> Timer; ++ std::chrono::time_point<std::chrono::steady_clock, std::chrono::nanoseconds> Timer; + double FrameRate; + double ExtraTime; + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/choria/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 11 Mar 2022 19:04:12 -0000 1.3 +++ pkg/PLIST 19 Dec 2022 21:42:44 -0000 @@ -2,209 +2,131 @@ share/applications/choria.desktop share/choria/ @bin share/choria/choria -share/choria/database/ -share/choria/database/data.s3db +share/choria/data/ +share/choria/data/sounds share/choria/fonts/ -share/choria/fonts/font_10.png -share/choria/fonts/font_10.xml -share/choria/fonts/font_14.png -share/choria/fonts/font_14.xml -share/choria/fonts/font_18.png -share/choria/fonts/font_18.xml -share/choria/fonts/font_7.png -share/choria/fonts/font_7.xml -share/choria/fonts/font_8.png -share/choria/fonts/font_8.xml +share/choria/fonts/pt_sans_bold.ttf +share/choria/fonts/pt_sans_bold.txt +share/choria/fonts/vera_mono_bold.ttf +share/choria/fonts/vera_mono_bold.txt share/choria/maps/ -share/choria/maps/a_mcave0.map -share/choria/maps/a_town0.map -share/choria/maps/a_wcave0.map -share/choria/maps/a_world.map -share/choria/maps/start_cave0.map -share/choria/maps/start_cave1.map -share/choria/maps/start_cave2.map -share/choria/maps/start_cave3.map -share/choria/maps/start_maus0.map -share/choria/maps/start_maus1.map -share/choria/maps/start_town0.map -share/choria/maps/start_town1.map -share/choria/maps/start_world.map +share/choria/maps/choria.map.gz +share/choria/maps/choria_ancient.map.gz +share/choria/maps/choria_batcave.map.gz +share/choria/maps/choria_darkchamber.map.gz +share/choria/maps/choria_goblincave.map.gz +share/choria/maps/choria_graveyard.map.gz +share/choria/maps/choria_hideout.map.gz +share/choria/maps/choria_lighthouse1.map.gz +share/choria/maps/choria_lighthouse2.map.gz +share/choria/maps/choria_lighthouse2_bg.map.gz +share/choria/maps/choria_mountain.map.gz +share/choria/maps/choria_mountain_bg.map.gz +share/choria/maps/choria_mountain_cave1.map.gz +share/choria/maps/choria_mountain_cave2.map.gz +share/choria/maps/choria_mountain_cave2b.map.gz +share/choria/maps/choria_pit.map.gz +share/choria/maps/choria_ruins1.map.gz +share/choria/maps/choria_ruins2.map.gz +share/choria/maps/choria_sandcave.map.gz +share/choria/maps/choria_sandcave_bg.map.gz +share/choria/maps/choria_slimecave1.map.gz +share/choria/maps/choria_slimecave2.map.gz +share/choria/maps/fem.map.gz +share/choria/maps/fem_house_top.map.gz +share/choria/maps/fem_tower1.map.gz +share/choria/maps/fem_tower2.map.gz +share/choria/maps/fem_tower3.map.gz +share/choria/maps/fem_tower4.map.gz +share/choria/maps/fem_tower4_bg.map.gz +share/choria/maps/fem_tower5.map.gz +share/choria/maps/ham.map.gz +share/choria/maps/ham_armor.map.gz +share/choria/maps/ham_blacksmith.map.gz +share/choria/maps/ham_cellar.map.gz +share/choria/maps/ham_cellarhut.map.gz +share/choria/maps/ham_gamble.map.gz +share/choria/maps/ham_supplies.map.gz +share/choria/maps/ham_weapon.map.gz +share/choria/maps/san.map.gz +share/choria/maps/san_armor.map.gz +share/choria/maps/san_dungeon.map.gz +share/choria/maps/san_shop.map.gz +share/choria/maps/san_weapon.map.gz +share/choria/maps/wym.map.gz +share/choria/maps/wym_chamber.map.gz +share/choria/music/ +share/choria/music/bat.ogg +share/choria/music/cellar.ogg +share/choria/music/doom.ogg +share/choria/music/gob.ogg +share/choria/music/howl.ogg +share/choria/music/ice.ogg +share/choria/music/intro.ogg +share/choria/music/jazztown.ogg +share/choria/music/jung.ogg +share/choria/music/lava.ogg +share/choria/music/library.ogg +share/choria/music/lost.ogg +share/choria/music/queen.ogg +share/choria/music/ruins.ogg +share/choria/music/sand.ogg +share/choria/music/tower.ogg +share/choria/scripts/ +share/choria/scripts/ai.lua +share/choria/scripts/battle.lua +share/choria/scripts/bot.lua +share/choria/scripts/buffs.lua +share/choria/scripts/data.lua +share/choria/scripts/game.lua +share/choria/scripts/items.lua +share/choria/scripts/procs.lua +share/choria/scripts/scripts.lua +share/choria/scripts/sets.lua +share/choria/scripts/skills.lua +share/choria/scripts/spells.lua +share/choria/shaders/ +share/choria/shaders/map.frag +share/choria/shaders/ortho_pos.vert +share/choria/shaders/ortho_pos_uv.frag +share/choria/shaders/ortho_pos_uv.vert +share/choria/shaders/pos.frag +share/choria/shaders/pos.vert +share/choria/shaders/pos_uv.frag +share/choria/shaders/pos_uv.vert +share/choria/shaders/pos_uv_static.frag +share/choria/shaders/text.frag +share/choria/stats/ +share/choria/stats/stats.db +share/choria/tables/ +share/choria/tables/colors.tsv +share/choria/tables/fonts.tsv +share/choria/tables/layers.tsv +share/choria/tables/programs.tsv +share/choria/tables/styles.tsv +share/choria/tables/ui.xml share/choria/textures/ -share/choria/textures/battle/ -share/choria/textures/battle/background.png -share/choria/textures/battle/chest.png -share/choria/textures/battle/coins.png -share/choria/textures/battle/experience.png -share/choria/textures/battle/slot_left.png -share/choria/textures/battle/slot_right.png -share/choria/textures/battle/target.png -share/choria/textures/editor/ -share/choria/textures/editor/nozone.png -share/choria/textures/interface/ -share/choria/textures/interface/black.png -share/choria/textures/interface/emptyslot.png -share/choria/textures/interface/experience.png -share/choria/textures/interface/experiencemax.png -share/choria/textures/interface/gold.png -share/choria/textures/interface/health.png -share/choria/textures/interface/healthmax.png -share/choria/textures/interface/hud_character.png -share/choria/textures/interface/hud_inventory.png -share/choria/textures/interface/hud_menu.png -share/choria/textures/interface/hud_skills.png -share/choria/textures/interface/hud_spawn.png -share/choria/textures/interface/hud_trade.png -share/choria/textures/interface/inventory.png -share/choria/textures/interface/mana.png -share/choria/textures/interface/manamax.png -share/choria/textures/interface/minus.png -share/choria/textures/interface/plus.png -share/choria/textures/interface/pvp.png -share/choria/textures/interface/selectedslot.png -share/choria/textures/interface/trade.png -share/choria/textures/interface/trader.png -share/choria/textures/interface/vendor.png -share/choria/textures/items/ -share/choria/textures/items/axe.png -share/choria/textures/items/blessed_sword.png -share/choria/textures/items/bone.png -share/choria/textures/items/boots.png -share/choria/textures/items/buckler.png -share/choria/textures/items/bugeye.png -share/choria/textures/items/cap.png -share/choria/textures/items/chainmail.png -share/choria/textures/items/club.png -share/choria/textures/items/copper_boots.png -share/choria/textures/items/copper_helm.png -share/choria/textures/items/copper_jacket.png -share/choria/textures/items/copper_sword.png -share/choria/textures/items/dagger.png -share/choria/textures/items/dirty_shirt.png -share/choria/textures/items/fancy_shirt.png -share/choria/textures/items/fancy_staff.png -share/choria/textures/items/fang.png -share/choria/textures/items/fangsword.png -share/choria/textures/items/feather.png -share/choria/textures/items/hat.png -share/choria/textures/items/hatchet.png -share/choria/textures/items/high_health.png -share/choria/textures/items/high_mana.png -share/choria/textures/items/large_invis.png -share/choria/textures/items/leather_hat.png -share/choria/textures/items/leather_patch.png -share/choria/textures/items/leather_shirt.png -share/choria/textures/items/magic_shirt.png -share/choria/textures/items/medium_health.png -share/choria/textures/items/medium_invis.png -share/choria/textures/items/medium_mana.png -share/choria/textures/items/metal_boots.png -share/choria/textures/items/metal_buckler.png -share/choria/textures/items/metal_helm.png -share/choria/textures/items/metal_jacket.png -share/choria/textures/items/monster_tail.png -share/choria/textures/items/platemail.png -share/choria/textures/items/psword.png -share/choria/textures/items/ring.png -share/choria/textures/items/ring_blue.png -share/choria/textures/items/ring_red.png -share/choria/textures/items/sandals.png -share/choria/textures/items/small_health.png -share/choria/textures/items/small_invis.png -share/choria/textures/items/small_knife.png -share/choria/textures/items/small_mana.png -share/choria/textures/items/spectral.png -share/choria/textures/items/spider_leg.png -share/choria/textures/items/spike_jacket.png -share/choria/textures/items/spike_shield.png -share/choria/textures/items/staff.png -share/choria/textures/items/swampglob.png -share/choria/textures/items/sword.png -share/choria/textures/items/wood_shield.png -share/choria/textures/map/ -share/choria/textures/map/brick0.png -share/choria/textures/map/brick1.png -share/choria/textures/map/bush0.png -share/choria/textures/map/cave0.png -share/choria/textures/map/cavefloor.png -share/choria/textures/map/cavestairs.png -share/choria/textures/map/cavewall0.png -share/choria/textures/map/cryptstairs.png -share/choria/textures/map/fence0.png -share/choria/textures/map/floor0.png -share/choria/textures/map/grass0.png -share/choria/textures/map/grass1.png -share/choria/textures/map/mountains0.png -share/choria/textures/map/plains0.png -share/choria/textures/map/sign.png -share/choria/textures/map/sign_boss.png -share/choria/textures/map/sign_heal.png -share/choria/textures/map/sign_pvp.png -share/choria/textures/map/sign_shop.png -share/choria/textures/map/sign_spawn.png -share/choria/textures/map/spawn.png -share/choria/textures/map/swamp0.png -share/choria/textures/map/town.png -share/choria/textures/map/trader0.png -share/choria/textures/map/trees0.png -share/choria/textures/map/trees1.png -share/choria/textures/map/water0.png -share/choria/textures/map/water0_town0.png -share/choria/textures/map/wood0.png -share/choria/textures/menu/ -share/choria/textures/menu/blankslot.png -share/choria/textures/menu/logo.png -share/choria/textures/menu/selected.png -share/choria/textures/monsters/ -share/choria/textures/monsters/bat.png -share/choria/textures/monsters/bird.png -share/choria/textures/monsters/blue_ghost.png -share/choria/textures/monsters/fire_bug.png -share/choria/textures/monsters/forest_spider.png -share/choria/textures/monsters/ghost.png -share/choria/textures/monsters/ghoul.png -share/choria/textures/monsters/goblin.png -share/choria/textures/monsters/green_ghost.png -share/choria/textures/monsters/large_spider.png -share/choria/textures/monsters/moss.png -share/choria/textures/monsters/musta_zombie.png -share/choria/textures/monsters/scary_zombie.png -share/choria/textures/monsters/scorpion.png -share/choria/textures/monsters/skeleton.png -share/choria/textures/monsters/small_bug.png -share/choria/textures/monsters/spider.png -share/choria/textures/monsters/swamp.png -share/choria/textures/monsters/undead_firebug.png -share/choria/textures/monsters/undead_scorpion.png -share/choria/textures/monsters/zombie.png -share/choria/textures/players/ -share/choria/textures/players/basic.png -share/choria/textures/portraits/ -share/choria/textures/portraits/chris.png -share/choria/textures/portraits/joe.png -share/choria/textures/portraits/mike.png -share/choria/textures/portraits/nicole.png -share/choria/textures/portraits/peter.png -share/choria/textures/portraits/tara.png -share/choria/textures/skills/ -share/choria/textures/skills/attack.png -share/choria/textures/skills/bolt.png -share/choria/textures/skills/damage.png -share/choria/textures/skills/defense.png -share/choria/textures/skills/flame.png -share/choria/textures/skills/heal.png -share/choria/textures/skills/health.png -share/choria/textures/skills/healthregen.png -share/choria/textures/skills/mana.png -share/choria/textures/skills/manaregen.png -share/choria/textures/skills/usehealth.png -share/choria/textures/skills/usemana.png -share/choria/textures/world/ -share/choria/textures/world/busy.png -share/choria/textures/world/trade.png +share/choria/textures/atlas +share/choria/textures/buffs +share/choria/textures/builds +share/choria/textures/buttonbar +share/choria/textures/hud +share/choria/textures/hud_repeat +share/choria/textures/items +share/choria/textures/lights +share/choria/textures/maps +share/choria/textures/menu +share/choria/textures/minigames +share/choria/textures/models +share/choria/textures/monsters +share/choria/textures/objects +share/choria/textures/portraits +share/choria/textures/skills +share/choria/textures/status share/doc/choria/ +share/doc/choria/CHANGELOG +share/doc/choria/LICENSE share/doc/choria/README -share/doc/choria/changelog.txt -share/doc/choria/license.txt share/pixmaps/ -share/pixmaps/choria.xpm @tag update-desktop-database +share/pixmaps/choria.png
choria-1.0.1.diff
Description: Binary data
