diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile index d77b65dd049..046821aae1c 100644 --- a/games/gzdoom/Makefile +++ b/games/gzdoom/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2019/12/06 17:40:23 solene Exp $ +# $OpenBSD: Makefile,v 1.11 2020/03/09 12:18:50 solene Exp $ BROKEN-i386 = various always_inline functions require sse2, but would be inlined into function 'Loop' that is compiled without support for sse2 @@ -8,13 +8,11 @@ ONLY_FOR_ARCHS = i386 amd64 COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic... -V = 4.2.4 -PKGNAME = gzdoom-${V} - +V = 4.3.3 GH_ACCOUNT = coelckers GH_PROJECT = gzdoom -GH_TAGNAME = g4.2.4 -DISTNAME = gzdoom-${GH_TAGNAME:S/g//} +GH_TAGNAME = g${V} +DISTNAME = gzdoom-${V} CATEGORIES= games diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo index 5d3a458818b..5ceb4789c87 100644 --- a/games/gzdoom/distinfo +++ b/games/gzdoom/distinfo @@ -1,2 +1,2 @@ -SHA256 (gzdoom-4.2.4.tar.gz) = DVtEH+f8RJ65NLh9kgwvdlKcMxdH60/myxzfGFRlxRw= -SIZE (gzdoom-4.2.4.tar.gz) = 13683768 +SHA256 (gzdoom-4.3.3.tar.gz) = j+a/WQcdxgPmEenoIs2KaTTMSB0KKhmNkhr4gSZmG2A= +SIZE (gzdoom-4.3.3.tar.gz) = 13704956 diff --git a/games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp b/games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp index 197a3327a82..76a732d132b 100644 --- a/games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp +++ b/games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp @@ -1,9 +1,9 @@ -$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v 1.1 2019/12/06 17:40:24 solene Exp $ +$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 -@@ -140,8 +140,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic +@@ -141,8 +141,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib" #define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib" #else // !__APPLE__ diff --git a/games/gzdoom/patches/patch-libraries_zmusic_zmusic_zmusic_h b/games/gzdoom/patches/patch-libraries_zmusic_zmusic_zmusic_h new file mode 100644 index 00000000000..0e6c1b2607d --- /dev/null +++ b/games/gzdoom/patches/patch-libraries_zmusic_zmusic_zmusic_h @@ -0,0 +1,20 @@ +$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 + #include + #include ++#include + + // 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