diff --git a/sources/apps/jalv/debian/changelog b/sources/apps/jalv/debian/changelog index d755cac..c8d628d 100644 --- a/sources/apps/jalv/debian/changelog +++ b/sources/apps/jalv/debian/changelog @@ -1,3 +1,9 @@ +jalv (6:1.6.8-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 14:12:55 +0200 + jalv (6:1.6.6-1kxstudio1) focal; urgency=medium * Initial package diff --git a/sources/apps/jalv/debian/clean b/sources/apps/jalv/debian/clean deleted file mode 100644 index 025b274..0000000 --- a/sources/apps/jalv/debian/clean +++ /dev/null @@ -1,14 +0,0 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -build/jalv_config.h -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc diff --git a/sources/apps/jalv/debian/control b/sources/apps/jalv/debian/control index ad63443..117be49 100644 --- a/sources/apps/jalv/debian/control +++ b/sources/apps/jalv/debian/control @@ -4,14 +4,14 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, pkg-config, libgtk2.0-dev, libgtk-3-dev, qtbase5-dev, libjack-dev, - liblilv-static (>= 6:0.24.14-1kxstudio3), - libsuil-static (>= 6:0.10.12-1kxstudio3), + liblilv-static (>= 6:0.24.26-1kxstudio1), + libsuil-static (>= 6:0.10.22-1kxstudio1), lv2-dev (>= 6:1.18.4-1kxstudio3) Standards-Version: 4.5.0 Homepage: https://drobilla.net/software/jalv/ @@ -19,7 +19,7 @@ Rules-Requires-Root: no Package: jalv Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libsuil-kxstudio (>= 6:0.10.12-1kxstudio3) +Depends: ${misc:Depends}, ${shlibs:Depends}, libsuil-kxstudio (>= 6:0.10.22-1kxstudio1) Description: tool to run LV2 plugins as stand-alone applications jalv is a stand-alone version of lv2jack that supports plugin UIs via libsuil. It allows one to run an LV2 plugin as a JACK application. diff --git a/sources/apps/jalv/debian/rules b/sources/apps/jalv/debian/rules index b604f82..fa4a59a 100755 --- a/sources/apps/jalv/debian/rules +++ b/sources/apps/jalv/debian/rules @@ -3,26 +3,8 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -WAF = python3 ./waf - -override_dh_auto_configure: - $(WAF) configure \ - --prefix=/usr \ - --libdir=/usr/lib/$(DEB_TARGET_MULTIARCH) \ - --mandir=/usr/share/man \ - --strict - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true - -override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/jalv - -override_dh_installchangelogs: - dh_installchangelogs NEWS +# override_dh_shlibdeps: +# dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info %: dh $@ diff --git a/sources/libs/suil-static/debian/changelog b/sources/libs/suil-static/debian/changelog index e5a95da..a668c64 100644 --- a/sources/libs/suil-static/debian/changelog +++ b/sources/libs/suil-static/debian/changelog @@ -1,3 +1,9 @@ +suil-static (6:0.10.22-1kxstudio3) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 14:04:37 +0200 + suil-static (6:0.10.12-1kxstudio3) focal; urgency=medium * Initial package diff --git a/sources/libs/suil-static/debian/clean b/sources/libs/suil-static/debian/clean deleted file mode 100644 index 72de718..0000000 --- a/sources/libs/suil-static/debian/clean +++ /dev/null @@ -1,13 +0,0 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc diff --git a/sources/libs/suil-static/debian/control b/sources/libs/suil-static/debian/control index 6c8f970..a632669 100644 --- a/sources/libs/suil-static/debian/control +++ b/sources/libs/suil-static/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, pkg-config, libgtk2.0-dev, libgtk-3-dev, diff --git a/sources/libs/suil-static/debian/patches/01_dont-run-ldconfig.patch b/sources/libs/suil-static/debian/patches/01_dont-run-ldconfig.patch deleted file mode 100644 index 20aeb96..0000000 --- a/sources/libs/suil-static/debian/patches/01_dont-run-ldconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- suil-static-0.10.12.orig/wscript -+++ suil-static-0.10.12/wscript -@@ -403,8 +403,6 @@ def build(bld): - if bld.env.DOCS: - bld.recurse('doc/c') - -- bld.add_post_fun(autowaf.run_ldconfig) -- - - class LintContext(Build.BuildContext): - fun = cmd = 'lint' diff --git a/sources/libs/suil-static/debian/patches/01_hidden-suil-api.patch b/sources/libs/suil-static/debian/patches/01_hidden-suil-api.patch new file mode 100644 index 0000000..199e748 --- /dev/null +++ b/sources/libs/suil-static/debian/patches/01_hidden-suil-api.patch @@ -0,0 +1,19 @@ +--- suil-static-0.10.22.orig/include/suil/suil.h ++++ suil-static-0.10.22/include/suil/suil.h +@@ -21,15 +21,7 @@ + #endif + + // SUIL_API exposes symbols in the public API +-#ifndef SUIL_API +-# ifdef SUIL_STATIC +-# define SUIL_API +-# elif defined(SUIL_INTERNAL) +-# define SUIL_API SUIL_LIB_EXPORT +-# else +-# define SUIL_API SUIL_LIB_IMPORT +-# endif +-#endif ++#define SUIL_API + + #ifdef __cplusplus + extern "C" { diff --git a/sources/libs/suil-static/debian/patches/04_hardcoded-suil-module-dir.patch b/sources/libs/suil-static/debian/patches/02_hardcoded-suil-module-dir.patch similarity index 64% rename from sources/libs/suil-static/debian/patches/04_hardcoded-suil-module-dir.patch rename to sources/libs/suil-static/debian/patches/02_hardcoded-suil-module-dir.patch index 534d74b..07a162c 100644 --- a/sources/libs/suil-static/debian/patches/04_hardcoded-suil-module-dir.patch +++ b/sources/libs/suil-static/debian/patches/02_hardcoded-suil-module-dir.patch @@ -1,15 +1,15 @@ --- suil-static-0.10.12.orig/src/suil_internal.h +++ suil-static-0.10.12/src/suil_internal.h @@ -113,8 +113,12 @@ suil_host_init(void); - static inline void* - suil_open_module(const char* module_name) { + #define N_SLICES 4 + +#ifdef KXSTUDIO_SUIL_MODULE_DIR + const char* const mod_dir = KXSTUDIO_SUIL_MODULE_DIR; +#else const char* const env_dir = getenv("SUIL_MODULE_DIR"); const char* const mod_dir = env_dir ? env_dir : SUIL_MODULE_DIR; +#endif - const size_t path_len = - strlen(mod_dir) + strlen(SUIL_DIR_SEP SUIL_MODULE_PREFIX SUIL_MODULE_EXT) + - strlen(module_name) + 2; + + const char* const slices[N_SLICES] = { + mod_dir, SUIL_DIR_SEP SUIL_MODULE_PREFIX, module_name, SUIL_MODULE_EXT}; diff --git a/sources/libs/suil-static/debian/patches/02_hidden-suil-api.patch b/sources/libs/suil-static/debian/patches/02_hidden-suil-api.patch deleted file mode 100644 index 795afb9..0000000 --- a/sources/libs/suil-static/debian/patches/02_hidden-suil-api.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- suil-static-0.10.12.orig/include/suil/suil.h -+++ suil-static-0.10.12/include/suil/suil.h -@@ -24,13 +24,8 @@ - #include - #include - --#ifdef _WIN32 --# define SUIL_LIB_IMPORT __declspec(dllimport) --# define SUIL_LIB_EXPORT __declspec(dllexport) --#else --# define SUIL_LIB_IMPORT __attribute__((visibility("default"))) --# define SUIL_LIB_EXPORT __attribute__((visibility("default"))) --#endif -+#define SUIL_LIB_IMPORT -+#define SUIL_LIB_EXPORT __attribute__((visibility("default"))) - - #ifndef SUIL_STATIC - # ifdef SUIL_INTERNAL diff --git a/sources/libs/suil-static/debian/patches/03_fix-libs.patch b/sources/libs/suil-static/debian/patches/03_fix-libs.patch deleted file mode 100644 index 71f2c2d..0000000 --- a/sources/libs/suil-static/debian/patches/03_fix-libs.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- suil-static-0.10.12.orig/suil.pc.in -+++ suil-static-0.10.12/suil.pc.in -@@ -7,5 +7,5 @@ Name: Suil - Version: @SUIL_VERSION@ - Description: LV2 plugin UI hosting library - Requires: @SUIL_PKG_DEPS@ --Libs: -L${libdir} -l@LIB_SUIL@ -+Libs: -L${libdir} -l@LIB_SUIL@ -ldl - Cflags: -I${includedir}/suil-@SUIL_MAJOR_VERSION@ diff --git a/sources/libs/suil-static/debian/patches/series b/sources/libs/suil-static/debian/patches/series index 8b6018d..8b54cb4 100644 --- a/sources/libs/suil-static/debian/patches/series +++ b/sources/libs/suil-static/debian/patches/series @@ -1,4 +1,2 @@ -01_dont-run-ldconfig.patch -02_hidden-suil-api.patch -03_fix-libs.patch -04_hardcoded-suil-module-dir.patch +01_hidden-suil-api.patch +02_hardcoded-suil-module-dir.patch diff --git a/sources/libs/suil-static/debian/rules b/sources/libs/suil-static/debian/rules index bb29dbe..cd2e4aa 100755 --- a/sources/libs/suil-static/debian/rules +++ b/sources/libs/suil-static/debian/rules @@ -9,23 +9,17 @@ export CFLAGS += -DKXSTUDIO_SUIL_MODULE_DIR='"$(SUIL_MODULE_DIR)"' export CXXFLAGS += -DKXSTUDIO_SUIL_MODULE_DIR='"$(SUIL_MODULE_DIR)"' export LDFLAGS += -Wl,-z,nodelete -WAF = python3 ./waf - override_dh_auto_configure: - $(WAF) configure \ - --static \ - --no-shared \ - --prefix=/opt/kxstudio \ - --strict - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib \ + -Ddefault_library=static \ + -Ddocs=disabled \ + -Dgtk2=enabled \ + -Dgtk3=enabled \ + -Dqt5=enabled \ + -Dqt6=disabled override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/tmp + dh_auto_install mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_TARGET_MULTIARCH) mv $(CURDIR)/debian/tmp/opt/kxstudio/lib/suil-0 $(CURDIR)/debian/tmp$(SUIL_MODULE_DIR)