From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D5D4138334 for ; Wed, 1 Aug 2018 09:14:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF8C8E092E; Wed, 1 Aug 2018 09:14:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6049DE092E for ; Wed, 1 Aug 2018 09:14:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB94E335CF2 for ; Wed, 1 Aug 2018 09:14:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81CB2375 for ; Wed, 1 Aug 2018 09:14:45 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1533112685.6bd56369bade77916f1984fc35bff33b4bc90413.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/unixcw/, media-radio/unixcw/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-radio/unixcw/files/unixcw-tests.patch media-radio/unixcw/unixcw-3.5.1.ebuild X-VCS-Directories: media-radio/unixcw/files/ media-radio/unixcw/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: 6bd56369bade77916f1984fc35bff33b4bc90413 X-VCS-Branch: master Date: Wed, 1 Aug 2018 09:14:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a39c88f3-8007-4db6-ba66-632333b5c82a X-Archives-Hash: 907dba2975c9bf2f824168e11e0c5e49 commit: 6bd56369bade77916f1984fc35bff33b4bc90413 Author: Thomas Beierlein gentoo org> AuthorDate: Wed Aug 1 08:38:05 2018 +0000 Commit: Thomas Beierlein gentoo 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 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 }