Skip to content

Commit 2c27994

Browse files
committed
Update DPF
Signed-off-by: falkTX <falktx@falktx.com>
1 parent ccb87c7 commit 2c27994

File tree

2 files changed

+45
-13
lines changed

2 files changed

+45
-13
lines changed

dpf/Makefile.base.mk

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ features:
838838
# Extra rules for MOD Audio stuff
839839

840840
# NOTE: path must be absolute
841-
MOD_WORKDIR ?= $(HOME)/mod-workdir
841+
WORKDIR ?= $(HOME)/mod-workdir
842842
MOD_ENVIRONMENT = \
843843
AR=${1}/host/usr/bin/${2}-gcc-ar \
844844
CC=${1}/host/usr/bin/${2}-gcc \
@@ -858,49 +858,57 @@ MOD_ENVIRONMENT = \
858858
MOD_BUILD=true \
859859
NOOPT=true
860860

861+
darkglass-anagram:
862+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/darkglass-anagram,aarch64-modaudio.generic-linux-gnu,aarch64)
863+
861864
modduo:
862-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm)
865+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm)
863866

864867
modduo-new:
865-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-new,arm-modaudio-linux-gnueabihf,arm)
868+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduo-new,arm-modaudio-linux-gnueabihf,arm)
866869

867870
modduox:
868-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64)
871+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64)
869872

870873
modduox-new:
871-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-new,aarch64-modaudio-linux-gnueabi,aarch64)
874+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduox-new,aarch64-modaudio-linux-gnueabi,aarch64)
872875

873876
moddwarf:
874-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64)
877+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64)
875878

876879
moddwarf-new:
877-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf-new,aarch64-modaudio-linux-gnu,aarch64)
880+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/moddwarf-new,aarch64-modaudio-linux-gnu,aarch64)
878881

879882
modpush:
880883
tar -C bin -chz $(subst bin/,,$(wildcard bin/*.lv2)) | base64 | curl -F 'package=@-' http://192.168.51.1/sdk/install && echo
881884

885+
ifneq (,$(findstring darkglass-anagram-,$(MAKECMDGOALS)))
886+
$(MAKECMDGOALS):
887+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/darkglass-anagram,aarch64-modaudio.generic-linux-gnu,aarch64) $(subst darkglass-anagram-,,$(MAKECMDGOALS))
888+
endif
889+
882890
ifneq (,$(findstring modduo-new-,$(MAKECMDGOALS)))
883891
$(MAKECMDGOALS):
884-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-new,arm-modaudio-linux-gnueabihf,arm) $(subst modduo-new-,,$(MAKECMDGOALS))
892+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduo-new,arm-modaudio-linux-gnueabihf,arm) $(subst modduo-new-,,$(MAKECMDGOALS))
885893
else ifneq (,$(findstring modduo-,$(filter-out modduo-new,$(MAKECMDGOALS))))
886894
$(MAKECMDGOALS):
887-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm) $(subst modduo-,,$(MAKECMDGOALS))
895+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduo-static,arm-mod-linux-gnueabihf.static,arm) $(subst modduo-,,$(MAKECMDGOALS))
888896
endif
889897

890898
ifneq (,$(findstring modduox-new-,$(MAKECMDGOALS)))
891899
$(MAKECMDGOALS):
892-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-new,aarch64-modaudio-linux-gnueabi,aarch64) $(subst modduox-new-,,$(MAKECMDGOALS))
900+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduox-new,aarch64-modaudio-linux-gnueabi,aarch64) $(subst modduox-new-,,$(MAKECMDGOALS))
893901
else ifneq (,$(findstring modduox-,$(filter-out modduox-new,$(MAKECMDGOALS))))
894902
$(MAKECMDGOALS):
895-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64) $(subst modduox-,,$(MAKECMDGOALS))
903+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/modduox-static,aarch64-mod-linux-gnueabi.static,aarch64) $(subst modduox-,,$(MAKECMDGOALS))
896904
endif
897905

898906
ifneq (,$(findstring moddwarf-new-,$(MAKECMDGOALS)))
899907
$(MAKECMDGOALS):
900-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf-new,aarch64-modaudio-linux-gnu,aarch64) $(subst moddwarf-new-,,$(MAKECMDGOALS))
908+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/moddwarf-new,aarch64-modaudio-linux-gnu,aarch64) $(subst moddwarf-new-,,$(MAKECMDGOALS))
901909
else ifneq (,$(findstring moddwarf-,$(filter-out moddwarf-new,$(MAKECMDGOALS))))
902910
$(MAKECMDGOALS):
903-
$(MAKE) $(call MOD_ENVIRONMENT,$(MOD_WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64) $(subst moddwarf-,,$(MAKECMDGOALS))
911+
$(MAKE) $(call MOD_ENVIRONMENT,$(WORKDIR)/moddwarf,aarch64-mod-linux-gnu,aarch64) $(subst moddwarf-,,$(MAKECMDGOALS))
904912
endif
905913

906914
# ---------------------------------------------------------------------------------------------------------------------

dpf/utils/valgrind-dpf.supp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,27 @@
9393
fun:fftwf_plan_dft_r2c_1d
9494
...
9595
}
96+
{
97+
leak in fftw plan
98+
Memcheck:Leak
99+
fun:malloc
100+
fun:fftwf_malloc_plain
101+
...
102+
fun:fftwf_mkapiplan
103+
fun:fftwf_plan_many_r2r
104+
fun:fftwf_plan_r2r
105+
fun:fftwf_plan_r2r_1d
106+
...
107+
}
108+
{
109+
leak in fftw plan
110+
Memcheck:Leak
111+
fun:memalign
112+
fun:fftwf_malloc_plain
113+
...
114+
fun:fftwf_mkapiplan
115+
fun:fftwf_plan_many_r2r
116+
fun:fftwf_plan_r2r
117+
fun:fftwf_plan_r2r_1d
118+
...
119+
}

0 commit comments

Comments
 (0)