Fix building a few plugins

Signed-off-by: falkTX <falktx@falktx.com>
mod-audio · Jan 8, 2024 · 415f7a7 · 415f7a7
1 parent 15a5250
commit 415f7a7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/plugins/package/screcord/01_fix-build.patch b/plugins/package/screcord/01_fix-build.patch
@@ -0,0 +1,13 @@
+diff --git a/screcord/Makefile b/screcord/Makefile
+index 584d094..95383dc 100644
+--- a/screcord/Makefile
++++ b/screcord/Makefile
+@@ -62,7 +62,7 @@
+
+ 	# set compile flags
+ 	CFLAGS += -I. -I./dsp  -fPIC -DPIC -O2 -Wall -funroll-loops `pkg-config --cflags sndfile`\
+-	-ffast-math -fomit-frame-pointer -fstrength-reduce -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS)
++	-ffast-math -fomit-frame-pointer -fstrength-reduce -fdata-sections -Wl,--gc-sections -pthread $(SSE_CFLAGS)
+ 	CXXFLAGS += -std=c++11 $(CFLAGS)
+ 	LDFLAGS += -I. -lm -shared -Llibrary -lm -fPIC -DPIC `pkg-config --libs sndfile`
+ 	ifneq ($(MACOS)$(WINDOWS),true)
diff --git a/plugins/package/shiro-plugins/shiro-plugins.mk b/plugins/package/shiro-plugins/shiro-plugins.mk
@@ -13,12 +13,13 @@ SHIRO_PLUGINS_CXXFLAGS = -std=gnu++11
 SHIRO_PLUGINS_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) NOOPT=true -C $(@D)
 
 # needed for submodules support
-SHIRO_PLUGINS_PRE_DOWNLOAD_HOOKS += MOD_PLUGIN_BUILDER_DOWNLOAD_WITH_SUBMODULES
+# SHIRO_PLUGINS_PRE_DOWNLOAD_HOOKS += MOD_PLUGIN_BUILDER_DOWNLOAD_WITH_SUBMODULES
 
 define SHIRO_PLUGINS_BUILD_CMDS
 	(cd $(@D) && \
-		[ ! -e dpf/Makefile ] && \
-		git clone https://github.com/DISTRHO/DPF.git dpf --depth=1)
+		rm -rf dpf && \
+		git clone https://github.com/DISTRHO/DPF.git dpf && \
+		git -C dpf checkout f8cd00fc49ab0e91a136d109e5478946ae936956)
 
 	$(SHIRO_PLUGINS_TARGET_MAKE)
 endef

diff --git a/...ge/zam-plugins/02_fix-win32-ttl-gen.patch → ...e/zam-plugins/02_fix-win32-ttl-gen.patchx b/...ge/zam-plugins/02_fix-win32-ttl-gen.patch → ...e/zam-plugins/02_fix-win32-ttl-gen.patchx
diff --git a/plugins/package/zam-plugins/zam-plugins.mk b/plugins/package/zam-plugins/zam-plugins.mk
@@ -13,12 +13,14 @@ ZAM_PLUGINS_CXXFLAGS = -std=gnu++11
 ZAM_PLUGINS_TARGET_MAKE = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) NOOPT=true -C $(@D)
 
 # needed for submodules support
-ZAM_PLUGINS_PRE_DOWNLOAD_HOOKS += MOD_PLUGIN_BUILDER_DOWNLOAD_WITH_SUBMODULES
+# ZAM_PLUGINS_PRE_DOWNLOAD_HOOKS += MOD_PLUGIN_BUILDER_DOWNLOAD_WITH_SUBMODULES
 
 define ZAM_PLUGINS_BUILD_CMDS
 	(cd $(@D) && \
-		[ ! -e dpf/Makefile ] && \
-		git clone https://github.com/DISTRHO/DPF.git dpf --depth=1)
+		rm -rf dpf && \
+		git clone https://github.com/DISTRHO/DPF.git dpf && \
+		git -C dpf checkout f8cd00fc49ab0e91a136d109e5478946ae936956 && \
+		patch -p1 -i $($(PKG)_PKGDIR)/02_fix-win32-ttl-gen.patchx)
 
 	$(ZAM_PLUGINS_TARGET_MAKE)
 endef