Stuart Henderson <[email protected]> writes:
> On 2020/02/28 08:51, 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//}
>
> Why not do this to simplify things?
>
> V = 4.3.3
> GH_ACCOUNT = coelckers
> GH_PROJECT = gzdoom
> GH_TAGNAME = g${V}
> DISTNAME = gzdoom-${V}
>
> (no need for a separate PKGNAME)
I see no reason not to clean it up, here's revised diff.
Also tested that saved games from previous version still work.
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 19:44:56 -0000
@@ -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
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 19:44:56 -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-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
===================================================================
RCS file:
/cvs/ports/games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
--- patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
6 Dec 2019 17:40:24 -0000 1.1
+++ patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
28 Feb 2020 19:44:56 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-libraries_zmusic_mididev
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__
Index: patches/patch-libraries_zmusic_zmusic_zmusic_h
===================================================================
RCS file: patches/patch-libraries_zmusic_zmusic_zmusic_h
diff -N patches/patch-libraries_zmusic_zmusic_zmusic_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_zmusic_zmusic_zmusic_h 28 Feb 2020 19:44:56
-0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+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
