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 4F2151396D0 for ; Tue, 5 Sep 2017 07:14:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93D541FC002; Tue, 5 Sep 2017 07:14:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6D9171FC041 for ; Tue, 5 Sep 2017 07:14:32 +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 9F2F5341678 for ; Tue, 5 Sep 2017 07:14:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 430F78E36 for ; Tue, 5 Sep 2017 07:14:30 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1504595615.c019d4cfa38def2e90a8c5707d73c11d532b240d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/snd/files/, media-sound/snd/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch media-sound/snd/snd-17.4.ebuild X-VCS-Directories: media-sound/snd/files/ media-sound/snd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c019d4cfa38def2e90a8c5707d73c11d532b240d X-VCS-Branch: master Date: Tue, 5 Sep 2017 07:14:30 +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: 2daa8b2a-c713-42f2-8f5f-7010ecd5023e X-Archives-Hash: bf5e042c3f22841c2329d18029b8cbf2 commit: c019d4cfa38def2e90a8c5707d73c11d532b240d Author: David Seifert gentoo org> AuthorDate: Tue Sep 5 07:13:35 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Sep 5 07:13:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c019d4cf media-sound/snd: Unconditionally compile `oss_sample_types` function Closes: https://bugs.gentoo.org/show_bug.cgi?id=621758 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../files/snd-17.4-undefined-oss_sample_types.patch | 21 +++++++++++++++++++++ media-sound/snd/snd-17.4.ebuild | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch new file mode 100644 index 00000000000..6199a7b183f --- /dev/null +++ b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch @@ -0,0 +1,21 @@ +Always compile the `oss_sample_types` function +Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758 + +--- a/audio.c ++++ b/audio.c +@@ -743,7 +743,6 @@ + } + + +-#if (!HAVE_ALSA) + static int oss_sample_types(int ur_dev, mus_sample_t *val) + { + int fd, samp_types = 0, sys, ind; +@@ -774,7 +773,6 @@ + val[0] = (mus_sample_t)(ind - 1); + return(MUS_NO_ERROR); + } +-#endif + + + diff --git a/media-sound/snd/snd-17.4.ebuild b/media-sound/snd/snd-17.4.ebuild index 3a2a2027b8f..5b746a352c8 100644 --- a/media-sound/snd/snd-17.4.ebuild +++ b/media-sound/snd/snd-17.4.ebuild @@ -44,7 +44,8 @@ REQUIRED_USE=" ?? ( ruby s7 )" PATCHES=( - "${FILESDIR}/${PN}-17.4-portaudio.patch" + "${FILESDIR}"/${PN}-17.4-portaudio.patch + "${FILESDIR}"/${PN}-17.4-undefined-oss_sample_types.patch ) pkg_setup() {