aboutsummaryrefslogtreecommitdiffstats
path: root/main/jack
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-08-09 15:06:34 +0000
committerCarlo Landmeter <clandmeter@gmail.com>2016-08-09 15:06:34 +0000
commitd9e5e0831656084280bb60dbf4cf0a70e4b771af (patch)
tree9f504e5485ec764f59d75265fd07336bfc75043a /main/jack
parent490c7bd4eb2d4bd5e6d379fd031da804715fcf3f (diff)
downloadaports-d9e5e0831656084280bb60dbf4cf0a70e4b771af.tar.gz
aports-d9e5e0831656084280bb60dbf4cf0a70e4b771af.tar.bz2
aports-d9e5e0831656084280bb60dbf4cf0a70e4b771af.tar.xz
main/jack: fix gcc6 build
Diffstat (limited to 'main/jack')
-rw-r--r--main/jack/APKBUILD10
-rw-r--r--main/jack/jack-gcc6.patch21
2 files changed, 28 insertions, 3 deletions
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
index 4f57784bd5..ff9640c950 100644
--- a/main/jack/APKBUILD
+++ b/main/jack/APKBUILD
@@ -14,6 +14,7 @@ install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus $pkgname-example-clients:_clients"
source="https://dl.dropboxusercontent.com/u/28869550/jack-$pkgver.tar.bz2
fix-execinfo.patch
+ jack-gcc6.patch
"
_builddir="$srcdir"/jack-$pkgver
@@ -62,8 +63,11 @@ _clients() {
}
md5sums="4aeb91d7ae0cabce98355436ed4f217a jack-1.9.10.tar.bz2
-66a37f3313c8268291910db19e637389 fix-execinfo.patch"
+66a37f3313c8268291910db19e637389 fix-execinfo.patch
+f2b72352825475b393e744225d614dc9 jack-gcc6.patch"
sha256sums="5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2f56 jack-1.9.10.tar.bz2
-0fd5deada71ebd772e8a25032a5258b8686a4394ae9c4066377bb9531031afb0 fix-execinfo.patch"
+0fd5deada71ebd772e8a25032a5258b8686a4394ae9c4066377bb9531031afb0 fix-execinfo.patch
+63a30174afe7b3a1084d19f178fbe7bdeaa7362e4b5a8f54ef287d5261cccf42 jack-gcc6.patch"
sha512sums="d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c jack-1.9.10.tar.bz2
-b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch"
+b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d fix-execinfo.patch
+31bc3451c9df0700632d1d29fe22da072f8e195cc3bcfef847867dda3d54e6636b3557b10e623a126f614e6b4b5250d02f5cfbda6b57dd341fe6b09319121675 jack-gcc6.patch"
diff --git a/main/jack/jack-gcc6.patch b/main/jack/jack-gcc6.patch
new file mode 100644
index 0000000000..098e08ca14
--- /dev/null
+++ b/main/jack/jack-gcc6.patch
@@ -0,0 +1,21 @@
+diff -rupN jack-1.9.10.org/tests/iodelay.cpp jack-1.9.10/tests/iodelay.cpp
+--- jack-1.9.10.org/tests/iodelay.cpp 2014-07-18 08:28:13.000000000 -0400
++++ jack-1.9.10/tests/iodelay.cpp 2016-02-13 18:38:33.280737975 -0500
+@@ -167,8 +167,8 @@ static jack_client_t *jack_handle;
+ 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 @@ int main (int ac, char *av [])
+ return 0;
+ }
+
+-// --------------------------------------------------------------------------------
+\ No newline at end of file
++// --------------------------------------------------------------------------------