Attachment 253718 Details for Bug 281630 – choclate-doom 3.1.0 WIP

[patch] choclate-doom 3.1.0 WIP

chocolate-doom-3.1.0_WIP.patch (text/plain), 3.78 KB, created by jakub_lach on 2024-09-21 12:32:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jakub_lach

Created: 2024-09-21 12:32:08 UTC

Size: 3.78 KB

patch

obsolete

>diff -rupN chocolate-doom.orig/Makefile chocolate-doom/Makefile
>--- chocolate-doom.orig/Makefile	2024-09-19 14:50:35.526088000 +0200
>+++ chocolate-doom/Makefile	2024-09-21 14:22:39.303500000 +0200
>@@ -1,18 +1,18 @@
>+
> PORTNAME=	chocolate-doom
>-PORTVERSION=	3.0.1
>-PORTREVISION=	2
>+PORTVERSION=	3.1.0
> CATEGORIES=	games
>-MASTER_SITES=	http://www.chocolate-doom.org/downloads/${PORTVERSION}/
>+MASTER_SITES=	https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/
> 
> MAINTAINER=	jakub_lach@mailplus.pl
> COMMENT=	Doom/Heretic/Hexen/Strife engine port compatible with the originals
>-WWW=		https://chocolate-doom.org
>+WWW=		https://www.chocolate-doom.org
> 
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>-USES=		gmake pkgconfig python:build sdl
>+USES=		cmake pkgconfig python:build sdl
> USE_SDL=	mixer2 net2 sdl2
> GNU_CONFIGURE=	yes
> GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>@@ -26,12 +26,17 @@ USE_RC_SUBR=	chocolate-server
> 
> .include "${.CURDIR}/../doom-data/Makefile.include"
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|gamesdir = $${exec_prefix}/games|gamesdir = $${exec_prefix}/bin|' \
>-		${WRKSRC}/src/Makefile.in
>-	${REINPLACE_CMD} -e 's|gamesdir = $$(prefix)/games|gamesdir = $$(prefix)/bin|' \
>-		${WRKSRC}/src/setup/Makefile.in
>-post-install:
>-	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chocolate-*
>+post-extract:
>+	${MV} ${WRKDIR}/chocolate-doom-chocolate-doom-3.1.0/ \
>+	${WRKDIR}/chocolate-doom-3.1.0/
>+
>+#post-patch:
>+#	${REINPLACE_CMD} -e 's|gamesdir = $${exec_prefix}/games|gamesdir = $${exec_prefix}/bin|' \
>+#		${WRKSRC}/src/Makefile.in
>+#	${REINPLACE_CMD} -e 's|gamesdir = $$(prefix)/games|gamesdir = $$(prefix)/bin|' \
>+#		${WRKSRC}/src/setup/Makefile.in
>+
>+#post-install:
>+#	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chocolate-*
> 
> .include <bsd.port.mk>
>diff -rupN chocolate-doom.orig/distinfo chocolate-doom/distinfo
>--- chocolate-doom.orig/distinfo	2024-09-19 14:50:35.526254000 +0200
>+++ chocolate-doom/distinfo	2024-09-19 14:56:12.032419000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1611306702
>-SHA256 (chocolate-doom-3.0.1.tar.gz) = d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7
>-SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
>+TIMESTAMP = 1726750572
>+SHA256 (chocolate-doom-3.1.0.tar.gz) = f2c64843dcec312032b180c3b2f34b4cb26c4dcdaa7375a1601a3b1df11ef84d
>+SIZE (chocolate-doom-3.1.0.tar.gz) = 2256537
>diff -rupN chocolate-doom.orig/files/patch-src_d__iwad.c chocolate-doom/files/patch-src_d__iwad.c
>--- chocolate-doom.orig/files/patch-src_d__iwad.c	2024-09-19 14:50:35.527083000 +0200
>+++ chocolate-doom/files/patch-src_d__iwad.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/d_iwad.c.orig	2017-12-30 16:20:28.000000000 -0500
>-+++ src/d_iwad.c	2018-01-25 09:43:00.567417000 -0500
>-@@ -658,7 +658,7 @@
>-     // The "standard" location for IWADs on Unix that is supported by most
>-     // source ports is /usr/share/games/doom - we support this through the
>-     // XDG_DATA_DIRS mechanism, through which it can be overridden.
>--    AddIWADPath(env, "/games/doom");
>-+    AddIWADPath(env, "/doom");
>- 
>-     // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
>-     // Edition into this directory, under which includes the Doom
>diff -rupN chocolate-doom.orig/files/patch-src_hexen_mn__menu.c chocolate-doom/files/patch-src_hexen_mn__menu.c
>--- chocolate-doom.orig/files/patch-src_hexen_mn__menu.c	2024-09-19 14:50:35.527405000 +0200
>+++ chocolate-doom/files/patch-src_hexen_mn__menu.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/hexen/mn_menu.c.orig	2020-08-28 17:00:20 UTC
>-+++ src/hexen/mn_menu.c
>-@@ -131,7 +131,7 @@ boolean MenuActive;
>- int InfoType;
>- int messageson = true;
>- boolean mn_SuicideConsole;
>--boolean demoextend; // from h2def.h
>-+extern boolean demoextend; // from h2def.h
>- 
>- // PRIVATE DATA DEFINITIONS ------------------------------------------------
>-

Actions: View | Diff

Attachments on bug 281630: 253718 | 253724 | 253733