Date: Sat, 1 Jun 2024 21:34:48 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b85c2fd68d1e - main - games/openfodder: update to 1.9.0 Message-ID: <202406012134.451LYm6N002832@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b85c2fd68d1e4467fcd89083ab0a8034e180025e commit b85c2fd68d1e4467fcd89083ab0a8034e180025e Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-30 18:32:05 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-06-01 21:34:34 +0000 games/openfodder: update to 1.9.0 Changes: https://github.com/OpenFodder/openfodder/releases/tag/1.9.0 Reported by: GitHub (watch releases) --- games/openfodder/Makefile | 9 +++------ games/openfodder/distinfo | 16 +++++++--------- games/openfodder/files/patch-libc++ | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile index a0ede290affc..3dd7c52b5021 100644 --- a/games/openfodder/Makefile +++ b/games/openfodder/Makefile @@ -1,10 +1,7 @@ PORTNAME= OpenFodder -DISTVERSION= 1.8.0 +DISTVERSION= 1.9.0 CATEGORIES= games -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= a5eac175f940.patch:-p1 # https://github.com/OpenFodder/openfodder/issues/89 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Open source port of Cannon Fodder WWW= http://openfodder.com/ @@ -20,8 +17,8 @@ LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING.ZLIB.txt USES= compiler:c++14-lang sdl USE_GITHUB= yes USE_SDL= mixer2 -GH_TUPLE= ${PORTNAME}:data:1.7.0:data/Run \ - ${PORTNAME}:scripts:c6f3076:scripts/Run/Scripts +GH_TUPLE= ${PORTNAME}:data:1.8.0-1-g070a608:data/Run \ + ${PORTNAME}:scripts:dad0473:scripts/Run/Scripts GH_PROJECT= ${PORTNAME:tl} PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME:tl}.desktop \ diff --git a/games/openfodder/distinfo b/games/openfodder/distinfo index 3335dacb9258..c2af9eb6b78f 100644 --- a/games/openfodder/distinfo +++ b/games/openfodder/distinfo @@ -1,9 +1,7 @@ -TIMESTAMP = 1693002763 -SHA256 (OpenFodder-openfodder-1.8.0_GH0.tar.gz) = c46c91e95df693084192f336c168dc14d677ff7630872eb2ad9dc016bf65c582 -SIZE (OpenFodder-openfodder-1.8.0_GH0.tar.gz) = 1470661 -SHA256 (OpenFodder-data-1.7.0_GH0.tar.gz) = a5d39084e4d0e272ac8fa86f931e86923b70e8f84d9c01de47f8f0cd96909124 -SIZE (OpenFodder-data-1.7.0_GH0.tar.gz) = 3384943 -SHA256 (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 3fbb82605c8bfbc3404220cee2044c368f0f82cdf23f9adcb6144e7743cf9c71 -SIZE (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 50622 -SHA256 (a5eac175f940.patch) = 13a656f7548e31ea9cb296534545dd2e5dde322f2df6e2e799dc905d3d265bcf -SIZE (a5eac175f940.patch) = 1141 +TIMESTAMP = 1717093925 +SHA256 (OpenFodder-openfodder-1.9.0_GH0.tar.gz) = d6b1dd5ad87f85cd1609c336d595bc74421a646920de40be8b977bb23b363beb +SIZE (OpenFodder-openfodder-1.9.0_GH0.tar.gz) = 1548174 +SHA256 (OpenFodder-data-1.8.0-1-g070a608_GH0.tar.gz) = c55082fece7fdc4fdb41ef5d77b3c73ead7adf967a7f604cb48b88bc67784b66 +SIZE (OpenFodder-data-1.8.0-1-g070a608_GH0.tar.gz) = 3351603 +SHA256 (OpenFodder-scripts-dad0473_GH0.tar.gz) = 80f33e96acade206203f37bfec325199f748c025f7015b8c59abaecbb984d32d +SIZE (OpenFodder-scripts-dad0473_GH0.tar.gz) = 50736 diff --git a/games/openfodder/files/patch-libc++ b/games/openfodder/files/patch-libc++ new file mode 100644 index 000000000000..30065f4edf50 --- /dev/null +++ b/games/openfodder/files/patch-libc++ @@ -0,0 +1,30 @@ +https://github.com/OpenFodder/openfodder/issues/90 +https://github.com/OpenFodder/openfodder/commit/79eccbfbca05 + +--- CMakeLists.txt.orig 2024-05-30 18:32:05 UTC ++++ CMakeLists.txt +@@ -17,6 +17,7 @@ find_package(SDL2Mixer REQUIRED) + + find_package(SDL2 REQUIRED) + find_package(SDL2Mixer REQUIRED) ++find_package(Threads REQUIRED) + + # Locate git binary to provide information to the build environment + find_package(Git) +@@ -46,4 +47,4 @@ target_include_directories(openfodder PRIVATE + Source + ${CMAKE_CURRENT_BINARY_DIR}/Source) + +-target_link_libraries(openfodder SDL2::SDL2 SDL2_mixer::SDL2_mixer) ++target_link_libraries(openfodder SDL2::SDL2 SDL2_mixer::SDL2_mixer Threads::Threads) +--- Makefile.orig 2024-05-30 18:32:05 UTC ++++ Makefile +@@ -4,7 +4,7 @@ CC = clang++ $(CXXFLAGS) -c -Wall -std=c++14 -ferror-l + DLibs = `sdl2-config --libs` -L/usr/local/lib -lSDL2_mixer + + CC = clang++ $(CXXFLAGS) -c -Wall -std=c++14 -ferror-limit=100 $(pathInc) $(Libs) +-LD = clang++ $(LDFLAGS) obj/*.o $(DLibs) ++LD = clang++ $(LDFLAGS) obj/*.o -lpthread $(DLibs) + + all : fodder +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406012134.451LYm6N002832>