Page MenuHomeSolus
Files F11035462

D9509.id23017.diff
No OneTemporary
Actions

D9509.id23017.diff
View Options

diff --git a/files/0001-Force-fix-for-libdb-mixed-mode-build.patch b/files/0001-Force-fix-for-libdb-mixed-mode-build.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Force-fix-for-libdb-mixed-mode-build.patch
@@ -0,0 +1,43 @@
+From a39d2df15e13bc406f780ae6e91c7c1a61b68f76 Mon Sep 17 00:00:00 2001
+From: falkTX <falktx@falktx.com>
+Date: Tue, 3 Dec 2019 12:31:06 +0000
+Subject: [PATCH] Force fix for libdb mixed mode build
+
+Signed-off-by: falkTX <falktx@falktx.com>
+---
+ 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 <stdint.h>
+
+ #if HAVE_DB
+diff --git a/wscript b/wscript
+index dbae6cac..3a187d8f 100644
+--- a/wscript
++++ b/wscript
+@@ -392,8 +392,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
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-Force-fix-for-libdb-mixed-mode-build.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 @@
<Name>jack-audio-connection-kit</Name>
<Homepage>https://jackaudio.org/</Homepage>
<Packager>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Jarno Turkki</Name>
+ <Email>stalebrim@posteo.net</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>LGPL-2.1-or-later</License>
@@ -116,7 +116,7 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="11">jack-audio-connection-kit</Dependency>
+ <Dependency release="12">jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/jack/audioadapter.so</Path>
@@ -146,8 +146,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="11">jack-audio-connection-kit-32bit</Dependency>
- <Dependency release="11">jack-audio-connection-kit-devel</Dependency>
+ <Dependency release="12">jack-audio-connection-kit-32bit</Dependency>
+ <Dependency release="12">jack-audio-connection-kit-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libjack.so</Path>
@@ -163,7 +163,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="11">jack-audio-connection-kit</Dependency>
+ <Dependency release="12">jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/jack/control.h</Path>
@@ -190,12 +190,12 @@
</Files>
</Package>
<History>
- <Update release="11">
- <Date>2020-05-17</Date>
+ <Update release="12">
+ <Date>2020-08-27</Date>
<Version>1.9.14</Version>
<Comment>Packaging update</Comment>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Jarno Turkki</Name>
+ <Email>stalebrim@posteo.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 10, 5:58 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5823951
Default Alt Text
D9509.id23017.diff (4 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.