From 95dfd15831e730104c5c6060b3f6ccbfc96cf7cd Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 21 Oct 2025 13:43:14 +0200 Subject: [PATCH] contrib: fluidlite: update to a newer build that support CMake 4 --- ...LUIDLITE_STATIC-define-when-using-th.patch | 23 +++++++++++++++++++ contrib/src/fluidlite/rules.mak | 8 +++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 contrib/src/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch diff --git a/contrib/src/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch b/contrib/src/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch new file mode 100644 index 0000000000..edd06b0956 --- /dev/null +++ b/contrib/src/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch @@ -0,0 +1,23 @@ +From 983eac30575d93ce81505c3d0c8ac38f183f4d8c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Wed, 22 Oct 2025 08:06:40 +0200 +Subject: [PATCH] pkg-config: add FLUIDLITE_STATIC define when using the static + library + +--- + fluidlite.pc.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fluidlite.pc.in b/fluidlite.pc.in +index 33b41ca..6a689ef 100644 +--- a/fluidlite.pc.in ++++ b/fluidlite.pc.in +@@ -10,4 +10,5 @@ Version: @fluidlite_VERSION@ + Libs: -L${libdir} -lfluidlite + Libs.private: @PC_LIBS@ + Cflags: -I${includedir} ++Cflags.private: -DFLUIDLITE_STATIC + Requires.private: @PC_REQUIRES@ +-- +2.45.1.windows.1 + diff --git a/contrib/src/fluidlite/rules.mak b/contrib/src/fluidlite/rules.mak index aabc01f279..4619c0aa05 100644 --- a/contrib/src/fluidlite/rules.mak +++ b/contrib/src/fluidlite/rules.mak @@ -1,7 +1,7 @@ # fluidlite FLUID_GITURL := $(GITHUB)/divideconcept/FluidLite.git -FLUID_HASH := 238997654efb20e736512847f3f5f6d618de9423 +FLUID_HASH := b0f187b404e393ee0a495b277154d55d7d03cbeb ifdef HAVE_WIN32 PKGS += fluidlite @@ -22,13 +22,13 @@ DEPS_fluidlite = ogg $(DEPS_ogg) fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite $(UNPACK) + $(APPLY) $(SRC)/fluidlite/0001-pkg-config-add-FLUIDLITE_STATIC-define-when-using-th.patch + $(call pkg_static,"fluidlite.pc.in") $(MOVE) -FLUIDLITE_CONF := -DFLUIDLITE_BUILD_SHARED=OFF - .fluidlite: fluidlite toolchain.cmake $(CMAKECLEAN) - $(HOSTVARS_CMAKE) $(CMAKE) $(FLUIDLITE_CONF) + $(HOSTVARS_CMAKE) $(CMAKE) +$(CMAKEBUILD) $(CMAKEINSTALL) touch $@