gentoo auto-resync : 17:10:2022 - 01:53:44

4 files changed, 160 insertions, 8 deletions

diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index d86084b5f9fc..0f5fec476b68 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,5 +1,8 @@
 AUX snd-17.4-portaudio.patch 2154 BLAKE2B 3d6d6edd400aef4bd809e49021f0d42523db263dc9bb0626074ae32c4c3172c66181caaab141c754b8d04436d920dc7e104300a11bccf29f251052571c52e462 SHA512 01f7d7f3bd315a8b372d81e2f5a96b9f1cd100eb4afe62a57c5b0422740892b80d504ab2774190814fde04849bc097817262f7bc96bda1f90a08f544caa439ce
 AUX snd-17.4-undefined-oss_sample_types.patch 372 BLAKE2B 5bd87e2e8c953ab4dd3799295b6a425d1775572605b66eb4fb7e2927e45e8b1b6780a08c370fab7c197e3354eea33d87b4503aca5dbfb92a1150f786fb0cd810 SHA512 3b6a64eea622d77389edf754450a6ef1a5036b1ef0c5e02f7c84c4aa150fd0c30dd3e7855126dbbce1582a9ff1e02ddc2abfb5e7636feb71713e08c7b1bc0478
+AUX snd-22.8-undefined-oss_sample_types.patch 1242 BLAKE2B 4431fdf43e467a117ef0efffe523fd481060458229dd1ecb5019f92010415884379e50241c3d2b35514715a0b8dbbd6c6acf9925c634f455e835c88cbc1c3dd5 SHA512 d8c19f7abc0350f1e0b7b336ef69e7ed478337373140051d9ce20a2493ba0b53547b26e3129e44b1f2cbb6e2fd20bbb4aa5de81b76364907da1310b9b3c0ac11
 DIST snd-17.4.tar.gz 15096338 BLAKE2B ca054977caacd2ea4c1b14f50c31d3b4cc6b206a58529ee5537ec80e51acb72c1b8baad6db9729270fe07067c097f16e630e1f7a81521ac0532f5b5689fb963c SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88
+DIST snd-22.8.tar.gz 14696217 BLAKE2B 6d90e1a51f862d17985831f676a01e61c9cce44f623c8db5d8a0a30cb3909823b5361a20ce5a19bfdb846c0d5237fcd9183be0a9970cfa6e9e02c69911090e6f SHA512 a6c007a1c17973f6bc4badcca72b310b4e53d3a8b1831f026fca230ae9925ab3c53eb6a97015220fd929b7ecb14c7922ba2113d6c7a6626406ec4d361b7b228d
 EBUILD snd-17.4-r2.ebuild 2575 BLAKE2B 7cb775c646d34cf086022a7027fec9ef3299c4e289d52fa5af9c1242bba87f39f50226ff68262bcc8586848b288e3f6869d96426eae3df07f07f4e26538a53c9 SHA512 74b28e050e6a764a3da658f67fd06fcf23867867180768bd102080e7430c51264a426ce8a8b17f57a1a97eb158c00b3da1ec120bbaaefb7a909d532f3c1b7ac5
