From 8d96c7dae538bd5c42295204a1ad537a4b21e900 Mon Sep 17 00:00:00 2001 From: Peppersawce <157759066+Peppersawce@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:39:31 +0100 Subject: [PATCH] Update prboom-plus to 2.6.66 (#11291) --- .../patches/prboom_plus-2.6.66.patchset | 44 +++++++++ .../patches/prboom_plus-2.6um.patch | 13 --- .../prboom-plus/prboom_plus-2.6.66.recipe | 90 +++++++++++++++++++ .../prboom-plus/prboom_plus-2.6um.recipe | 70 --------------- 4 files changed, 134 insertions(+), 83 deletions(-) create mode 100644 games-fps/prboom-plus/patches/prboom_plus-2.6.66.patchset delete mode 100644 games-fps/prboom-plus/patches/prboom_plus-2.6um.patch create mode 100644 games-fps/prboom-plus/prboom_plus-2.6.66.recipe delete mode 100644 games-fps/prboom-plus/prboom_plus-2.6um.recipe diff --git a/games-fps/prboom-plus/patches/prboom_plus-2.6.66.patchset b/games-fps/prboom-plus/patches/prboom_plus-2.6.66.patchset new file mode 100644 index 000000000..34b89bc0f --- /dev/null +++ b/games-fps/prboom-plus/patches/prboom_plus-2.6.66.patchset @@ -0,0 +1,44 @@ +From 9af8b16bfbb4bb2c96201671d6add490313c4bb6 Mon Sep 17 00:00:00 2001 +From: Peppersawce +Date: Thu, 31 Oct 2024 23:41:45 +0100 +Subject: Change default midi + soundfont paths for 2.6.66 + better path lookup + + +diff --git a/prboom2/src/m_misc.c b/prboom2/src/m_misc.c +index dc35ac9..6b62fca 100644 +--- a/prboom2/src/m_misc.c ++++ b/prboom2/src/m_misc.c +@@ -445,8 +445,8 @@ default_t defaults[] = + {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"fluidsynth"},UL,UL,def_str,ss_none}, + {"snd_soundfont",{NULL, &snd_soundfont},{0,"TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it + #else +- {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"sdl"},UL,UL,def_str,ss_none}, +- {"snd_soundfont",{NULL, &snd_soundfont},{0,"/usr/share/sounds/sf3/default-GM.sf3"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it ++ {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"opl2"},UL,UL,def_str,ss_none}, ++ {"snd_soundfont",{NULL, &snd_soundfont},{0,"/boot/system/data/synth/TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it + #endif + {"snd_mididev",{NULL, &snd_mididev},{0,""},UL,UL,def_str,ss_none}, // midi device to use for portmidiplayer and alsaplayer + {"lowpass_filter",{&lowpass_filter},{0},0,1, +-- +2.45.2 + +diff --git a/prboom2/src/SDL/i_system.c b/prboom2/src/SDL/i_system.c +index 2094647..c0e9163 100644 +--- a/prboom2/src/SDL/i_system.c ++++ b/prboom2/src/SDL/i_system.c +@@ -442,10 +442,8 @@ char* I_FindFileInternal(const char* wfname, const char* ext, dboolean isStatic) + {DOOMWADDIR}, // build-time configured DOOMWADDIR + {NULL, "doom", "HOME"}, // ~/doom + {NULL, NULL, "HOME"}, // ~ +- {"/usr/local/share/games/doom"}, +- {"/usr/share/games/doom"}, +- {"/usr/local/share/doom"}, +- {"/usr/share/doom"}, ++ {"/boot/home/config/non-packaged/data/doom"}, ++ {"/boot/home/config/non-packaged/data/doomdata"}, + }, *search; + + static size_t num_search; +-- +2.45.2 + diff --git a/games-fps/prboom-plus/patches/prboom_plus-2.6um.patch b/games-fps/prboom-plus/patches/prboom_plus-2.6um.patch deleted file mode 100644 index f60664666..000000000 --- a/games-fps/prboom-plus/patches/prboom_plus-2.6um.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/prboom2/src/SDL/i_system.c b/prboom2/src/SDL/i_system.c -index bf8cbce..b7ea0fb 100644 ---- a/prboom2/src/SDL/i_system.c -+++ b/prboom2/src/SDL/i_system.c -@@ -396,7 +396,7 @@ const char* I_GetTempDir(void) - // cph - V.Aguilar (5/30/99) suggested return ~/.lxdoom/, creating - // if non-existant - // cph 2006/07/23 - give prboom+ its own dir --static const char prboom_dir[] = {"/.prboom-plus"}; // Mead rem extra slash 8/21/03 -+static const char prboom_dir[] = {"/config/settings/prboom-plus"}; // Mead rem extra slash 8/21/03 - - const char *I_DoomExeDir(void) - { diff --git a/games-fps/prboom-plus/prboom_plus-2.6.66.recipe b/games-fps/prboom-plus/prboom_plus-2.6.66.recipe new file mode 100644 index 000000000..4d450600a --- /dev/null +++ b/games-fps/prboom-plus/prboom_plus-2.6.66.recipe @@ -0,0 +1,90 @@ +SUMMARY="Enhanced clone of the classic first-person shooter Doom" +DESCRIPTION="PrBoom+ is a Doom source port developed from the original PrBoom project by Andrey Budko. + +The binaries will look for .wad files (in lowercase) in: +* ~/config/non-packaged/data/prboom-plus +* ~/config/non-packaged/data/doomdata +* ~/config/non-packaged/data/doom +* ~/config/settings/prboom-plus +* ~/doom +The binaries can be also used via command-line with the -iwad command. +Example: 'prboom-plus -iwad ~/config/non-packaged/data/doom/doom.wad'" +HOMEPAGE="https://github.com/coelckers/prboom-plus" +COPYRIGHT="2016-2023 Andrey Budko et al." +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/coelckers/prboom-plus/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="4b647b4b14c3fac00711e6bf19f996bbfe37754a3b9bb5be6791f0c3fd993438" +SOURCE_DIR="prboom-plus-$portVersion" +PATCHES="prboom_plus-$portVersion.patchset" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + prboom_plus$secondaryArchSuffix = $portVersion + cmd:prboom_plus = $portVersion + cmd:prboom_plus_game_server = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix +# lib:libdumb_0.9.3$secondaryArchSuffix # Optional, required by portmidi? +# lib:libfluidsynth$secondaryArchSuffix # Optional, for Fluidsynth MIDI + lib:libmad$secondaryArchSuffix + lib:libpcreposix$secondaryArchSuffix +# lib:libportmidi$secondaryArchSuffix # Optional, related MIDI player doesn't seem to work + lib:libSDL2_2.0$secondaryArchSuffix + lib:libSDL2_image_2.0$secondaryArchSuffix + lib:libSDL2_mixer_2.0$secondaryArchSuffix + lib:libSDL2_net_2.0$secondaryArchSuffix + lib:libvorbisfile$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +# devel:libdumb$secondaryArchSuffix # Optional, required by portmidi? +# devel:libfluidsynth$secondaryArchSuffix # Optional, for Fluidsynth MIDI, not working in-game +# devel:libGL$secondaryArchSuffix # Optional? Seems unused + devel:libmad$secondaryArchSuffix # Seems to not work, makes non-opl2 MIDI fail + devel:libpcreposix$secondaryArchSuffix +# devel:libportmidi$secondaryArchSuffix # Optional, MIDI player, not working in-game + devel:libSDL2$secondaryArchSuffix + devel:libSDL2_image$secondaryArchSuffix + devel:libSDL2_mixer$secondaryArchSuffix + devel:libSDL2_net$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +defineDebugInfoPackage prboom_plus$secondaryArchSuffix \ + $prefix/bin/prboom-plus \ + $prefix/bin/prboom-plus-game-server + +BUILD() +{ + nonpackdatadir=$(finddir B_USER_NONPACKAGED_DATA_DIRECTORY) + + mkdir -p build && cd build + + cmake ../prboom2 $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_BIN="$prefix/bin" \ + -DPRBOOMDATADIR="$dataDir/prboom-plus" \ + -DDOOMWADDIR="$nonpackdatadir/prboom-plus" + + make $jobArgs +} + +INSTALL() +{ + cd build + make install +} diff --git a/games-fps/prboom-plus/prboom_plus-2.6um.recipe b/games-fps/prboom-plus/prboom_plus-2.6um.recipe deleted file mode 100644 index 457c04367..000000000 --- a/games-fps/prboom-plus/prboom_plus-2.6um.recipe +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY="Enhanced clone of the classic first-person shooter Doom" -DESCRIPTION="PrBoom+ is a Doom source port developed from the original PrBoom \ -project by Andrey Budko" -HOMEPAGE="http://prboom-plus.sourceforge.net/" -COPYRIGHT="2016 Andrey Budko et al." -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://github.com/coelckers/prboom-plus/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="fed5553509c5e7211a02d159c212c61030dbc7e8bb1ed0adfecfad573074191b" -SOURCE_DIR="prboom-plus-$portVersion" -PATCHES="prboom_plus-$portVersion.patch" - -ARCHITECTURES="all !x86_gcc2 ?x86" - -commandBinDir="$binDir/toto" -if [ "$targetArchitecture" = "x86_gcc2" ]; then - SECONDARY_ARCHITECTURES="x86" - commandBinDir="$prefix/bin" -fi - -PROVIDES=" - prboom_plus$secondaryArchSuffix = $portVersion - cmd:prboom_plus = $portVersion - cmd:prboom_plus_game_server = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libmad$secondaryArchSuffix - lib:libpcreposix$secondaryArchSuffix - lib:libSDL2_2.0$secondaryArchSuffix - lib:libSDL2_image_2.0$secondaryArchSuffix - lib:libSDL2_mixer_2.0$secondaryArchSuffix - lib:libSDL2_net_2.0$secondaryArchSuffix - lib:libvorbisfile$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libmad$secondaryArchSuffix - devel:libpcreposix$secondaryArchSuffix - devel:libSDL2$secondaryArchSuffix - devel:libSDL2_image$secondaryArchSuffix - devel:libSDL2_mixer$secondaryArchSuffix - devel:libSDL2_net$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - mkdir -p build && cd build - cmake ../prboom2 $cmakeDirArgs \ - -DCMAKE_INSTALL_BIN=$commandBinDir \ - -DDOOMWADDIR="$dataDir/prboom-plus" - make $jobArgs -} - -INSTALL() -{ - cd build - make install -}