| 1 |
commit: 2e963c16d10528fa0e4fb1e6b929cc280c5ff285 |
| 2 |
Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 3 19:32:19 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 4 09:29:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e963c16 |
| 7 |
|
| 8 |
media-sound/jack2: fix compilation with GCC 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/629570 |
| 11 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 12 |
|
| 13 |
media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch | 19 +++++++++++++++++++ |
| 14 |
media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild | 4 ++++ |
| 15 |
2 files changed, 23 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..dcde5fb422f |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch |
| 22 |
@@ -0,0 +1,19 @@ |
| 23 |
+commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655 |
| 24 |
+Author: Kjetil Matheussen <k.s.matheussen@×××××××.no> |
| 25 |
+Date: Sat Jul 15 13:21:59 2017 +0200 |
| 26 |
+ |
| 27 |
+ Tests: Fix compilation with gcc7 |
| 28 |
+ |
| 29 |
+diff --git a/tests/test.cpp b/tests/test.cpp |
| 30 |
+index 8a8a8117..d2ef9a05 100644 |
| 31 |
+--- a/tests/test.cpp |
| 32 |
++++ b/tests/test.cpp |
| 33 |
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) |
| 34 |
+ jack_nframes_t delta_time = cur_time - last_time; |
| 35 |
+ |
| 36 |
+ Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); |
| 37 |
+- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { |
| 38 |
++ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) { |
| 39 |
+ 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); |
| 40 |
+ } |
| 41 |
+ |
| 42 |
|
| 43 |
diff --git a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild |
| 44 |
index 0823bd254c5..3b62bb738cc 100644 |
| 45 |
--- a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild |
| 46 |
+++ b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild |
| 47 |
@@ -49,6 +49,10 @@ RDEPEND="${CDEPEND} |
| 48 |
|
| 49 |
DOCS=( ChangeLog README README_NETJACK2 TODO ) |
| 50 |
|
| 51 |
+PATCHES=( |
| 52 |
+ "${FILESDIR}"/${P}-gcc7.patch |
| 53 |
+) |
| 54 |
+ |
| 55 |
src_prepare() { |
| 56 |
default |
| 57 |
multilib_copy_sources |
Archives