Attachment 253724 Details for Bug 281630 – v1

[patch] v1

chocolate-doom.diff (text/plain), 8.23 KB, created by Vladimir Druzenko on 2024-09-21 15:31:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2024-09-21 15:31:01 UTC

Size: 8.23 KB

patch

obsolete

>diff -urNp games/chocolate-doom/Makefile /usr/ports/games/chocolate-doom/Makefile
>--- games/chocolate-doom/Makefile	2024-03-26 16:01:41.138376000 +0300
>+++ /usr/ports/games/chocolate-doom/Makefile	2024-09-21 18:27:08.034463000 +0300
>@@ -1,8 +1,6 @@ PORTNAME=	chocolate-doom
> PORTNAME=	chocolate-doom
>-PORTVERSION=	3.0.1
>-PORTREVISION=	2
>+DISTVERSION=	3.1.0
> CATEGORIES=	games
>-MASTER_SITES=	http://www.chocolate-doom.org/downloads/${PORTVERSION}/
> 
> MAINTAINER=	jakub_lach@mailplus.pl
> COMMENT=	Doom/Heretic/Hexen/Strife engine port compatible with the originals
>@@ -10,27 +8,27 @@ LICENSE=	GPLv2
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libpng.so:graphics/png
>+LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
>+		libpng.so:graphics/png \
>+		libsamplerate.so:audio/libsamplerate
> 
>-USES=		gmake pkgconfig python:build sdl
>+USES=		autoreconf gmake pkgconfig python:build sdl
>+USE_GITHUB=	yes
>+GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
>+USE_RC_SUBR=	chocolate-server
> USE_SDL=	mixer2 net2 sdl2
>+
> GNU_CONFIGURE=	yes
>-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
>-BINARY_ALIAS=	python=${PYTHON_CMD}
> 
>-PORTDOCS=	CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md PHILOSOPHY.md \
>-		README.md README.Music.md
>+BINARY_ALIAS=	python3=${PYTHON_CMD}
> 
>+PORTDOCS=	CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md \
>+		PHILOSOPHY.md README.md README.Music.md
>+
> OPTIONS_DEFINE=	DOCS
>-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-*
> 
>diff -urNp games/chocolate-doom/distinfo /usr/ports/games/chocolate-doom/distinfo
>--- games/chocolate-doom/distinfo	2023-02-07 01:31:47.717106000 +0300
>+++ /usr/ports/games/chocolate-doom/distinfo	2024-09-21 17:32:07.513099000 +0300
>@@ -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 = 1726929127
>+SHA256 (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = f2c64843dcec312032b180c3b2f34b4cb26c4dcdaa7375a1601a3b1df11ef84d
>+SIZE (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = 2256537
>diff -urNp games/chocolate-doom/files/patch-src_d__iwad.c /usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c
>--- games/chocolate-doom/files/patch-src_d__iwad.c	2023-02-07 01:31:47.717239000 +0300
>+++ /usr/ports/games/chocolate-doom/files/patch-src_d__iwad.c	1970-01-01 03:00:00.000000000 +0300
>@@ -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 -urNp games/chocolate-doom/files/patch-src_hexen_mn__menu.c /usr/ports/games/chocolate-doom/files/patch-src_hexen_mn__menu.c
>--- games/chocolate-doom/files/patch-src_hexen_mn__menu.c	2023-02-07 01:31:47.717287000 +0300
>+++ /usr/ports/games/chocolate-doom/files/patch-src_hexen_mn__menu.c	1970-01-01 03:00:00.000000000 +0300
>@@ -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 ------------------------------------------------
>- 
>diff -urNp games/chocolate-doom/pkg-plist /usr/ports/games/chocolate-doom/pkg-plist
>--- games/chocolate-doom/pkg-plist	2024-03-26 16:01:41.138457000 +0300
>+++ /usr/ports/games/chocolate-doom/pkg-plist	2024-09-21 17:52:34.021025000 +0300
>@@ -7,39 +7,19 @@ bin/chocolate-strife-setup
> bin/chocolate-server
> bin/chocolate-strife
> bin/chocolate-strife-setup
>-share/man/man5/chocolate-doom.cfg.5.gz
>-share/man/man5/chocolate-heretic.cfg.5.gz
>-share/man/man5/chocolate-hexen.cfg.5.gz
>-share/man/man5/chocolate-strife.cfg.5.gz
>-share/man/man5/default.cfg.5.gz
>-share/man/man5/heretic.cfg.5.gz
>-share/man/man5/hexen.cfg.5.gz
>-share/man/man5/strife.cfg.5.gz
>-share/man/man6/chocolate-doom-setup.6.gz
>-share/man/man6/chocolate-doom.6.gz
>-share/man/man6/chocolate-heretic-setup.6.gz
>-share/man/man6/chocolate-heretic.6.gz
>-share/man/man6/chocolate-hexen-setup.6.gz
>-share/man/man6/chocolate-hexen.6.gz
>-share/man/man6/chocolate-server.6.gz
>-share/man/man6/chocolate-setup.6.gz
>-share/man/man6/chocolate-strife-setup.6.gz
>-share/man/man6/chocolate-strife.6.gz
>-share/appdata/chocolate-doom.appdata.xml
>-share/appdata/chocolate-heretic.appdata.xml
>-share/appdata/chocolate-hexen.appdata.xml
>-share/appdata/chocolate-strife.appdata.xml
>-share/applications/chocolate-doom.desktop
>-share/applications/chocolate-heretic.desktop
>-share/applications/chocolate-hexen.desktop
>-share/applications/chocolate-setup.desktop
>-share/applications/chocolate-strife.desktop
>-share/applications/screensavers/chocolate-doom-screensaver.desktop
>+share/applications/org.chocolate_doom.Doom.desktop
>+share/applications/org.chocolate_doom.Heretic.desktop
>+share/applications/org.chocolate_doom.Hexen.desktop
>+share/applications/org.chocolate_doom.Setup.desktop
>+share/applications/org.chocolate_doom.Strife.desktop
>+share/applications/screensavers/org.chocolate_doom.Doom_Screensaver.desktop
> share/bash-completion/completions/chocolate-doom
> share/bash-completion/completions/chocolate-heretic
> share/bash-completion/completions/chocolate-hexen
> share/bash-completion/completions/chocolate-strife
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING.md
> share/doc/chocolate-heretic/CMDLINE.heretic
>+share/doc/chocolate-heretic/COPYING.md
> share/doc/chocolate-heretic/ChangeLog
> share/doc/chocolate-heretic/INSTALL.heretic
> share/doc/chocolate-heretic/NEWS.md
>@@ -47,6 +27,7 @@ share/doc/chocolate-hexen/CMDLINE.hexen
> share/doc/chocolate-heretic/README.Music.md
> share/doc/chocolate-heretic/README.md
> share/doc/chocolate-hexen/CMDLINE.hexen
>+share/doc/chocolate-hexen/COPYING.md
> share/doc/chocolate-hexen/ChangeLog
> share/doc/chocolate-hexen/INSTALL.hexen
> share/doc/chocolate-hexen/NEWS.md
>@@ -54,6 +35,7 @@ share/doc/chocolate-strife/CMDLINE.strife
> share/doc/chocolate-hexen/README.Music.md
> share/doc/chocolate-hexen/README.md
> share/doc/chocolate-strife/CMDLINE.strife
>+share/doc/chocolate-strife/COPYING.md
> share/doc/chocolate-strife/ChangeLog
> share/doc/chocolate-strife/INSTALL.strife
> share/doc/chocolate-strife/NEWS.md
>@@ -61,5 +43,29 @@ share/doc/chocolate-strife/README.md
> share/doc/chocolate-strife/README.Music.md
> share/doc/chocolate-strife/README.Strife.md
> share/doc/chocolate-strife/README.md
>-share/icons/chocolate-doom.png
>-share/icons/chocolate-setup.png
>+share/icons/hicolor/128x128/apps/chocolate-doom.png
>+share/icons/hicolor/128x128/apps/chocolate-heretic.png
>+share/icons/hicolor/128x128/apps/chocolate-hexen.png
>+share/icons/hicolor/128x128/apps/chocolate-setup.png
>+share/icons/hicolor/128x128/apps/chocolate-strife.png
>+share/man/man5/chocolate-doom.cfg.5.gz
>+share/man/man5/chocolate-heretic.cfg.5.gz
>+share/man/man5/chocolate-hexen.cfg.5.gz
>+share/man/man5/chocolate-strife.cfg.5.gz
>+share/man/man5/default.cfg.5.gz
>+share/man/man5/heretic.cfg.5.gz
>+share/man/man5/hexen.cfg.5.gz
>+share/man/man5/strife.cfg.5.gz
>+share/man/man6/chocolate-doom-setup.6.gz
>+share/man/man6/chocolate-doom.6.gz
>+share/man/man6/chocolate-heretic-setup.6.gz
>+share/man/man6/chocolate-heretic.6.gz
>+share/man/man6/chocolate-hexen-setup.6.gz
>+share/man/man6/chocolate-hexen.6.gz
>+share/man/man6/chocolate-server.6.gz
>+share/man/man6/chocolate-strife-setup.6.gz
>+share/man/man6/chocolate-strife.6.gz
>+share/metainfo/org.chocolate_doom.Doom.metainfo.xml
>+share/metainfo/org.chocolate_doom.Heretic.metainfo.xml
>+share/metainfo/org.chocolate_doom.Hexen.metainfo.xml
>+share/metainfo/org.chocolate_doom.Strife.metainfo.xml

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 281630: 253718 | 253724 | 253733