Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6dcb861e716e0178419ffa52a6b24d9ff956f15c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6dcb861e716e0178419ffa52a6b24d9ff956f15c)
  • Date: Wed, 27 Sep 2017 08:11:18 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-drivers/jack2/HISTORY | 3 +
audio-drivers/jack2/PRE_BUILD | 3 +
audio-drivers/jack2/jack2-1.9.10-buildfix.patch | 31 ++++++++++++++++
utils/dbus-c++/BUILD | 2 -
utils/dbus-c++/HISTORY | 4 ++
utils/dbus-c++/PRE_BUILD | 1
utils/dbus-c++/dbus-c++-threading.patch | 45
++++++++++++++++++++++++
7 files changed, 88 insertions(+), 1 deletion(-)

New commits:
commit 6dcb861e716e0178419ffa52a6b24d9ff956f15c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dbus-c++: avoid more actual breakage (disable certain threading code)

commit 002657ca8d88ee268a619cf217146ff79ba90f81
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

Revert "rust: no reliance on either installed rust or llvm"

This reverts commit 2f744543fc1735fade6c0513185aab907fbf4d0c.

commit d25707e614d4bb03356e31523951ccc0d20293fd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

jack2: fix build

commit c677b7b873e4e7f02c23e15776a78df3d7e91438
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dbus-c++: fix build with new gcc

commit 2f744543fc1735fade6c0513185aab907fbf4d0c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

rust: no reliance on either installed rust or llvm

This is too fragile. Current rust does not build with current llvm in
grimoire. Also, my installed rust is broken right now because of
updated llvm binary. I added proper downloads for the bootstrap
toolchain for x86-64 to DETAILS, so further downloading during build
is minimal (seems like cargo still likes to pull stuff off the net).

Rust is a fat, bad spell. But it should now at least build more
reliably.

diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index ecf805a..afb6dd4 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,6 @@
+2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, jack2-buildfix.patch: fix build
+
2014-10-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added primary dropbox mirror

diff --git a/audio-drivers/jack2/PRE_BUILD b/audio-drivers/jack2/PRE_BUILD
new file mode 100755
index 0000000..c967084
--- /dev/null
+++ b/audio-drivers/jack2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p0 < "$SCRIPT_DIRECTORY/jack2-1.9.10-buildfix.patch"
diff --git a/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
b/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
new file mode 100644
index 0000000..19dc5a1
--- /dev/null
+++ b/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
@@ -0,0 +1,31 @@
+--- tests/test.cpp.orig 2017-09-27 09:33:27.704970834 +0200
++++ tests/test.cpp 2017-09-27 09:35:50.973979582 +0200
+@@ -480,7 +480,7 @@
+ jack_nframes_t delta_time = cur_time - last_time;
+
+ Log("calling process4 callback : jack_frame_time = %ld delta_time =
%ld\n", cur_time, delta_time);
+- if (delta_time > 0 && (jack_nframes_t)abs(delta_time -
cur_buffer_size) > tolerance) {
++ if (delta_time > 0 && (jack_nframes_t)abs((long long)(delta_time -
cur_buffer_size)) > tolerance) {
+ printf("!!! ERROR !!! jack_frame_time seems to return
incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n",
cur_buffer_size, delta_time, tolerance);
+ }
+
+--- tests/iodelay.cpp.orig 2017-09-27 09:41:22.342999815 +0200
++++ tests/iodelay.cpp 2017-09-27 09:43:49.582008805 +0200
+@@ -167,8 +167,8 @@
+ static jack_port_t *jack_capt;
+ static jack_port_t *jack_play;
+
+-jack_latency_range_t capture_latency = {-1, -1};
+-jack_latency_range_t playback_latency = {-1, -1};
++jack_latency_range_t capture_latency = {(jack_nframes_t)-1,
(jack_nframes_t)-1};
++jack_latency_range_t playback_latency = {(jack_nframes_t)-1,
(jack_nframes_t)-1};
+
+ void
+ latency_cb (jack_latency_callback_mode_t mode, void *arg)
+@@ -266,4 +266,4 @@
+ return 0;
+ }
+
+-//
--------------------------------------------------------------------------------
+\ No newline at end of file
++//
--------------------------------------------------------------------------------
diff --git a/utils/dbus-c++/BUILD b/utils/dbus-c++/BUILD
index e6fd0a7..3600499 100755
--- a/utils/dbus-c++/BUILD
+++ b/utils/dbus-c++/BUILD
@@ -1,2 +1,2 @@
-CXXFLAGS+=" -std=c++11" &&
+CXXFLAGS+=" -std=c++11 -fpermissive" &&
default_build
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index c76fdc0..970271f 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,7 @@
+2017-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: -fpermissive needed for gcc7
+ * PRE_BUILD, dbus-c++-threading.patch: Disable broken code.
+
2016-02-11 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: C++11 mode needed for glibmm
* DEPENDS: cleanup, mention gtkmm2
diff --git a/utils/dbus-c++/PRE_BUILD b/utils/dbus-c++/PRE_BUILD
index c0c8173..20badf1 100755
--- a/utils/dbus-c++/PRE_BUILD
+++ b/utils/dbus-c++/PRE_BUILD
@@ -3,6 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
patch -p1 < "$SCRIPT_DIRECTORY/unistd.patch" &&
patch -p1 < "$SCRIPT_DIRECTORY/configure.patch" &&
patch -p1 < "$SCRIPT_DIRECTORY/05_fix_glibmm_ftbfs.patch" &&
+patch -p1 < "$SCRIPT_DIRECTORY/dbus-c++-threading.patch" &&
# This is needed to fix up libtool stuff, too!
# Otherwise we'd get linking errors with as-needed (missing -lexpat, p.ex.).
./bootstrap
diff --git a/utils/dbus-c++/dbus-c++-threading.patch
b/utils/dbus-c++/dbus-c++-threading.patch
new file mode 100644
index 0000000..c4fafef
--- /dev/null
+++ b/utils/dbus-c++/dbus-c++-threading.patch
@@ -0,0 +1,45 @@
+--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading 2017-02-15
13:40:53.796004263 +0000
++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h 2017-02-15
13:40:46.907000493 +0000
+@@ -188,6 +188,7 @@
+ /* classes for multithreading support
+ */
+
++#if 0
+ class DXXAPI Mutex
+ {
+ public:
+@@ -243,9 +244,11 @@
+ typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout);
+ typedef void (*CondVarWakeOneFn)(CondVar *cv);
+ typedef void (*CondVarWakeAllFn)(CondVar *cv);
++#endif
+
+ void DXXAPI _init_threading();
+
++#if 0
+ void DXXAPI _init_threading(
+ MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn,
+ CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn,
CondVarWakeOneFn, CondVarWakeAllFn
+@@ -312,6 +315,7 @@
+ cv->wake_all();
+ }
+ };
++#endif
+
+ } /* namespace DBus */
+
+--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading 2017-02-15
13:48:22.627249868 +0000
++++ libdbus-c++-0.9.0/src/dispatcher.cpp 2017-02-15 13:48:29.164253445
+0000
+@@ -253,6 +253,7 @@
+ #endif//DBUS_HAS_THREADS_INIT_DEFAULT
+ }
+
++#if 0
+ void DBus::_init_threading(
+ MutexNewFn m1,
+ MutexFreeFn m2,
+@@ -318,3 +319,4 @@
+ #endif//DBUS_HAS_RECURSIVE_MUTEX
+ dbus_threads_init(&functions);
+ }
++#endif



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (6dcb861e716e0178419ffa52a6b24d9ff956f15c), Thomas Orgis, 09/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page