From 82da704c6f16683413975c97449eb045f867b252 Mon Sep 17 00:00:00 2001 From: Yorick Hardy Date: Sat, 2 Nov 2019 16:52:33 +0200 Subject: [PATCH] jfsw-git: add patch to fix fluidsynth version check --- jfsw-git/distinfo | 1 + .../patch-jfaudiolib_src_driver_fluidsynth.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 jfsw-git/patches/patch-jfaudiolib_src_driver_fluidsynth.c diff --git a/jfsw-git/distinfo b/jfsw-git/distinfo index e639924b1e..e929f2f328 100644 --- a/jfsw-git/distinfo +++ b/jfsw-git/distinfo @@ -1,6 +1,7 @@ $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 diff --git a/jfsw-git/patches/patch-jfaudiolib_src_driver_fluidsynth.c b/jfsw-git/patches/patch-jfaudiolib_src_driver_fluidsynth.c new file mode 100644 index 0000000000..5ac3d63a3b --- /dev/null +++ b/jfsw-git/patches/patch-jfaudiolib_src_driver_fluidsynth.c @@ -0,0 +1,17 @@ +$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 + + #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 +