jack2: version 1.9.12

5 files changed, 10 insertions, 41 deletions

diff --git a/audio-drivers/jack2/BUILD b/audio-drivers/jack2/BUILD
index 4f94490f7d..3ebb6418a1 100755
--- a/audio-drivers/jack2/BUILD
+++ b/audio-drivers/jack2/BUILD
@@ -1,3 +1,3 @@
 OPTS="--enable-pkg-config-dbus-service-dir $OPTS" &&
-./waf configure --nocache --prefix=${INSTALL_ROOT}/usr $OPTS &&
+./waf configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
 ./waf build
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 2de72bdc71..66bea46ae2 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -10,12 +10,11 @@ if [[ $JACK2_BRANCH == scm ]]; then
   FORCE_DOWNLOAD=1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
 else
-         VERSION=1.9.10
-          SOURCE=$SPELLX-$VERSION.tar.bz2
-   SOURCE_URL[0]=https://dl.dropboxusercontent.com/u/28869550/$SOURCE
-   SOURCE_URL[1]=http://jackaudio.org/downloads/$SOURCE
-     SOURCE_HASH=sha512:d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+         VERSION=1.9.12
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=https://github.com/jackaudio/jack2/releases/download/v$VERSION/$SOURCE
+     SOURCE_HASH=sha512:f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 fi
         WEB_SITE=http://jackaudio.org/
          ENTERED=20080707
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index afb6dd4ccb..428229bce6 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2018-01-08 Thomas Orgis <sobukus@sourcemage.org>
+        * DETAILS: updated to 1.19.12, now from github
+        * PRE_BUILD, jack2-buildfix.patch: gone
+
 2017-09-27 Thomas Orgis <sobukus@sourcemage.org>
 	* PRE_BUILD, jack2-buildfix.patch: fix build
 
diff --git a/audio-drivers/jack2/PRE_BUILD b/audio-drivers/jack2/PRE_BUILD
deleted file mode 100755
index c9670846df..0000000000
--- a/audio-drivers/jack2/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 19dc5a1a55..0000000000
--- a/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
-+// --------------------------------------------------------------------------------