diff --git a/files/0001-Backport-libdb-mixed-mode-fix.patch b/files/0001-Backport-libdb-mixed-mode-fix.patch new file mode 100644 --- /dev/null +++ b/files/0001-Backport-libdb-mixed-mode-fix.patch @@ -0,0 +1,47 @@ +From 1261e4213eab2732bd2a71552959bd1ef9e061c6 Mon Sep 17 00:00:00 2001 +From: Jarno Turkki +Date: Wed, 26 Aug 2020 17:40:03 +0300 +Subject: [PATCH 1/1] Backport libdb mixed mode fix +# Backport a fix for "undefined symbol: db_create" error +# Unneeded after 1.9.14 + +--- + common/JackMetadata.h | 6 ++++++ + wscript | 3 ++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/common/JackMetadata.h b/common/JackMetadata.h +index 7469737a..a6cf18f9 100644 +--- a/common/JackMetadata.h ++++ b/common/JackMetadata.h +@@ -24,6 +24,12 @@ + #include "config.h" + #endif + ++// libdb does not work in 32bit mixed mode ++#ifdef BUILD_WITH_32_64 ++#undef HAVE_DB ++#define HAVE_DB 0 ++#endif ++ + #include + + #if HAVE_DB +diff --git a/wscript b/wscript +index 0621ae71..40ff5941 100644 +--- a/wscript ++++ b/wscript +@@ -390,8 +390,9 @@ def configure(conf): + + if Options.options.mixed: + conf.setenv(lib32, env=conf.env.derive()) +- conf.env.append_unique('CXXFLAGS', '-m32') + conf.env.append_unique('CFLAGS', '-m32') ++ conf.env.append_unique('CXXFLAGS', '-m32') ++ conf.env.append_unique('CXXFLAGS', '-DBUILD_WITH_32_64') + conf.env.append_unique('LINKFLAGS', '-m32') + if Options.options.libdir32: + conf.env['LIBDIR'] = Options.options.libdir32 +-- +2.27.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : jack-audio-connection-kit version : 1.9.14 -release : 11 +release : 12 source : - https://github.com/jackaudio/jack2/archive/v1.9.14.tar.gz : a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c homepage : https://jackaudio.org/ @@ -27,6 +27,7 @@ - db5-32bit-devel - readline-32bit-devel setup : | + %patch -p1 < $pkgfiles/0001-Backport-libdb-mixed-mode-fix.patch %waf_configure --libdir=%libdir% \ --systemd-unit \ --classic \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ jack-audio-connection-kit https://jackaudio.org/ - Bryan T. Meyers - bmeyers@datadrake.com + Jarno Turkki + stalebrim@posteo.net GPL-2.0-or-later LGPL-2.1-or-later @@ -116,7 +116,7 @@ emul32 - jack-audio-connection-kit + jack-audio-connection-kit /usr/lib32/jack/audioadapter.so @@ -146,8 +146,8 @@ programming.devel - jack-audio-connection-kit-32bit - jack-audio-connection-kit-devel + jack-audio-connection-kit-32bit + jack-audio-connection-kit-devel /usr/lib32/libjack.so @@ -163,7 +163,7 @@ programming.devel - jack-audio-connection-kit + jack-audio-connection-kit /usr/include/jack/control.h @@ -190,12 +190,12 @@ - - 2020-05-17 + + 2020-08-26 1.9.14 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Jarno Turkki + stalebrim@posteo.net \ No newline at end of file