gentoo resync : 05.04.2018

2 files changed, 110 insertions, 0 deletions

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 5c2f7e661300..42e446255733 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -6,8 +6,10 @@ AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
 DIST alsa-plugins-1.1.4.tar.bz2 366931 BLAKE2B a0a2d91b86be612e830513d08fe34e1f785f772bd698069e002e3eec48236a4ab63d042be0ebaa6b3890d6d6f3ca75500d241542b89b717532eea59188e1aa0c SHA512 edbc9dd762e2500ce6f820d81fcd8d2577506afcea0b33a32cece95f8d6651840f4f8a55664f274d735ab3effa13cdbfc0331690c37a64a9ad050c15dc77cac6
 DIST alsa-plugins-1.1.5.tar.bz2 366999 BLAKE2B 299a21586018788b511d7c9dec588182cc39132aa4f1840eca57e3125f6bbdbcdeabbe4b55a93ed107eab2653a85328aec1c9e6f70c302bb224b3fa50a474c75 SHA512 50a79d9dbcca72b2133aba7dca594302dcd5816eb71afc311a4c2a96aac7632a0a034875faf3100f2c8a44f3fbbede264e5cd9beacf2a07f2fa6786f66edae39
+DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2809 BLAKE2B 5af39eeaaf95733b81decdb857388eaca0bcc06bca21510c8357e06857a117b142fc60367a5b7e30af518f83fa517b7d24d1581d3d74c1b8ff5baa67b298995e SHA512 9a69ff136d03d28aedf1e82522653e2276f705a04e538e8ac226031c4439f3646ace3b72eb3a757841d988ba92e2ea0beaac0b97cf629d3105b838d84cc52fa4
 EBUILD alsa-plugins-1.1.4-r1.ebuild 2783 BLAKE2B 19244ad5860ca6ccff6c1d05dadc0f4d50889938d0ec1fced11f474ed66318d5120fb915bcd074ca918508790719c110993fa7d8fbcee4fc42276204b0700820 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245
 EBUILD alsa-plugins-1.1.5-r1.ebuild 2963 BLAKE2B e840cd33c976b33d3476206507d73a1a2525b7fda9f3870ed4af6eff85636d7176fdcd53489ab40dc5639033daff9fc0c89a3867da066329ac95490b2ce5d7e2 SHA512 0907b58d7b309e0e63d3aec62240678f925749bdf2c4fac14499f34478f1d6b59319dac03ae5f3d448d543ddeae79c1963c9a351f1c050bd5268cc9d388f5001
 EBUILD alsa-plugins-1.1.5.ebuild 2783 BLAKE2B 19244ad5860ca6ccff6c1d05dadc0f4d50889938d0ec1fced11f474ed66318d5120fb915bcd074ca918508790719c110993fa7d8fbcee4fc42276204b0700820 SHA512 1650dbeb541884554a00f17d84bd88659944c4c32cd018a3858ce8674b3f7db6c87d22771dadf93677f528e6171463118265a2054caeef2b3a4b1ff2d6efb245
+EBUILD alsa-plugins-1.1.6.ebuild 2991 BLAKE2B 6f499c415215cfb68a1f0d6a2558783eed9d47153f4ca5114305ec1117da3f9114ec5912d83bbdba55368aaea8ea92cdd10881404706ff2ccc8e215ac5859d8c SHA512 67efaae51adbee6053d673a40f23a21d4c0b9c563a2cf846ac322adf1836c42aba3d0bbba902ec35ff53ef3136e42fcf9a86b91bf8783db199f79cf6bf2939ef
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
new file mode 100644
index 000000000000..d7a9bd8fa2e2
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		|| (
+			(
+				>=media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
+				media-libs/speexdsp[${MULTILIB_USEDEP}]
+			)
+			<media-libs/speex-1.2.0[${MULTILIB_USEDEP}]
+		)
+		media-libs/speex:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.5-optional_plugins.patch"
+)
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavcrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}