Re: [update] gzdoom-4.3.3

Solene Rapenne <solene@perso.pw> writes:

> On Fri, Feb 28, 2020 at 08:51:45AM +0200, Timo Myyrä wrote:
>
>> Hi,
>>
>> Here's an update to latest gzdoom, hopefully I got the patch right.
>> Slightly playtested on amd64.
>>
>> timo
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/games/gzdoom/Makefile,v
>> retrieving revision 1.10
>> diff -u -p -u -p -r1.10 Makefile
>> --- Makefile 6 Dec 2019 17:40:23 -0000 1.10
>> +++ Makefile 28 Feb 2020 06:49:15 -0000
>> @@ -8,12 +8,12 @@ ONLY_FOR_ARCHS = i386 amd64
>>
>> COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic...
>>
>> -V = 4.2.4
>> +V = 4.3.3
>> PKGNAME = gzdoom-${V}
>>
>> GH_ACCOUNT = coelckers
>> GH_PROJECT = gzdoom
>> -GH_TAGNAME = g4.2.4
>> +GH_TAGNAME = g4.3.3
>> DISTNAME = gzdoom-${GH_TAGNAME:S/g//}
>>
>> CATEGORIES= games
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/games/gzdoom/distinfo,v
>> retrieving revision 1.4
>> diff -u -p -u -p -r1.4 distinfo
>> --- distinfo 6 Dec 2019 17:40:23 -0000 1.4
>> +++ distinfo 28 Feb 2020 06:49:15 -0000
>> @@ -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
>> Index: patches/patch-CMakeLists_txt
>> ===================================================================
>> RCS file: patches/patch-CMakeLists_txt
>> diff -N patches/patch-CMakeLists_txt
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-CMakeLists_txt 28 Feb 2020 06:49:15 -0000
>> @@ -0,0 +1,14 @@
>> +$OpenBSD$
>> +
>> +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 )
>> Index: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> ===================================================================
>> RCS file: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> diff -N patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h 28 Feb 2020 06:49:15 -0000
>> @@ -0,0 +1,13 @@
>> +$OpenBSD$
>> +
>> +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
>> + {
>> Index: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> ===================================================================
>> RCS file: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> diff -N patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp 28 Feb 2020 06:49:15 -0000
>> @@ -0,0 +1,18 @@
>> +$OpenBSD$
>> +
>> +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"
>> ++