-MISC metadata.xml 345 BLAKE2B d3d3a7c6c9190164021daa496d56d6c75f735064bdfe2603fd2700d7617ceafac658b14470ab7a9b71b7a52f2909feb0e4f4daaebe72ed814b5d05c2339a3637 SHA512 b9387957d5128bb7a631c385887c7fc35eb86540f026703e2404bb128623f6a7e1e22ee54c15e43fd9bfa5bd546d1235fb17b0a95dc2a0ad2bebd995a3dba67f
+EBUILD snd-22.8.ebuild 2191 BLAKE2B 1ac923296ae9fd3ec2752352cdd6c4cb44de85444cfbea88b8e27fc4572d01e9860086059fe4f1070eed0ddf20d15f6b48ea630d0839403bc09734992de6617c SHA512 4fdf7ce4bc4e16ec094a6b3824873065e6a57a070778a68e2d5a82d3c98e11975b082103a371319dec1495b02d1514a5a2712c74c0220b8e99dfb5df2ae8f6f9
+MISC metadata.xml 433 BLAKE2B 23952287911295ce3b2c3e199868b3fdc19d59c623ec597c94dbbe6b4c0692d4116750979ff1ef0664247e20e99a98214100fb2540564965bc43ca9aa6e4d042 SHA512 43147658b396bcc3cd0d335451b7c59f0c9ba5da4849eaed44115d58502076d1ebb56b169cea308183c31e3dc227c69f9c1076b5dad253a97f36a15fe6d09498
diff --git a/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch
new file mode 100644
index 000000000000..f94e5b64ea53
--- /dev/null
+++ b/media-sound/snd/files/snd-22.8-undefined-oss_sample_types.patch
@@ -0,0 +1,42 @@
+Always compile the `oss_sample_types` function
+Bug: https://bugs.gentoo.org/621758
+
+Also, conditionally use pulseaudio_sample_types:
+```
+audio.c: In function ‘mus_audio_device_sample_type’:
+audio.c:5687:5: error: implicit declaration of function ‘pulseaudio_sample_types’; did you mean ‘alsa_sample_types’? [-Werror=implicit-function-declaration]
+ 5687 |     pulseaudio_sample_types(dev, mixer_vals);
+      |     ^~~~~~~~~~~~~~~~~~~~~~~
+      |     alsa_sample_types
+```
+--- a/audio.c
++++ b/audio.c
+@@ -744,7 +744,6 @@ static int oss_mus_audio_open_input(int ur_dev, int srate, int chans, mus_sample
+ }
+ 
+ 
+-#if (!HAVE_ALSA) && (!HAVE_JACK_IN_LINUX)
+ static int oss_sample_types(int ur_dev, mus_sample_t *val)
+ {
+   int fd, samp_types = 0, sys, ind;
+@@ -775,7 +774,6 @@ static int oss_sample_types(int ur_dev, mus_sample_t *val)
+   val[0] = (mus_sample_t)(ind - 1);
+   return(MUS_NO_ERROR);
+ }
+-#endif
+
+
+
+--- a/audio.c
++++ b/audio.c
+@@ -5682,7 +5682,7 @@ mus_sample_t mus_audio_device_sample_type(int dev) /* snd-dac */
+ #endif
+ #endif
+
+-#if defined(MUS_PULSEAUDIO)
++#if defined(MUS_PULSEAUDIO) && (!(defined(AUDIO_OK)))
+   if (mixer_vals[0] == MUS_UNKNOWN_SAMPLE)
+     pulseaudio_sample_types(dev, mixer_vals);
+ #endif
+--
+2.38.0
diff --git a/media-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
index a9f94b17f953..1007169df4b2 100644
--- a/media-sound/snd/metadata.xml
+++ b/media-sound/snd/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sound@gentoo.org</email>
-  <name>Gentoo Sound project</name>
-</maintainer>
-<use>
-  <flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
-</use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="notcurses">Terminal interface via <pkg>dev-cpp/notcurses</pkg></flag>
+		<flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/snd/snd-22.8.ebuild b/media-sound/snd/snd-22.8.ebuild
new file mode 100644
index 000000000000..04c60c009588
--- /dev/null
+++ b/media-sound/snd/snd-22.8.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Snd is a sound editor"
+HOMEPAGE="https://ccrma.stanford.edu/software/snd/"
+SRC_URI="https://ccrma.stanford.edu/software/${PN}/${P}.tar.gz"
+
+LICENSE="Snd 0BSD BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa doc fftw gmp gsl gui jack ladspa notcurses opengl oss portaudio pulseaudio readline ruby +s7"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? (
+		dev-libs/gmp:=
+		dev-libs/mpc
+		dev-libs/mpfr:=
+	)
+	gsl? ( sci-libs/gsl:= )
+	gui? ( >=x11-libs/motif-2.3:0 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/ladspa-sdk )
+	notcurses? ( dev-cpp/notcurses )
+	opengl? ( virtual/opengl )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	readline? ( sys-libs/readline:= )
+	ruby? ( dev-lang/ruby:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	?? ( portaudio pulseaudio )
+	?? ( ruby s7 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.8-undefined-oss_sample_types.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:-O2 ::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# Workaround executable sections QA warning (bug #348754)
+	append-ldflags -Wl,-z,noexecstack
+
+	local myeconfargs=(
+		$(use_with alsa)
+		$(use_with fftw)
+		$(use_with gmp)
+		$(use_with gsl)
+		$(use_with gui)
+		$(use_with jack)
+		$(use_with ladspa)
+		$(use_with notcurses)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio)
+		$(use_with ruby)
+		$(use_with s7)
+	)
+
+	if ! use ruby && ! use s7 ; then
+		myeconfargs+=( --without-extension-language )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake snd
+
+	# Do not compile ruby extensions for command line programs since they fail
+	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die
+
+	emake sndplay sndinfo
+}
+
+src_install() {
+	dobin snd sndplay sndinfo
+
+	if use ruby ; then
+		insinto /usr/share/snd
+		doins *.rb
+	fi
+
+	if use s7 ; then
+		insinto /usr/share/snd
+		doins *.scm
+	fi
+
+	use doc && HTML_DOCS=( *.html pix/*.png )
+	einstalldocs
+	dodoc HISTORY.Snd
+}