rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jfsw-git: fix build 

perl is now required for the build, and the fluidsynth error
has been fixed upstream.
This commit is contained in:
Yorick Hardy 2020-12-24 13:46:40 +02:00
parent 8f7db7dfe2
commit 94a2196666
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jfsw-git/Makefile
View File

@ -10,7 +10,7 @@ COMMENT= JonoF's Shadow Warrior port
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/jfsw
USE_TOOLS+= gmake pkg-config
USE_TOOLS+= gmake perl pkg-config
USE_LANGUAGES= c c++
BUILD_MAKE_FLAGS+= LDFLAGS="${X11_LDFLAGS}"

1
jfsw-git/distinfo
View File

@ -1,7 +1,6 @@
$NetBSD$
SHA1 (patch-Makefile) = db3fd5a59a90857800818217d823baa440459cc8
SHA1 (patch-jfaudiolib_src_driver_fluidsynth.c) = cb104d3584c629104578d071f794fd728748fbc1
SHA1 (patch-jfbuild_Makefile.shared) = b7f15a87d4a391678f38cb623376e89d1d3d5a18
SHA1 (patch-jfbuild_include_compat.h) = 8d398f00aebb8724d50bc0f818b429ef235989db
SHA1 (patch-jfbuild_src_mmulti.c) = eccf5b7c753a88a1a38c8aacf1689a182c6f1e7e

17
jfsw-git/patches/patch-jfaudiolib_src_driver_fluidsynth.c
View File

@ -1,17 +0,0 @@
$NetBSD$
Fix the test for the fluidsynth version.
--- jfaudiolib/src/driver_fluidsynth.c.orig 2018-12-18 11:55:00.000000000 +0000
+++ jfaudiolib/src/driver_fluidsynth.c
@@ -36,8 +36,8 @@
#include <glob.h>
#if ((FLUIDSYNTH_VERSION_MAJOR < 1) || \
- (FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR < 1) || \
- (FLUIDSYNTH_VERSION_MAJOR >= 1 && FLUIDSYNTH_VERSION_MINOR >= 1 && FLUIDSYNTH_VERSION_MICRO < 2))
+ (FLUIDSYNTH_VERSION_MAJOR == 1 && FLUIDSYNTH_VERSION_MINOR < 1) || \
+ (FLUIDSYNTH_VERSION_MAJOR == 1 && FLUIDSYNTH_VERSION_MINOR == 1 && FLUIDSYNTH_VERSION_MICRO < 2))
#error "FluidSynth support requires version 1.1.2 or better"
#endif