From 03e3dbcd5dcd94f822b6a5168d02b75f594a8b16 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 29 Dec 2024 22:43:27 +0100 Subject: [PATCH] Update libmodla Signed-off-by: falkTX --- bootstrap.sh | 1 + plugins-dep/package/libmodla/libmodla.mk | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 45fc172f..0902c4c4 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -220,6 +220,7 @@ if [ "${BUILDTARGET}" = "blackmirror" ]; then ${BR2_MAKE} dbus ${BR2_MAKE} libdrm ${BR2_MAKE} libinput + env PABLITO=y ${BR2_MAKE} libmodla ${BR2_MAKE} libserialport ${BR2_MAKE} lilv ${BR2_MAKE} kxstudio-lv2-extensions diff --git a/plugins-dep/package/libmodla/libmodla.mk b/plugins-dep/package/libmodla/libmodla.mk index d71fc9ad..ba147b21 100644 --- a/plugins-dep/package/libmodla/libmodla.mk +++ b/plugins-dep/package/libmodla/libmodla.mk @@ -4,7 +4,9 @@ # ###################################### -ifdef BR2_cortex_a53 +ifeq ($(PABLITO),y) +LIBMODLA_SOURCE_SUFFIX = pablito +else ifdef BR2_cortex_a53 LIBMODLA_SOURCE_SUFFIX = aarch64-a53 else ifdef BR2_cortex_a35 LIBMODLA_SOURCE_SUFFIX = aarch64-a35 @@ -12,13 +14,15 @@ else LIBMODLA_SOURCE_SUFFIX = arm-a7 endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GCC_9),y) +ifeq ($(filter arm-% aarch64-%,$(LIBMODLA_SOURCE_SUFFIX)),) +# nothing here +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GCC_9),y) LIBMODLA_SOURCE_EXTRA_SUFFIX = -gcc9 else ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBMODLA_SOURCE_EXTRA_SUFFIX = -gcc7 endif -LIBMODLA_VERSION = v1.2.3 +LIBMODLA_VERSION = v1.3.0 LIBMODLA_SITE = https://download.mod.audio/shared LIBMODLA_SOURCE = libmodla-$(LIBMODLA_VERSION)-$(LIBMODLA_SOURCE_SUFFIX)$(LIBMODLA_SOURCE_EXTRA_SUFFIX).tar.gz LIBMODLA_INSTALL_STAGING = YES