From nobody Sun Aug 13 12:24:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNxXg08TNz4qTq3; Sun, 13 Aug 2023 12:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNxXf2hGhz3JXS; Sun, 13 Aug 2023 12:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691929442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlDs3P6LtOHjPQ3efmLqIcQXbd1n4mOFRTCqveQHIvE=; b=LJs5fBVQpzDp+Jsrk0QGV8J0JOrBgcdjY0nmWqtSGo5SCdRX0Ki7MjTrEPsTJ5NgENkFFf //pqLdjEu7Z5MQzO9fDAXQZofVWT+nCYSdXucJHCSUAgu/HwROGizKawnHt2bmvgyO1C3k xrG2jSusjdLBtiw00OGnbMeZdzDIGb3AFrVXsUeknRwTP6w1asAFt8DFgN77qrvk3cPnOe u969Zpob2nwwA/8KTH3IlT/9P4Rr26GhWtohftPnaUe2FTgszLqguwekwu5N3VG2e9Cxcy 8VPGP3VC3YRCsMiuf7MToOzb2qCdn9NlqXYDQ6yAc/5wxsOwtnt+7crNnKSHmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691929442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlDs3P6LtOHjPQ3efmLqIcQXbd1n4mOFRTCqveQHIvE=; b=pCRSolv1vY1gxUlCvn3kROpWw3UrC/HlGaINgHs+sVtA3h9cxP8CD6yTeMMnEGqWY4DNhO oZh1fL9NyNv9YV0X0NfyZWmshyDacd/OYrGkjssb1HoYXk2E6QXggDrl+8hbV5tmN1v3+H cxQhvy+9dRk00kVdFiuOFpzsZSFyfBiOhxxvcboGtrxVThleYKozEkAPOnDwFo4tXDOf52 EJotIPL1w7XQr0S9tez5gW97rh15XR0wNme/GzNZuw5fPIN7lZ2jcCJd6hCzewXlwmvsDA 2kaWliQ7K7noGgdtIbHmeO6tSYeZBn/BeOYn57uU6oZ73mHBzfLG8VRzL8UiBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691929442; a=rsa-sha256; cv=none; b=Fb2cc7X/ta8yd1ffEvZyMW5+e6Ezup4Sna5/AjAQ9mOuoHl+4RCISFEq/p4dihvn41djol DsbcVTJi8zsuuPRn3vkpfqob6GvsejkjNqbpGQSaWC9+CcS2wxyNumocy32rw6w2FWyUhu bluA2l5R4+9fgLwIhEERSvNJxb7Agsb+m6bOpoYqnCfQv4DllNL0acVTiNEkL5vSBMc3WI d4fjMSABKRQKbghONvfYEzby7Ap5mvVC5keaKSxMbACy3eHj1LZvi8Wel4MhzQeumH0/DC Ld1hkXm/OV47qCAfTDn6LvuZ2afgBlZMFdUasu2R1DiGluJc9nRoZPnPouwEhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNxXf1hkjz1251; Sun, 13 Aug 2023 12:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37DCO23P018750; Sun, 13 Aug 2023 12:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37DCO2ma018747; Sun, 13 Aug 2023 12:24:02 GMT (envelope-from git) Date: Sun, 13 Aug 2023 12:24:02 GMT Message-Id: <202308131224.37DCO2ma018747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 9ed0c1c0dc73 - main - games/corsix-th: Update to 0.67 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ed0c1c0dc7312e9fe8ddaa95a663d9fd5d4a8ba Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ed0c1c0dc7312e9fe8ddaa95a663d9fd5d4a8ba commit 9ed0c1c0dc7312e9fe8ddaa95a663d9fd5d4a8ba Author: Guido Falsi AuthorDate: 2023-08-13 12:23:11 +0000 Commit: Guido Falsi CommitDate: 2023-08-13 12:23:57 +0000 games/corsix-th: Update to 0.67 --- games/corsix-th/Makefile | 39 +++++------- games/corsix-th/distinfo | 6 +- games/corsix-th/files/patch-CorsixTH_Lua_app.lua | 6 +- .../files/patch-CorsixTH_Lua_config__finder.lua | 6 +- games/corsix-th/pkg-plist | 71 ++++++++++------------ 5 files changed, 56 insertions(+), 72 deletions(-) diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index e41653f0410b..fecfb6bc551f 100644 --- a/games/corsix-th/Makefile +++ b/games/corsix-th/Makefile @@ -1,7 +1,6 @@ PORTNAME= corsixth -PORTVERSION= 0.66 +PORTVERSION= 0.67 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= games MAINTAINER= madpilot@FreeBSD.org @@ -16,40 +15,32 @@ RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \ USES= cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \ iconv lua pkgconfig sdl -USE_SDL= mixer2 DOS2UNIX_FILES= CMake/FindFFmpeg.cmake \ CorsixTH/CMakeLists.txt \ CorsixTH/Src/iso_fs.cpp +USE_GITHUB= yes +GH_ACCOUNT= CorsixTH +GH_PROJECT= CorsixTH +USE_SDL= mixer2 CMAKE_ARGS= -DWITH_LUAJIT=OFF CFLAGS+= -I${ICONV_PREFIX}/include DATADIR= ${PREFIX}/share/corsix-th -DESKTOP_ENTRIES= "CorsixTH" \ - "${COMMENT}" \ - "${PREFIX}/share/pixmaps/corsix-th.png" \ - "${PREFIX}/bin/corsix-th" \ - "Game;" \ - "" - -USE_GITHUB= yes -GH_ACCOUNT= CorsixTH -GH_PROJECT= CorsixTH +OPTIONS_DEFINE= MOVIES TOOLS +OPTIONS_DEFAULT=MOVIES TOOLS +OPTIONS_SUB= yes -OPTIONS_DEFINE= MOVIES -OPTIONS_DEFAULT= MOVIES MOVIES_DESC= Play in-game movies +TOOLS_DESC= Tools for decoding RNC files +MOVIES_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg MOVIES_CMAKE_ON= -DWITH_MOVIES=ON MOVIES_CMAKE_OFF= -DWITH_MOVIES=OFF -MOVIES_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/CorsixTH/corsix-th ${STAGEDIR}${PREFIX}/bin - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/CorsixTH/CorsixTH.lua ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/CorsixTH && ${COPYTREE_SHARE} "Bitmap Levels Lua" \ - ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/LDocGen/output/logo.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/corsix-th.png +TOOLS_CMAKE_ON= -DBUILD_TOOLS=ON +TOOLS_CMAKE_OFF= -DBUILD_TOOLS=OFF + +post-install-TOOLS-on: + ${INSTALL_PROGRAM} ${WRKSRC}/tools/rnc/rnc_decode ${STAGEDIR}${PREFIX}/bin .include diff --git a/games/corsix-th/distinfo b/games/corsix-th/distinfo index fd0802ab1270..f97d4d59f339 100644 --- a/games/corsix-th/distinfo +++ b/games/corsix-th/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656341198 -SHA256 (CorsixTH-CorsixTH-v0.66_GH0.tar.gz) = 9f87ff002405501b12798a715b691496775a4f9727188eeba167143816992a0f -SIZE (CorsixTH-CorsixTH-v0.66_GH0.tar.gz) = 4117046 +TIMESTAMP = 1691851664 +SHA256 (CorsixTH-CorsixTH-v0.67_GH0.tar.gz) = 4e88cf1916bf4d7c304b551ddb91fb9194f110bad4663038ca73d31b939d69e3 +SIZE (CorsixTH-CorsixTH-v0.67_GH0.tar.gz) = 4127698 diff --git a/games/corsix-th/files/patch-CorsixTH_Lua_app.lua b/games/corsix-th/files/patch-CorsixTH_Lua_app.lua index 998dd922ccd5..d30c61b6e1f1 100644 --- a/games/corsix-th/files/patch-CorsixTH_Lua_app.lua +++ b/games/corsix-th/files/patch-CorsixTH_Lua_app.lua @@ -1,11 +1,11 @@ ---- CorsixTH/Lua/app.lua.orig 2021-06-17 02:16:54 UTC +--- CorsixTH/Lua/app.lua.orig 2023-06-25 00:50:42 UTC +++ CorsixTH/Lua/app.lua -@@ -64,7 +64,7 @@ function App:App() +@@ -65,7 +65,7 @@ function App:App() } self.strings = {} self.savegame_version = SAVEGAME_VERSION - self.check_for_updates = true + self.check_for_updates = false + self.idle_tick = 0 end - --! Starts a Lua DBGp client & connects it to a DBGp server. diff --git a/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua b/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua index 2ef11aaf79ed..e56c9d3883d6 100644 --- a/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua +++ b/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua @@ -1,6 +1,6 @@ ---- CorsixTH/Lua/config_finder.lua.orig 2021-06-17 02:16:54 UTC +--- CorsixTH/Lua/config_finder.lua.orig 2023-06-25 00:50:42 UTC +++ CorsixTH/Lua/config_finder.lua -@@ -138,7 +138,7 @@ local config_defaults = { +@@ -140,7 +140,7 @@ local config_defaults = { shift_scroll_speed = 4, new_graphics_folder = nil, use_new_graphics = false, @@ -8,4 +8,4 @@ + check_for_updates = false, room_information_dialogs = true, allow_blocking_off_areas = false, - direct_zoom = false + direct_zoom = nil, diff --git a/games/corsix-th/pkg-plist b/games/corsix-th/pkg-plist index 7bb0d90a2bd8..434720a9bd74 100644 --- a/games/corsix-th/pkg-plist +++ b/games/corsix-th/pkg-plist @@ -1,58 +1,51 @@ bin/corsix-th -share/pixmaps/corsix-th.png +%%TOOLS%%bin/rnc_decode +share/applications/com.corsixth.corsixth.desktop +share/icons/hicolor/scalable/apps/corsix-th.svg +share/man/man6/corsix-th.6.gz +share/metainfo/com.corsixth.corsixth.metainfo.xml %%DATADIR%%/Bitmap/aux_ui.dat -%%DATADIR%%/Bitmap/aux_ui.spec %%DATADIR%%/Bitmap/aux_ui.tab -%%DATADIR%%/Bitmap/bootstrap_font.bmp %%DATADIR%%/Bitmap/bootstrap_font.dat %%DATADIR%%/Bitmap/bootstrap_font.pal %%DATADIR%%/Bitmap/bootstrap_font.tab -%%DATADIR%%/Bitmap/build_room_dialog_close.bmp -%%DATADIR%%/Bitmap/flag_buildable.bmp -%%DATADIR%%/Bitmap/flag_hospital.bmp -%%DATADIR%%/Bitmap/flag_passable.bmp -%%DATADIR%%/Bitmap/flag_travel_east.bmp -%%DATADIR%%/Bitmap/flag_travel_north.bmp -%%DATADIR%%/Bitmap/flag_travel_south.bmp -%%DATADIR%%/Bitmap/flag_travel_west.bmp -%%DATADIR%%/Bitmap/fullscreen_border_bottom.bmp -%%DATADIR%%/Bitmap/fullscreen_border_bottomleft.bmp -%%DATADIR%%/Bitmap/fullscreen_border_bottomright.bmp -%%DATADIR%%/Bitmap/fullscreen_border_left.bmp -%%DATADIR%%/Bitmap/fullscreen_border_right.bmp -%%DATADIR%%/Bitmap/fullscreen_border_top.bmp -%%DATADIR%%/Bitmap/fullscreen_border_topleft.bmp -%%DATADIR%%/Bitmap/fullscreen_border_topright.bmp -%%DATADIR%%/Bitmap/lib_bmp.lua -%%DATADIR%%/Bitmap/lib_spritesheet.lua -%%DATADIR%%/Bitmap/mainmenu1080.bmp %%DATADIR%%/Bitmap/mainmenu1080.dat %%DATADIR%%/Bitmap/mainmenu1080.pal -%%DATADIR%%/Bitmap/mainmenu480.bmp %%DATADIR%%/Bitmap/mainmenu480.dat %%DATADIR%%/Bitmap/mainmenu480.pal -%%DATADIR%%/Bitmap/mainmenu720.bmp %%DATADIR%%/Bitmap/mainmenu720.dat %%DATADIR%%/Bitmap/mainmenu720.pal -%%DATADIR%%/Bitmap/map_cell_outline.bmp -%%DATADIR%%/Bitmap/map_cell_outline_east.bmp -%%DATADIR%%/Bitmap/map_cell_outline_north.bmp -%%DATADIR%%/Bitmap/map_cell_outline_south.bmp -%%DATADIR%%/Bitmap/map_cell_outline_west.bmp -%%DATADIR%%/Bitmap/mkbootstrap.lua -%%DATADIR%%/Bitmap/mkfont.lua -%%DATADIR%%/Bitmap/mkraw.lua -%%DATADIR%%/Bitmap/mksheet.lua -%%DATADIR%%/Bitmap/readme.txt -%%DATADIR%%/Bitmap/tree_collapsed.bmp %%DATADIR%%/Bitmap/tree_ctrl.dat %%DATADIR%%/Bitmap/tree_ctrl.pal -%%DATADIR%%/Bitmap/tree_ctrl.spec %%DATADIR%%/Bitmap/tree_ctrl.tab -%%DATADIR%%/Bitmap/tree_expanded.bmp -%%DATADIR%%/Bitmap/tree_leaf.bmp -%%DATADIR%%/Bitmap/tree_level.bmp +%%DATADIR%%/Campaigns/ChrizmanTV.campaign +%%DATADIR%%/Campaigns/Coffalot.map +%%DATADIR%%/Campaigns/Dethsdaw.map +%%DATADIR%%/Campaigns/Four Corners.map +%%DATADIR%%/Campaigns/Greyham Gardens.map +%%DATADIR%%/Campaigns/Holby.map +%%DATADIR%%/Campaigns/Hoppalong.map +%%DATADIR%%/Campaigns/Royal Hospital.map +%%DATADIR%%/Campaigns/Snuffit Sands.map +%%DATADIR%%/Campaigns/Tufflook.map +%%DATADIR%%/Campaigns/Upper Pukington.map +%%DATADIR%%/Campaigns/Wishinwell.map +%%DATADIR%%/Campaigns/Writhe.map +%%DATADIR%%/Campaigns/coffalot.level +%%DATADIR%%/Campaigns/dethsdaw.level +%%DATADIR%%/Campaigns/example.campaign +%%DATADIR%%/Campaigns/fourcorners.level +%%DATADIR%%/Campaigns/greyhamgardens.level +%%DATADIR%%/Campaigns/holby.level +%%DATADIR%%/Campaigns/hoppalong.level +%%DATADIR%%/Campaigns/royalhospital.level +%%DATADIR%%/Campaigns/snuffitsands.level +%%DATADIR%%/Campaigns/tufflook.level +%%DATADIR%%/Campaigns/upperpukington.level +%%DATADIR%%/Campaigns/wishinwell.level +%%DATADIR%%/Campaigns/writhe.level %%DATADIR%%/CorsixTH.lua +%%DATADIR%%/LICENSE.txt %%DATADIR%%/Levels/Example.map %%DATADIR%%/Levels/avatar.level %%DATADIR%%/Levels/avatar.map