From 088e42edfe989382a0e038e00bf6157ce23e6b93 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 25 Apr 2022 00:09:42 +0100 Subject: [PATCH] Fix libsndfile missing mp3 support Signed-off-by: falkTX --- sources/libs/kxstudio-build-scripts/debian/changelog | 6 ++++++ sources/libs/kxstudio-build-scripts/kxstudio.mk | 6 ++++++ sources/libs/libsndfile-static/debian/changelog | 6 ++++++ sources/libs/libsndfile-static/debian/control | 5 +++-- sources/libs/libsndfile-static/debian/rules | 1 + 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sources/libs/kxstudio-build-scripts/debian/changelog b/sources/libs/kxstudio-build-scripts/debian/changelog index 51832eb..edd97bb 100644 --- a/sources/libs/kxstudio-build-scripts/debian/changelog +++ b/sources/libs/kxstudio-build-scripts/debian/changelog @@ -1,3 +1,9 @@ +kxstudio-build-scripts (2) focal; urgency=medium + + * Add KXSTUDIO_EXPLICIT_PATH_INCLUDE flag + + -- falkTX Sun, 24 Apr 2022 23:59:36 +0100 + kxstudio-build-scripts (1) focal; urgency=medium * Initial package diff --git a/sources/libs/kxstudio-build-scripts/kxstudio.mk b/sources/libs/kxstudio-build-scripts/kxstudio.mk index 2918665..fdba35a 100644 --- a/sources/libs/kxstudio-build-scripts/kxstudio.mk +++ b/sources/libs/kxstudio-build-scripts/kxstudio.mk @@ -21,3 +21,9 @@ export CPPFLAGS= export LDFLAGS=-Wl,-O1,--as-needed,--no-undefined,--gc-sections,--strip-all export PATH:=/opt/kxstudio/bin:$(PATH) export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig + +ifeq ($(KXSTUDIO_EXPLICIT_PATH_INCLUDE),y) +export CFLAGS += -I/opt/kxstudio/include +export CXXFLAGS += -I/opt/kxstudio/include +export LDFLAGS += -L/opt/kxstudio/lib +endif diff --git a/sources/libs/libsndfile-static/debian/changelog b/sources/libs/libsndfile-static/debian/changelog index 50324e9..28994e8 100644 --- a/sources/libs/libsndfile-static/debian/changelog +++ b/sources/libs/libsndfile-static/debian/changelog @@ -1,3 +1,9 @@ +libsndfile-static (6:1.1.0-2kxstudio1) focal; urgency=medium + + * Fix missing mp3 support + + -- falkTX Mon, 25 Apr 2022 00:07:41 +0100 + libsndfile-static (6:1.1.0-1kxstudio1) focal; urgency=medium * Initial package diff --git a/sources/libs/libsndfile-static/debian/control b/sources/libs/libsndfile-static/debian/control index 74fc079..4325654 100644 --- a/sources/libs/libsndfile-static/debian/control +++ b/sources/libs/libsndfile-static/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), - kxstudio-build-scripts, + kxstudio-build-scripts (>= 2), autoconf, automake, libtool, @@ -13,7 +13,8 @@ Build-Depends: debhelper-compat (= 13), libmpg123-static, libopus-static, libvorbis-static, - libasound2-dev + libasound2-dev, + python3 Standards-Version: 4.5.0 Homepage: https://libsndfile.github.io/libsndfile/ Rules-Requires-Root: no diff --git a/sources/libs/libsndfile-static/debian/rules b/sources/libs/libsndfile-static/debian/rules index dd5debf..08513b2 100755 --- a/sources/libs/libsndfile-static/debian/rules +++ b/sources/libs/libsndfile-static/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f +KXSTUDIO_EXPLICIT_PATH_INCLUDE = y KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk