cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gzdoom-4.2.4

Browse Source 
Thanks maintainer Timo Myyra for the patches work and the update
This commit is contained in:
solene 2019-12-06 17:40:23 +00:00
parent 4b5b13b6ac
commit 3540024dad
10 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
games/gzdoom/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:19 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2019/12/06 17:40:23 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,10 +8,13 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic...
V = 4.1.2
V = 4.2.4
PKGNAME = gzdoom-${V}
DISTNAME = gzdoom-src-g${V}
REVISION = 0
GH_ACCOUNT = coelckers
GH_PROJECT = gzdoom
GH_TAGNAME = g4.2.4
DISTNAME = gzdoom-${GH_TAGNAME:S/g//}
CATEGORIES= games
@ -19,9 +22,6 @@ HOMEPAGE = https://zdoom.org
MAINTAINER = Timo Myyra <timo.myyra@bittivirhe.fi>
MASTER_SITES = https://zdoom.org/files/gzdoom/src/
EXTRACT_SUFX = .zip
# GPLv3
PERMIT_PACKAGE = Yes
@ -35,6 +35,7 @@ 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 += -DHAVE_STDINT_H=1
LIB_DEPENDS = audio/mpg123 \
audio/openal \
@ -45,6 +46,4 @@ LIB_DEPENDS = audio/mpg123 \
NO_TEST = Yes
WRKDIST = ${WRKDIR}/gzdoom-g${V}
.include <bsd.port.mk>

4
games/gzdoom/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gzdoom-src-g4.1.2.zip) = PlpypHGf8jEBwTGL+dSlZ0rWgj9s4GfDC/J/nuS1uPY=
SIZE (gzdoom-src-g4.1.2.zip) = 15297100
SHA256 (gzdoom-4.2.4.tar.gz) = DVtEH+f8RJ65NLh9kgwvdlKcMxdH60/myxzfGFRlxRw=
SIZE (gzdoom-4.2.4.tar.gz) = 13683768

14
games/gzdoom/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,14 @@
$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 )

13
games/gzdoom/patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h Normal file
View File

@ -0,0 +1,13 @@
$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
{

18
games/gzdoom/patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp,v 1.1 2019/12/06 17:40:24 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
#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

13
games/gzdoom/patches/patch-libraries_zmusic_zmusic_mididefs_h Normal file
View File

@ -0,0 +1,13 @@
$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
{

23
games/gzdoom/patches/patch-src_CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2019/06/26 07:12:04 solene Exp $
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2019/12/06 17:40:24 solene Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -44,6 +44,10 @@ if( NOT ZDOOM_LIBS )
@@ -39,6 +39,10 @@ if( NOT ZDOOM_LIBS )
set( ZDOOM_LIBS "" )
endif()
@ -14,17 +14,12 @@ Index: src/CMakeLists.txt
if( WIN32 )
if( X64 )
set( WIN_TYPE Win64 )
@@ -1369,7 +1373,13 @@ if( UNIX )
endif()
@@ -386,7 +390,7 @@ CHECK_CXX_SOURCE_COMPILES("thread_local int i; int mai
HAVE_THREAD_LOCAL)
if( NOT HAVE_THREAD_LOCAL )
- message( SEND_ERROR "C++ compiler doesn't support thread_local storage duration specifier" )
+ message( STATUS "C++ compiler doesn't support thread_local storage duration specifier" )
endif()
+find_package( Backtrace )
+if(Backtrace_FOUND)
+ set( ZDOOM_LIBS ${ZDOOM_LIBS} ${Backtrace_LIBRARIES} )
+endif()
+
target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
+
include_directories( .
g_statusbar
# Check for functions that may or may not exist.

17
games/gzdoom/patches/patch-src_gamedata_textures_animations_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_gamedata_textures_animations_cpp,v 1.1 2019/06/26 07:12:04 solene Exp $
backport fix as noted by David Carlier:
https://github.com/coelckers/gzdoom/commit/57a0a4c06635783ff6f48874b131e95fe9ab35c8
Index: src/gamedata/textures/animations.cpp
--- src/gamedata/textures/animations.cpp.orig
+++ src/gamedata/textures/animations.cpp
@@ -73,7 +73,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim)
if (mAnimations[i]->BasePic == anim->BasePic)
{
// Found one!
- free (mAnimations[i]);
+ M_Free (mAnimations[i]);
mAnimations[i] = anim;
return anim;
}

35
games/gzdoom/patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp,v 1.2 2019/06/26 07:12:04 solene Exp $
Index: src/sound/mididevices/music_fluidsynth_mididevice.cpp
--- src/sound/mididevices/music_fluidsynth_mididevice.cpp.orig
+++ src/sound/mididevices/music_fluidsynth_mididevice.cpp
@@ -50,12 +50,11 @@
// do this without including windows.h for this one single prototype
extern "C" unsigned __stdcall GetSystemDirectoryA(char *lpBuffer, unsigned uSize);
+#ifndef FLUIDSYNTHLIB1
#ifndef _M_X64
#define FLUIDSYNTHLIB1 "fluidsynth.dll"
-#define FLUIDSYNTHLIB2 "libfluidsynth.dll"
#else
#define FLUIDSYNTHLIB1 "fluidsynth64.dll"
-#define FLUIDSYNTHLIB2 "libfluidsynth64.dll"
#endif
#else
#include <dlfcn.h>
@@ -65,6 +64,15 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char
#else // !__APPLE__
#define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
#endif // __APPLE__
+#endif
+#endif
+
+#ifndef FLUIDSYNTHLIB2
+#ifndef _M_X64
+#define FLUIDSYNTHLIB2 "libfluidsynth.dll"
+#else
+#define FLUIDSYNTHLIB2 "libfluidsynth64.dll"
+#endif
#endif
#define FLUID_REVERB_DEFAULT_ROOMSIZE 0.2f

6
games/gzdoom/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/06 09:32:21 solene Exp $
@comment $OpenBSD: PLIST,v 1.2 2019/12/06 17:40:24 solene Exp $
@bin bin/gzdoom
share/doc/gzdoom/
share/doc/gzdoom/console.css
@ -7,17 +7,17 @@ share/doc/gzdoom/licenses/
share/doc/gzdoom/licenses/README.TXT
share/doc/gzdoom/licenses/bsd.txt
share/doc/gzdoom/licenses/bzip2.txt
share/doc/gzdoom/licenses/cephes.txt
share/doc/gzdoom/licenses/dumb.txt
share/doc/gzdoom/licenses/fxaa.txt
share/doc/gzdoom/licenses/gdtoa.txt
share/doc/gzdoom/licenses/gpl.txt
share/doc/gzdoom/licenses/lgpl.txt
share/doc/gzdoom/rh-log.txt
share/doc/gzdoom/skins.txt
share/doc/pkg-readmes/${PKGSTEM}
share/games/
share/games/doom/
share/games/doom/brightmaps.pk3
share/games/doom/game_support.pk3
share/games/doom/gzdoom.pk3
share/games/doom/lights.pk3
share/games/doom/zd_extra.pk3