Update to latest games/dsda-doom release. Built and tested on amd64.
Since fluidsynth v2.0 has been ported, this patch builds dsda-doom with
it as library dependency.
Icons and desktop shortcut are now installed; so desktop-file-utils and
gtk4-update-icon-cache are added as runtime dependencies.
One patch is no longer needed. I added a comment to the other patch.
Ok?
--
Lucas de Sena
diff /usr/ports
path + /usr/ports
commit - a91838b3ba5abf98d9d10c5ca7d5eeb25f1ee043
blob - 7f6da8f601da4692dfaf1d466464e9e396572b1d
file + games/dsda-doom/Makefile
--- games/dsda-doom/Makefile
+++ games/dsda-doom/Makefile
@@ -1,9 +1,6 @@
COMMENT = fork of prboom+ with a focus on speedrunning
-GH_ACCOUNT = kraflab
-GH_PROJECT = dsda-doom
-GH_TAGNAME = v0.26.2
-REVISION = 0
+DIST_TUPLE = github kraflab dsda-doom v0.28.2 .
CATEGORIES = games x11
MAINTAINER = Lucas de Sena <lu...@seninha.org>
@@ -11,23 +8,26 @@ MAINTAINER = Lucas de Sena <lu...@seninha.org>
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL2 SDL2_mixer SDL2_image ${COMPILER_LIBCXX}
-WANTLIB += c m mad portmidi pthread ogg vorbis vorbisfile z zip
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += GL GLU SDL2 SDL2_mixer SDL2_image c fluidsynth m
+WANTLIB += mad portmidi pthread ogg vorbis vorbisfile z zip
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+4,-guic
+
LIB_DEPENDS = archivers/libzip \
+ audio/fluidsynth \
audio/libmad \
audio/libvorbis \
audio/portmidi \
devel/sdl2-mixer \
devel/sdl2-image
-# requires fluidsynth v2.0, currently we have 1.x
-CONFIGURE_ARGS = -DWITH_DUMB=OFF \
- -DWITH_FLUIDSYNTH=OFF
+CONFIGURE_ARGS = -DWITH_DUMB=OFF
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
commit - a91838b3ba5abf98d9d10c5ca7d5eeb25f1ee043
blob - 2527823861df8bae6ad685de93718adbee09f2a9
file + games/dsda-doom/distinfo
--- games/dsda-doom/distinfo
+++ games/dsda-doom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dsda-doom-0.26.2.tar.gz) = +fdhJbn/tb6Y3hdfHpg5tPVj0BE+2+IcTrsEjacUsdI=
-SIZE (dsda-doom-0.26.2.tar.gz) = 5654779
+SHA256 (kraflab-dsda-doom-v0.28.2.tar.gz) =
XKuSJ6WrHG/e1xMhwtmuK0geje/H8E6pyiMssTuFbOY=
+SIZE (kraflab-dsda-doom-v0.28.2.tar.gz) = 11118546
commit - a91838b3ba5abf98d9d10c5ca7d5eeb25f1ee043
blob - cc4a1b069d4d51135d2f2b816f5cca3ebd67d9a7
file + games/dsda-doom/patches/patch-prboom2_CMakeLists_txt
--- games/dsda-doom/patches/patch-prboom2_CMakeLists_txt
+++ games/dsda-doom/patches/patch-prboom2_CMakeLists_txt
@@ -1,11 +1,19 @@
---- prboom2/CMakeLists.txt.orig Sat Jun 10 20:04:25 2023
-+++ prboom2/CMakeLists.txt Sat Jun 10 20:04:46 2023
+Ports that provide DOOM data files (WADs), like games/doomdata (with
+shareware game data) and games/freedoom (with free game data), install
+them at /usr/local/share/doom/.
+
+Ports for other DOOM engines, like games/crispy-doom, also expect WADs
+to be there.
+
+Index: prboom2/CMakeLists.txt
+--- prboom2/CMakeLists.txt.orig
++++ prboom2/CMakeLists.txt
@@ -167,7 +167,7 @@ endif()
if(WIN32)
set(DEFAULT_WAD_DIR ".")
else()
-- set(DEFAULT_WAD_DIR "${CMAKE_INSTALL_DATADIR}/games/doom")
-+ set(DEFAULT_WAD_DIR "${CMAKE_INSTALL_DATADIR}/doom")
+- set(DEFAULT_WAD_DIR "share/games/doom")
++ set(DEFAULT_WAD_DIR "share/doom")
endif()
set(DSDAPWADDIR "${DEFAULT_WAD_DIR}" CACHE STRING "Path to install DSDA-Doom
internal WAD, relative to CMAKE_INSTALL_PREFIX or absolute.")
commit - a91838b3ba5abf98d9d10c5ca7d5eeb25f1ee043
blob - b17d4e1f46b41c72696d8db2dada7a8c104cf37b
file + games/dsda-doom/pkg/PLIST
--- games/dsda-doom/pkg/PLIST
+++ games/dsda-doom/pkg/PLIST
@@ -1,5 +1,8 @@
@bin bin/dsda-doom
+share/applications/
+share/applications/dsda-doom.desktop
share/doc/dsda-doom/
+share/doc/dsda-doom/COPYING
share/doc/dsda-doom/README.md
share/doc/dsda-doom/docs/
share/doc/dsda-doom/docs/color_range.md
@@ -14,7 +17,9 @@ share/doc/dsda-doom/docs/guides/building_on_windows.md
share/doc/dsda-doom/docs/guides/console.md
share/doc/dsda-doom/docs/hud.md
share/doc/dsda-doom/docs/mapinfo.md
+share/doc/dsda-doom/docs/sndinfo.md
share/doc/dsda-doom/docs/text_color.md
+share/doc/dsda-doom/docs/things_and_specials.md
share/doc/dsda-doom/docs/udmf.md
share/doc/dsda-doom/patch_notes/
share/doc/dsda-doom/patch_notes/old.md
@@ -32,5 +37,14 @@ share/doc/dsda-doom/patch_notes/v0.23.md
share/doc/dsda-doom/patch_notes/v0.24.md
share/doc/dsda-doom/patch_notes/v0.25.md
share/doc/dsda-doom/patch_notes/v0.26.md
+share/doc/dsda-doom/patch_notes/v0.27.md
+share/doc/dsda-doom/patch_notes/v0.28.md
share/doom/
share/doom/dsda-doom.wad
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/dsda-doom.svg
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
