Index | Thread | Search

From:
Tobias Heider <tobias.heider@stusta.de>
Subject:
games/cromagrally: update to 3.0.1
To:
izder456@disroot.org, thfr@openbsd.org
Cc:
ports@openbsd.org
Date:
Thu, 8 Feb 2024 16:50:29 +0100

Download raw body.

Thread 
cromagrally just published a new version including a bug fix that makes
it work properly on macppc.

Here's a diff to update to 3.0.1

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cromagrally/Makefile,v
diff -u -p -r1.1.1.1 Makefile
--- Makefile	30 Jan 2024 19:51:55 -0000	1.1.1.1
+++ Makefile	8 Feb 2024 15:47:59 -0000
@@ -1,11 +1,10 @@
 COMMENT =	family-friendly bronze age kart game
 
-V =		3.0.0pl0
-GAME_COMMIT =	5983de40c180b50bbbec8b04f5f5f1ceccd1901b
+V =		3.0.1
 PKGNAME =	cromagrally-${V}
-DISTNAME =	CroMagRally-${GAME_COMMIT}
-DIST_TUPLE +=	github jorio CroMagRally ${GAME_COMMIT} .
-DIST_TUPLE +=	github jorio Pomme d57c28e205462e51063e787f9ebddaadff592f1e \
+DISTNAME =	CroMagRally-${V}
+DIST_TUPLE +=	github jorio CroMagRally ${V} .
+DIST_TUPLE +=	github jorio Pomme ef94150e2dcec522e3099f4d03a4e8f2639f7232 \
 		extern/Pomme
 
 CATEGORIES =	games
