From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/jack2/, media-sound/jack2/files/
Date: Mon, 4 Dec 2017 09:30:51 +0000 (UTC) [thread overview]
Message-ID: <1512379792.2e963c16d10528fa0e4fb1e6b929cc280c5ff285.aballier@gentoo> (raw)
commit: 2e963c16d10528fa0e4fb1e6b929cc280c5ff285
Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Sun Dec 3 19:32:19 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 09:29:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e963c16
media-sound/jack2: fix compilation with GCC 7
Closes: https://bugs.gentoo.org/629570
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch | 19 +++++++++++++++++++
media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild | 4 ++++
2 files changed, 23 insertions(+)
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
new file mode 100644
index 00000000000..dcde5fb422f
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
@@ -0,0 +1,19 @@
+commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655
+Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
+Date: Sat Jul 15 13:21:59 2017 +0200
+
+ Tests: Fix compilation with gcc7
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a8117..d2ef9a05 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ 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 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)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);
+ }
+
diff --git a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
index 0823bd254c5..3b62bb738cc 100644
--- a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
@@ -49,6 +49,10 @@ RDEPEND="${CDEPEND}
DOCS=( ChangeLog README README_NETJACK2 TODO )
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc7.patch
+)
+
src_prepare() {
default
multilib_copy_sources
next reply other threads:[~2017-12-04 9:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 9:30 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-16 18:41 [gentoo-commits] repo/gentoo:master commit in: media-sound/jack2/, media-sound/jack2/files/ Andreas Sturmlechner
2020-08-13 17:34 Miroslav Šulc
2021-08-22 8:39 Miroslav Šulc
2023-03-09 20:13 Ionen Wolkens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1512379792.2e963c16d10528fa0e4fb1e6b929cc280c5ff285.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox