diff options
| author | Tony Theodore <tonyt@logyst.com> | 2019-09-14 02:17:44 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2019-09-14 02:17:44 (GMT) |
| commit | 08544fd3f2d06c25cf9879edf4dde08ace00b1d8 (patch) | |
| tree | 7c19345ad3bbfd04723c2b1f890947a9efbddd6c /src | |
| parent | 79f5940bff77f4c97a88544986406ac0d8b058cd (diff) | |
| download | mxe-08544fd3f2d06c25cf9879edf4dde08ace00b1d8.zip mxe-08544fd3f2d06c25cf9879edf4dde08ace00b1d8.tar.gz mxe-08544fd3f2d06c25cf9879edf4dde08ace00b1d8.tar.bz2 | |
fluisynth: add mman-win32 dependency
fixes #2399
Diffstat (limited to 'src')
| -rw-r--r-- | src/fluidsynth-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/fluidsynth.mk | 2 |
2 files changed, 26 insertions, 3 deletions
diff --git a/src/fluidsynth-1-fixes.patch b/src/fluidsynth-1-fixes.patch index 178025e..f22fa0c 100644 --- a/src/fluidsynth-1-fixes.patch +++ b/src/fluidsynth-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sun, 8 Sep 2019 18:22:33 +1000 -Subject: [PATCH 1/2] Allow optional build of bins, docs, and tests +Subject: [PATCH 1/3] Allow optional build of bins, docs, and tests diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -98,7 +98,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Sun, 8 Sep 2019 18:24:56 +1000 -Subject: [PATCH 2/2] Set *.pc libs/requires based on detected features +Subject: [PATCH 2/3] Set *.pc libs/requires based on detected features diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -171,3 +171,26 @@ index 1111111..2222222 100644 +Requires: @PC_REQUIRES@ +Libs: -L${libdir} -lfluidsynth @PC_LIBS@ Cflags: -I${includedir} + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Sat, 14 Sep 2019 12:09:14 +1000 +Subject: [PATCH 3/3] use detected mman libs + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -261,6 +261,11 @@ if ( WIN32 ) + if ( MINGW ) + set ( MINGW32 1 ) + add_compile_options ( -mms-bitfields ) ++ # mman-win32 ++ if ( HAVE_SYS_MMAN_H ) ++ set ( WINDOWS_LIBS "${WINDOWS_LIBS};mman" ) ++ set ( PC_LIBS "${PC_LIBS} -lmman" ) ++ endif () + endif ( MINGW ) + else ( WIN32 ) + # Check PThreads, but not in Windows diff --git a/src/fluidsynth.mk b/src/fluidsynth.mk index 2417be1..f17bbf3 100644 --- a/src/fluidsynth.mk +++ b/src/fluidsynth.mk @@ -7,7 +7,7 @@ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.6 $(PKG)_CHECKSUM := e97e63c1045e102465f1aa848f9d712c5528c58685b8d40062e4aaf6af7edb75 $(PKG)_GH_CONF := FluidSynth/fluidsynth/tags,v -$(PKG)_DEPS := cc dbus glib jack libsndfile portaudio +$(PKG)_DEPS := cc dbus glib jack libsndfile mman-win32 portaudio define $(PKG)_BUILD cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \ |