From edcd011a39f36dd23acaa8036589a62d4216e1d7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 8 Jun 2025 19:47:33 +0200 Subject: [PATCH] Fixup all LV2 related stuff until jalv, confirmed building Signed-off-by: falkTX --- sources/apps/jalv/debian/changelog | 2 +- .../debian/patches/01_force-fix-deps.patch | 26 +++++++++++++++++++ sources/apps/jalv/debian/patches/series | 1 + sources/libs/lilv-static/debian/changelog | 2 +- sources/libs/lilv-static/debian/control | 2 +- .../lilv-static/debian/lilv-utils.install | 4 +-- sources/libs/lilv-static/debian/rules | 2 +- sources/libs/serd-static/debian/changelog | 2 +- sources/libs/serd-static/debian/control | 4 +-- sources/libs/serd-static/debian/rules | 2 +- sources/libs/sord-static/debian/changelog | 2 +- sources/libs/sord-static/debian/control | 2 +- sources/libs/sord-static/debian/rules | 2 +- sources/libs/sratom-static/debian/changelog | 2 +- sources/libs/sratom-static/debian/control | 2 +- .../debian/patches/02_force-fix-zix-dep.patch | 24 +++++++++++++++++ .../libs/sratom-static/debian/patches/series | 1 + sources/libs/sratom-static/debian/rules | 2 +- 18 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 sources/apps/jalv/debian/patches/01_force-fix-deps.patch create mode 100644 sources/apps/jalv/debian/patches/series create mode 100644 sources/libs/sratom-static/debian/patches/02_force-fix-zix-dep.patch diff --git a/sources/apps/jalv/debian/changelog b/sources/apps/jalv/debian/changelog index c8d628d..8f78701 100644 --- a/sources/apps/jalv/debian/changelog +++ b/sources/apps/jalv/debian/changelog @@ -1,4 +1,4 @@ -jalv (6:1.6.8-1kxstudio1) focal; urgency=medium +jalv (6:1.6.8-1kxstudio2) focal; urgency=medium * Update diff --git a/sources/apps/jalv/debian/patches/01_force-fix-deps.patch b/sources/apps/jalv/debian/patches/01_force-fix-deps.patch new file mode 100644 index 0000000..90a2e6a --- /dev/null +++ b/sources/apps/jalv/debian/patches/01_force-fix-deps.patch @@ -0,0 +1,26 @@ +--- jalv-1.6.8.orig/meson.build ++++ jalv-1.6.8/meson.build +@@ -45,9 +45,14 @@ endif + ####################### + + m_dep = cc.find_library('m', required: false) ++dl_dep = cc.find_library('dl', required: false) + + thread_dep = dependency('threads') + ++zix_dep = dependency('zix-0', ++ version: '>= 0.4.0', ++ fallback: ['zix', 'zix_dep']) ++ + serd_dep = dependency('serd-0', + version: '>= 0.30.0', + fallback: ['serd', 'serd_dep']) +@@ -233,6 +238,8 @@ common_dependencies = [ + sratom_dep, + suil_dep, + thread_dep, ++ zix_dep, ++ dl_dep, + ] + + # Internal JACK client library diff --git a/sources/apps/jalv/debian/patches/series b/sources/apps/jalv/debian/patches/series new file mode 100644 index 0000000..1d95272 --- /dev/null +++ b/sources/apps/jalv/debian/patches/series @@ -0,0 +1 @@ +01_force-fix-deps.patch diff --git a/sources/libs/lilv-static/debian/changelog b/sources/libs/lilv-static/debian/changelog index 9ab221b..fd592a5 100644 --- a/sources/libs/lilv-static/debian/changelog +++ b/sources/libs/lilv-static/debian/changelog @@ -1,4 +1,4 @@ -lilv-static (6:0.24.26-1kxstudio1) focal; urgency=medium +lilv-static (6:0.24.26-1kxstudio3) focal; urgency=medium * Update diff --git a/sources/libs/lilv-static/debian/control b/sources/libs/lilv-static/debian/control index 093eb0f..91dc90c 100644 --- a/sources/libs/lilv-static/debian/control +++ b/sources/libs/lilv-static/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, pkg-config, libsndfile-static (>= 6:1.2.2-1kxstudio3), libsratom-static (>= 6:0.6.18-1kxstudio1) diff --git a/sources/libs/lilv-static/debian/lilv-utils.install b/sources/libs/lilv-static/debian/lilv-utils.install index f659637..4a23296 100644 --- a/sources/libs/lilv-static/debian/lilv-utils.install +++ b/sources/libs/lilv-static/debian/lilv-utils.install @@ -1,3 +1,3 @@ /etc/bash_completion.d/ -/usr/share/man/man1/ -debian/tmp/opt/kxstudio/bin/* usr/bin/ +debian/tmp/opt/kxstudio/bin/* usr/bin/ +debian/tmp/opt/kxstudio/share/man/man1/* usr/share/man/man1/ diff --git a/sources/libs/lilv-static/debian/rules b/sources/libs/lilv-static/debian/rules index 6d20355..965afb6 100755 --- a/sources/libs/lilv-static/debian/rules +++ b/sources/libs/lilv-static/debian/rules @@ -4,7 +4,7 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib --mandir=/usr/share/man --sysconfdir=/etc \ + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib --sysconfdir=/etc \ -Ddefault_library=static \ -Dbindings_py=disabled \ -Ddefault_lv2_path='~/.lv2:/usr/lib/$(DEB_HOST_MULTIARCH)/lv2:/usr/lib/lv2:/usr/local/lib/lv2' \ diff --git a/sources/libs/serd-static/debian/changelog b/sources/libs/serd-static/debian/changelog index 6240166..c315864 100644 --- a/sources/libs/serd-static/debian/changelog +++ b/sources/libs/serd-static/debian/changelog @@ -1,4 +1,4 @@ -serd-static (6:0.32.4-1kxstudio1) focal; urgency=medium +serd-static (6:0.32.4-1kxstudio3) focal; urgency=medium * Update diff --git a/sources/libs/serd-static/debian/control b/sources/libs/serd-static/debian/control index adf2d7e..0a560fd 100644 --- a/sources/libs/serd-static/debian/control +++ b/sources/libs/serd-static/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, libzix-static (>= 6:0.6.2-1kxstudio1) Standards-Version: 4.5.0 Homepage: http://drobilla.net/software/serd/ @@ -12,7 +12,7 @@ Rules-Requires-Root: no Package: libserd-static Architecture: any -Depends: ${misc:Depends} +Depends: ${misc:Depends}, libzix-static Conflicts: serd-static Breaks: serd-static Description: lightweight RDF syntax library (static) diff --git a/sources/libs/serd-static/debian/rules b/sources/libs/serd-static/debian/rules index 20a545f..2d36dcc 100755 --- a/sources/libs/serd-static/debian/rules +++ b/sources/libs/serd-static/debian/rules @@ -4,7 +4,7 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib -Ddefault_library=static -Ddocs=disabled %: dh $@ diff --git a/sources/libs/sord-static/debian/changelog b/sources/libs/sord-static/debian/changelog index 69e1bb0..9208d4c 100644 --- a/sources/libs/sord-static/debian/changelog +++ b/sources/libs/sord-static/debian/changelog @@ -1,4 +1,4 @@ -sord-static (6:0.16.18-1kxstudio1) focal; urgency=medium +sord-static (6:0.16.18-1kxstudio3) focal; urgency=medium * Update diff --git a/sources/libs/sord-static/debian/control b/sources/libs/sord-static/debian/control index 4fafcad..71bd190 100644 --- a/sources/libs/sord-static/debian/control +++ b/sources/libs/sord-static/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, pkg-config, libpcre3-static (>= 6:8.39-1kxstudio2), libserd-static (>= 6:0.32.4-1kxstudio1) diff --git a/sources/libs/sord-static/debian/rules b/sources/libs/sord-static/debian/rules index 20a545f..2d36dcc 100755 --- a/sources/libs/sord-static/debian/rules +++ b/sources/libs/sord-static/debian/rules @@ -4,7 +4,7 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib -Ddefault_library=static -Ddocs=disabled %: dh $@ diff --git a/sources/libs/sratom-static/debian/changelog b/sources/libs/sratom-static/debian/changelog index 98d1601..90b5b24 100644 --- a/sources/libs/sratom-static/debian/changelog +++ b/sources/libs/sratom-static/debian/changelog @@ -1,4 +1,4 @@ -sratom-static (6:0.6.18-1kxstudio1) focal; urgency=medium +sratom-static (6:0.6.18-1kxstudio3) focal; urgency=medium * Update diff --git a/sources/libs/sratom-static/debian/control b/sources/libs/sratom-static/debian/control index f351f53..1f1ad6b 100644 --- a/sources/libs/sratom-static/debian/control +++ b/sources/libs/sratom-static/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3, + meson, pkg-config, libsord-static (>= 6:0.16.18-1kxstudio1), lv2-dev (>= 6:1.18.4-1kxstudio1) diff --git a/sources/libs/sratom-static/debian/patches/02_force-fix-zix-dep.patch b/sources/libs/sratom-static/debian/patches/02_force-fix-zix-dep.patch new file mode 100644 index 0000000..d8ba6a7 --- /dev/null +++ b/sources/libs/sratom-static/debian/patches/02_force-fix-zix-dep.patch @@ -0,0 +1,24 @@ +--- sratom-static-0.6.18.orig/meson.build ++++ sratom-static-0.6.18/meson.build +@@ -119,6 +119,12 @@ c_suppressions = cc.get_supported_argume + + m_dep = cc.find_library('m', required: false) + ++zix_dep = dependency( ++ 'zix-0', ++ fallback: 'zix', ++ version: '>= 0.4.0' ++) ++ + serd_dep = dependency( + 'serd-0', + fallback: 'serd', +@@ -171,7 +177,7 @@ libsratom = library( + sources, + c_args: c_suppressions + extra_c_args + ['-DSRATOM_INTERNAL'], + darwin_versions: [major_version + '.0.0', meson.project_version()], +- dependencies: [m_dep, lv2_dep, serd_dep, sord_dep], ++ dependencies: [m_dep, lv2_dep, zix_dep, serd_dep, sord_dep], + gnu_symbol_visibility: 'hidden', + include_directories: include_dirs, + install: true, diff --git a/sources/libs/sratom-static/debian/patches/series b/sources/libs/sratom-static/debian/patches/series index 71d993a..0543bbe 100644 --- a/sources/libs/sratom-static/debian/patches/series +++ b/sources/libs/sratom-static/debian/patches/series @@ -1 +1,2 @@ 01_hidden-sratom-api.patch +02_force-fix-zix-dep.patch diff --git a/sources/libs/sratom-static/debian/rules b/sources/libs/sratom-static/debian/rules index 20a545f..2d36dcc 100755 --- a/sources/libs/sratom-static/debian/rules +++ b/sources/libs/sratom-static/debian/rules @@ -4,7 +4,7 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk override_dh_auto_configure: - dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib -Ddefault_library=static -Ddocs=disabled %: dh $@