[gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/

[Thomas Beierlein]

commit:     6bd56369bade77916f1984fc35bff33b4bc90413
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 08:38:05 2018 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 08:38:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd56369

media-radio/unixcw: Fix tests

Make test independent of installed audio system.

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Closes: https://bugs.gentoo.org/630276
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-radio/unixcw/files/unixcw-tests.patch | 12 ++++++++++++
 media-radio/unixcw/unixcw-3.5.1.ebuild      |  7 +++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/media-radio/unixcw/files/unixcw-tests.patch b/media-radio/unixcw/files/unixcw-tests.patch
new file mode 100644
index 00000000000..9d2c3d9685c
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-tests.patch
@@ -0,0 +1,12 @@
+# works now without any installed audio system
+--- src/libcw/tests/libcw_test_tq_short_space.c.orig	2018-08-01 07:53:33.972577616 +0000
++++ src/libcw/tests/libcw_test_tq_short_space.c	2018-08-01 07:53:42.877456677 +0000
+@@ -94,7 +94,7 @@
+ 	bool success = true;
+ 
+         /* Library initialization. */
+-        cw_generator_new(CW_AUDIO_SOUNDCARD, NULL);
++        cw_generator_new(CW_AUDIO_NULL, NULL);
+         cw_generator_start();
+ 
+ 	cw_register_tone_queue_low_callback(cwdaemon_tone_queue_low_callback, NULL, tq_low_watermark);

diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
index 1eb06a2ba00..b50fdf97de9 100644
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid test qt5"
 
-REQUIRED_USE="test? ( || ( alsa pulseaudio ) )"
-
 RDEPEND="ncurses? ( sys-libs/ncurses:= )
 	qt5? ( dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -30,7 +28,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	append-cflags -std=gnu11
 	append-cxxflags -std=gnu++11
-	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch
+	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch \
+	    "${FILESDIR}"/$PN-tests.patch
 	eautoreconf
 }