@@ -35,7 +34,7 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Rel
 		-DCMAKE_INSTALL_PREFIX=${LOCALBASE}
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/Source/Main.cpp
+	${SUBST_CMD} ${WRKSRC}/Source/Boot.cpp
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/CroMagRally/
@@ -44,9 +43,9 @@ do-install:
 	cp -R ${WRKBUILD}/Data ${PREFIX}/share/cromagrally
 	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/512x512/apps/ \
 		${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/packaging/cromagrally-desktopicon.png \
+	${INSTALL_DATA} ${WRKSRC}/packaging/io.jor.cromagrally.png \
 		${PREFIX}/share/icons/hicolor/512x512/apps/
-	${INSTALL_DATA} ${WRKSRC}/packaging/cromagrally.desktop \
+	${INSTALL_DATA} ${WRKSRC}/packaging/io.jor.cromagrally.desktop \
 		${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/cromagrally/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- distinfo	30 Jan 2024 19:51:55 -0000	1.1.1.1
+++ distinfo	8 Feb 2024 15:47:59 -0000
@@ -1,4 +1,4 @@
-SHA256 (jorio-CroMagRally-5983de40c180b50bbbec8b04f5f5f1ceccd1901b.tar.gz) = bah6hMEPSWWHufce0fLLgNZAg1qsMZiN/b5oII4nYKU=
-SHA256 (jorio-Pomme-d57c28e205462e51063e787f9ebddaadff592f1e.tar.gz) = P4oAFIYquIpOTCeOay8Y/V/nEzV01zuz1mun2QK8mTQ=
-SIZE (jorio-CroMagRally-5983de40c180b50bbbec8b04f5f5f1ceccd1901b.tar.gz) = 143649930
-SIZE (jorio-Pomme-d57c28e205462e51063e787f9ebddaadff592f1e.tar.gz) = 148831
+SHA256 (jorio-CroMagRally-3.0.1.tar.gz) = lho27SF/FwiYlU2MKOiDS1YXZ150HmEUkOeSsCjqZ3w=
+SHA256 (jorio-Pomme-ef94150e2dcec522e3099f4d03a4e8f2639f7232.tar.gz) = afr2FkScBzfiODZ4g+NiMPFdE8Jh4Y1uTUxp4u3QsAI=
+SIZE (jorio-CroMagRally-3.0.1.tar.gz) = 143630062
+SIZE (jorio-Pomme-ef94150e2dcec522e3099f4d03a4e8f2639f7232.tar.gz) = 152738
Index: patches/patch-Source_Boot_cpp
===================================================================
RCS file: patches/patch-Source_Boot_cpp
diff -N patches/patch-Source_Boot_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_Boot_cpp	8 Feb 2024 15:47:59 -0000
@@ -0,0 +1,12 @@
+Index: Source/Boot.cpp
+--- Source/Boot.cpp.orig
++++ Source/Boot.cpp
+@@ -58,7 +58,7 @@ tryAgain:
+ 			break;
+ 
+ 		case 2:
+-			dataPath = "Data";
++			dataPath = "${TRUEPREFIX}/share/cromagrally";
+ 			break;
+ 
+ 		default:
Index: patches/patch-Source_Main_cpp
===================================================================
RCS file: patches/patch-Source_Main_cpp
diff -N patches/patch-Source_Main_cpp
--- patches/patch-Source_Main_cpp	30 Jan 2024 19:51:55 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: Source/Main.cpp
---- Source/Main.cpp.orig
-+++ Source/Main.cpp
-@@ -51,7 +51,7 @@ static fs::path FindGameData()
- 	dataPath = pathbuf;
- 	dataPath = dataPath.parent_path().parent_path() / "Resources";
- #else
--	dataPath = "Data";
-+	dataPath = "${TRUEPREFIX}/share/cromagrally";
- #endif
- 
- 	dataPath = dataPath.lexically_normal();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/cromagrally/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	30 Jan 2024 19:51:55 -0000	1.1.1.1
+++ pkg/PLIST	8 Feb 2024 15:47:59 -0000
@@ -1,5 +1,5 @@
 @bin bin/CroMagRally
-share/applications/cromagrally.desktop
+share/applications/io.jor.cromagrally.desktop
 share/cromagrally/
 share/cromagrally/Audio/
 share/cromagrally/Audio/Announcer/
@@ -51,7 +51,7 @@ share/cromagrally/Audio/EuroSong.aiff
 share/cromagrally/Audio/IceSong.aiff
 share/cromagrally/Audio/JungleSong.aiff
 share/cromagrally/Audio/LevelSpecific/
-share/cromagrally/Audio/LevelSpecific/Blowdart.aiff
+share/cromagrally/Audio/LevelSpecific/BlowDart.aiff
 share/cromagrally/Audio/LevelSpecific/Bubbles.aiff
 share/cromagrally/Audio/LevelSpecific/Catapult.aiff
 share/cromagrally/Audio/LevelSpecific/Chant.aiff
@@ -109,7 +109,6 @@ share/cromagrally/Images/TrackSelectScre
 share/cromagrally/Images/VehicleSelectScreen.jpg
 share/cromagrally/Images/Vignette.png
 share/cromagrally/Models/
-share/cromagrally/Models/Winners.bg3d
 share/cromagrally/Models/atlantis.bg3d
 share/cromagrally/Models/aztec.bg3d
 share/cromagrally/Models/carparts.bg3d
@@ -128,6 +127,7 @@ share/cromagrally/Models/scandinavia.bg3
 share/cromagrally/Models/stonehenge.bg3d
 share/cromagrally/Models/tarpits.bg3d
 share/cromagrally/Models/weapons.bg3d
+share/cromagrally/Models/winners.bg3d
 share/cromagrally/Skeletons/
 share/cromagrally/Skeletons/Beetle.bg3d
 share/cromagrally/Skeletons/Beetle.skeleton.rsrc
@@ -159,8 +159,8 @@ share/cromagrally/Skeletons/Mummy.bg3d
 share/cromagrally/Skeletons/Mummy.skeleton.rsrc
 share/cromagrally/Skeletons/PolarBear.bg3d
 share/cromagrally/Skeletons/PolarBear.skeleton.rsrc
-share/cromagrally/Skeletons/Pteradactyl.skeleton.rsrc
 share/cromagrally/Skeletons/Pterodactyl.bg3d
+share/cromagrally/Skeletons/Pterodactyl.skeleton.rsrc
 share/cromagrally/Skeletons/Shark.bg3d
 share/cromagrally/Skeletons/Shark.skeleton.rsrc
 share/cromagrally/Skeletons/Troll.bg3d
@@ -248,7 +248,6 @@ share/cromagrally/Sprites/trackselectsp.
 share/cromagrally/Sprites/wallfont.png
 share/cromagrally/Sprites/wallfont.txt
 share/cromagrally/System/
-share/cromagrally/System/Application.rsrc
 share/cromagrally/System/gamecontrollerdb.txt
 share/cromagrally/System/kerning.txt
 share/cromagrally/System/strings.csv
@@ -294,6 +293,6 @@ share/doc/CroMagRally/CHANGELOG.md
 share/doc/CroMagRally/LICENSE.md
 share/doc/CroMagRally/README.md
 share/doc/CroMagRally/SECRETS.md
-share/icons/hicolor/512x512/apps/cromagrally-desktopicon.png
 @tag update-desktop-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor
+share/icons/hicolor/512x512/apps/io.jor.cromagrally.png