Hi,
A bit delayed update to gzdoom. The upstream have made chopped the music
part as standalone library which I sent to ports@ earlier (audio/zmusic)
which is needed by this update.
Quickly tested on doom1 which appeared to be working.
diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports
blob - cb3a31e48d0ca9011f02eba2ddaa00f23368fa05
file + games/gzdoom/Makefile
--- games/gzdoom/Makefile
+++ games/gzdoom/Makefile
@@ -8,12 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V = 4.3.3
+V = 4.7.1
GH_ACCOUNT = coelckers
GH_PROJECT = gzdoom
GH_TAGNAME = g${V}
DISTNAME = gzdoom-${V}
-REVISION = 1
CATEGORIES= games
@@ -24,21 +23,21 @@ MAINTAINER = Timo Myyra
<[email protected]>
# GPLv3
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m mpg123
-WANTLIB += openal sndfile z
+WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
+WANTLIB += openal z zmusic
COMPILER = base-clang ports-gcc
MODULES = devel/cmake
CONFIGURE_ARGS += -DNO_GTK=ON
-CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
-CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
+CONFIGURE_ARGS += -DDYN_OPENAL=NO
+# Sync with audio/fluidsynth
+CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so.2.0"
CONFIGURE_ARGS += -DHAVE_STDINT_H=1
-LIB_DEPENDS = audio/libsndfile \
- audio/mpg123 \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ audio/zmusic \
archivers/bzip2 \
graphics/jpeg \
devel/sdl2
blob - 5ceb4789c874b9bcfcbfc5d248c1840b989c8261
file + games/gzdoom/distinfo
--- games/gzdoom/distinfo
+++ games/gzdoom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A=
-SIZE (gzdoom-4.3.3.tar.gz) = 13704956
+SHA256 (gzdoom-4.7.1.tar.gz) = RUJXWCvgV2UB7vHvyZ/n6nDxxNeZNUnbPLxwnOdfwQI=
+SIZE (gzdoom-4.7.1.tar.gz) = 19562412
blob - e3b609fb15ffa8b1f585f6348cdfd8e8fc2925d6
file + /dev/null
--- games/gzdoom/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2019/12/06 17:40:24 solene Exp $
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -271,7 +271,7 @@ else()
-
- if ( UNIX )
- include(CheckSymbolExists)
-- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
-+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h"
HAVE_FTS )
- if ( NOT HAVE_FTS )
- include ( FindPkgConfig )
- pkg_check_modules( MUSL_FTS musl-fts )
blob - 321cec48b300ed7c83b2b3b536b77a7c726a075c
file + /dev/null
--- games/gzdoom/patches/patch-libraries_glslang_glslang_Include_PoolAlloc_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libraries_glslang_glslang_Include_PoolAlloc_h,v 1.1 2020/08/06
11:11:12 edd Exp $
-
-Fix build on base Clang 10.
-
-It's the same fix as this:
-https://github.com/KhronosGroup/glslang/pull/2010/commits/24b3e8384e93f3e73b6aa14ea00a30574112f9ba
-
-Index: libraries/glslang/glslang/Include/PoolAlloc.h
---- libraries/glslang/glslang/Include/PoolAlloc.h.orig
-+++ libraries/glslang/glslang/Include/PoolAlloc.h
-@@ -304,7 +304,6 @@ class pool_allocator { (public)
- size_type max_size() const { return static_cast<size_type>(-1) /
sizeof(T); }
- size_type max_size(int size) const { return static_cast<size_type>(-1) /
size; }
-
-- void setAllocator(TPoolAllocator* a) { allocator = *a; }
- TPoolAllocator& getAllocator() const { return allocator; }
-
- protected:
blob - a11157a4eb5f6d4ae6ad466226f857d4d962e7c1
file + /dev/null
--- games/gzdoom/patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libraries_wildmidi_wildmidi_wildmidi_lib_h,v 1.1 2019/12/06
17:40:24 solene Exp $
-
-Index: libraries/wildmidi/wildmidi/wildmidi_lib.h
---- libraries/wildmidi/wildmidi/wildmidi_lib.h.orig
-+++ libraries/wildmidi/wildmidi/wildmidi_lib.h
-@@ -28,6 +28,7 @@
- #define WILDMIDI_LIB_H
-
- #include "../../music_common/fileio.h"
-+#include <stdarg.h>
-
- namespace WildMidi
- {
blob - 76a732d132b52dec88bc38c11420c00da44359c8
file + /dev/null
---
games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v
1.2 2020/03/09 12:18:50 solene Exp $
-
-Index: libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
---- libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp.orig
-+++ libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
-@@ -141,8 +141,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic
- #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib"
- #define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib"
- #else // !__APPLE__
-+#ifndef FLUIDSYNTHLIB1
- #define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
-+#endif
-+#ifndef FLUIDSYNTHLIB2
- #define FLUIDSYNTHLIB2 "libfluidsynth.so.2"
-+#endif
- #endif // __APPLE__
- #endif
-
blob - bf5d9770fa486186a538b49ede567187fa434f9d
file + /dev/null
--- games/gzdoom/patches/patch-libraries_zmusic_zmusic_mididefs_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libraries_zmusic_zmusic_mididefs_h,v 1.1 2019/12/06 17:40:24
solene Exp $
-
-Index: libraries/zmusic/zmusic/mididefs.h
---- libraries/zmusic/zmusic/mididefs.h.orig
-+++ libraries/zmusic/zmusic/mididefs.h
-@@ -1,6 +1,7 @@
- #pragma once
-
- #include <stdint.h>
-+#include <stdarg.h>
-
- enum
- {
blob - 0e6c1b2607d788703ac79a77f86be3c7444d4fe2
file + /dev/null
--- games/gzdoom/patches/patch-libraries_zmusic_zmusic_zmusic_h
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-libraries_zmusic_zmusic_zmusic_h,v 1.1 2020/03/09 12:18:50
solene Exp $
-
-Index: libraries/zmusic/zmusic/zmusic.h
---- libraries/zmusic/zmusic/zmusic.h.orig
-+++ libraries/zmusic/zmusic/zmusic.h
-@@ -4,6 +4,7 @@
- #include <stdint.h>
- #include <vector>
- #include <string>
-+#include <stdarg.h>
-
- // These constants must match the corresponding values of the Windows headers
- // to avoid readjustment in the native Windows device's playback functions
-@@ -314,4 +315,4 @@ inline bool ChangeMusicSetting(EStringConfigKey key, Z
- return ChangeMusicSettingString(key, song, value);
- }
-
--#endif
-\ No newline at end of file
-+#endif
blob - 7fc760ef7952746c62a0b3ae065c78fff3d5e669
file + games/gzdoom/patches/patch-src_CMakeLists_txt
--- games/gzdoom/patches/patch-src_CMakeLists_txt
+++ games/gzdoom/patches/patch-src_CMakeLists_txt
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.3 2019/12/06 17
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -39,6 +39,10 @@ if( NOT ZDOOM_LIBS )
+@@ -62,6 +62,10 @@ if( NOT ZDOOM_LIBS )
set( ZDOOM_LIBS "" )
endif()
@@ -14,7 +14,7 @@ Index: src/CMakeLists.txt
if( WIN32 )
if( X64 )
set( WIN_TYPE Win64 )
-@@ -386,7 +390,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int mai
+@@ -356,7 +360,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int mai
HAVE_THREAD_LOCAL)
if( NOT HAVE_THREAD_LOCAL )
blob - /dev/null
file + games/gzdoom/patches/patch-src_common_scripting_vm_vmframe_cpp
--- /dev/null
+++ games/gzdoom/patches/patch-src_common_scripting_vm_vmframe_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/common/scripting/vm/vmframe.cpp
+--- src/common/scripting/vm/vmframe.cpp.orig
++++ src/common/scripting/vm/vmframe.cpp
+@@ -45,7 +45,7 @@
+ #include "version.h"
+
+ #ifdef HAVE_VM_JIT
+-#ifdef __DragonFly__
++#ifdef __DragonFly__ || __OpenBSD__
+ CUSTOM_CVAR(Bool, vm_jit, false, CVAR_NOINITCALL)
+ #else
+ CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
blob - 99b547b328c0403fb4855a309ebf8ca9f73361ad
file + /dev/null
--- games/gzdoom/patches/patch-src_scripting_vm_vmframe_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_scripting_vm_vmframe_cpp,v 1.2 2019/06/26 07:12:04 solene
Exp $
-
-disable JIT so it's W^X compatible
-
-Index: src/scripting/vm/vmframe.cpp
---- src/scripting/vm/vmframe.cpp.orig
-+++ src/scripting/vm/vmframe.cpp
-@@ -45,7 +45,7 @@
- #include "version.h"
-
- #ifdef HAVE_VM_JIT
--CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
-+CUSTOM_CVAR(Bool, vm_jit, false, CVAR_NOINITCALL)
- {
- Printf("You must restart " GAMENAME " for this change to take
effect.\n");
- Printf("This cvar is currently not saved. You must specify it on the
command line.");
blob - b4b9a82e8bce847c2ee9b9108c6caa9f0b77f628
file + games/gzdoom/pkg/PLIST
--- games/gzdoom/pkg/PLIST
+++ games/gzdoom/pkg/PLIST
@@ -18,6 +18,12 @@ share/doc/pkg-readmes/${PKGSTEM}
share/games/
share/games/doom/
share/games/doom/brightmaps.pk3
+share/games/doom/fm_banks/
+share/games/doom/fm_banks/GENMIDI.GS.wopl
+share/games/doom/fm_banks/gs-by-papiezak-and-sneakernets.wopn
share/games/doom/game_support.pk3
+share/games/doom/game_widescreen_gfx.pk3
share/games/doom/gzdoom.pk3
share/games/doom/lights.pk3
+share/games/doom/soundfonts/
+share/games/doom/soundfonts/gzdoom.sf2
