Hi, Here's the update for games/dsda-doom from 0.28.2 to 0.29.4.
Upstream dropped dependency on audio/dumb in favor of audio/libxmp. It also changed its cmake variable naming; and moved them from prboom2/CMakeLists.txt to prboom2/cmake/DsdaOptions.cmake. Ok? -- Lucas de Sena diff /usr/ports path + /usr/ports commit - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - c2a041f0cdc8c143d97d1f5225585672bd702b90 file + games/dsda-doom/Makefile --- games/dsda-doom/Makefile +++ games/dsda-doom/Makefile @@ -1,6 +1,6 @@ COMMENT = fork of prboom+ with a focus on speedrunning -DIST_TUPLE = github kraflab dsda-doom v0.28.2 . +DIST_TUPLE = github kraflab dsda-doom v0.29.4 . CATEGORIES = games x11 MAINTAINER = Lucas de Sena <[email protected]> @@ -10,7 +10,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} WANTLIB += GL GLU SDL2 SDL2_mixer SDL2_image c fluidsynth m -WANTLIB += mad portmidi pthread ogg vorbis vorbisfile z zip +WANTLIB += mad portmidi pthread sndfile vorbisfile xmp z zip COMPILER = base-clang ports-gcc @@ -22,16 +22,13 @@ RUN_DEPENDS = devel/desktop-file-utils \ LIB_DEPENDS = archivers/libzip \ audio/fluidsynth \ audio/libmad \ + audio/libsndfile \ audio/libvorbis \ + audio/libxmp \ audio/portmidi \ devel/sdl2-mixer \ devel/sdl2-image -CONFIGURE_ARGS = -DWITH_DUMB=OFF - -MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include - DEBUG_PACKAGES = ${BUILD_PACKAGES} NO_TEST = Yes commit - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - 14123ef9c5c2d6b1c1537f4f93b486ff74d46c8f file + games/dsda-doom/distinfo --- games/dsda-doom/distinfo +++ games/dsda-doom/distinfo @@ -1,2 +1,2 @@ -SHA256 (kraflab-dsda-doom-v0.28.2.tar.gz) = XKuSJ6WrHG/e1xMhwtmuK0geje/H8E6pyiMssTuFbOY= -SIZE (kraflab-dsda-doom-v0.28.2.tar.gz) = 11118546 +SHA256 (kraflab-dsda-doom-v0.29.4.tar.gz) = +GbbeTgYYggHGGaPWCsPNYgRoBbbF2gOUHq7klCvvqU= +SIZE (kraflab-dsda-doom-v0.29.4.tar.gz) = 11128279 commit - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - 54f1bd24b98c4bbf47c97b4868c3c3fe3d338fc5 file + /dev/null --- games/dsda-doom/patches/patch-prboom2_CMakeLists_txt +++ /dev/null @@ -1,19 +0,0 @@ -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 "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 - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - /dev/null file + games/dsda-doom/patches/patch-prboom2_cmake_DsdaOptions_cmake (mode 644) --- /dev/null +++ games/dsda-doom/patches/patch-prboom2_cmake_DsdaOptions_cmake @@ -0,0 +1,19 @@ +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/cmake/DsdaOptions.cmake +--- prboom2/cmake/DsdaOptions.cmake.orig ++++ prboom2/cmake/DsdaOptions.cmake +@@ -7,7 +7,7 @@ if(WIN32) + else() + include(GNUInstallDirs) + set(default_bin_dir "${CMAKE_INSTALL_BINDIR}") +- set(default_wad_dir "${CMAKE_INSTALL_DATAROOTDIR}/games/doom") ++ set(default_wad_dir "${CMAKE_INSTALL_DATAROOTDIR}/doom") + set(default_copyright_dir "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}") + endif() + commit - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - 653c6f84e1acd9612bd33bd46b2b0c77f424d1f6 file + /dev/null --- games/dsda-doom/patches/patch-prboom2_src_CMakeLists_txt +++ /dev/null @@ -1,21 +0,0 @@ -Index: prboom2/src/CMakeLists.txt ---- prboom2/src/CMakeLists.txt.orig -+++ prboom2/src/CMakeLists.txt -@@ -547,7 +547,7 @@ function(AddGameExecutable TARGET SOURCES) - target_link_libraries(${TARGET} PRIVATE - libzip::zip - ${SDL2_LIBRARIES} -- SDL2_mixer::SDL2_mixer -+ -lSDL2_mixer - ZLIB::ZLIB - ) - -@@ -565,7 +565,7 @@ function(AddGameExecutable TARGET SOURCES) - ) - - if(HAVE_LIBSDL2_IMAGE) -- target_link_libraries(${TARGET} PRIVATE SDL2_image::SDL2_image) -+ target_link_libraries(${TARGET} PRIVATE -lSDL2_image) - endif() - - if(HAVE_LIBMAD) commit - 467a6744d93cdea0f9e50914b65a92ed6b7df88e blob - 531f7de2e8061ecbac9ccc4954258884e64924e6 file + games/dsda-doom/pkg/PLIST --- games/dsda-doom/pkg/PLIST +++ games/dsda-doom/pkg/PLIST @@ -1,4 +1,5 @@ @bin bin/dsda-doom +share/applications/ share/applications/dsda-doom.desktop share/doc/dsda-doom/ share/doc/dsda-doom/COPYING @@ -38,8 +39,13 @@ 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/doc/dsda-doom/patch_notes/v0.29.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
