gentoo resync : 05.04.2018

4 files changed, 285 insertions, 1 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index f88fdb61a0bd..a98b4efa1789 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,7 +1,10 @@
+AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
 DIST alsa-lib-1.1.4.1.tar.bz2 974584 BLAKE2B f3221fa55dc11c04f4a1bc3ee90d2a679ca9b8bde65e2801ae5762fa456ef8e45532624efa57bf7d62f82e5c172eaf10f2286f9acace5a47e20123acf5ce04d2 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b
 DIST alsa-lib-1.1.5.tar.bz2 979225 BLAKE2B 75683b17bfd51c1e54f1a460ed32a170b07eb227bd6b9ee481d123116464f5c16bbb49f29dfc8d08baaf2f69c5333bf71b70c33b5d420c43e56ae4ace76a6ab0 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58
+DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
 EBUILD alsa-lib-1.1.2.ebuild 2237 BLAKE2B 8137d76b3ba07ce93dc7808f14954b65b77d65b01a4541c1f7c173e57edcb397d5dcfc980ff4a80a1095bbecbd1378cd078b7878a8e519b50bf3ff1e95cc903a SHA512 458e843005031316acd8c6564f4eb39f9729c48d8275df01036242342967ae097b3dddb5768b49ba162905db6b1769fb1d3b3ed5aefad232b6f72c0b404abfd5
 EBUILD alsa-lib-1.1.4.1.ebuild 2246 BLAKE2B ae36e6f8b82850f3ad3c67e5cc0b26ecadb9a35b77b9f3147934a208145d8e9ea7e2ec0b62c8645c62eab95fa0892c8f30f23f3e651c1f9be7fca9ed4e10c514 SHA512 35c31a8b113f4cf7516c4ba56dba10b5bfa6b9d5d0ff5733d1c6c32bf72f5a6e61ac5230662cc3dc8a6aa95750f58ad84f67c16c86a05d935234f4d31250112b
 EBUILD alsa-lib-1.1.5.ebuild 2246 BLAKE2B ae36e6f8b82850f3ad3c67e5cc0b26ecadb9a35b77b9f3147934a208145d8e9ea7e2ec0b62c8645c62eab95fa0892c8f30f23f3e651c1f9be7fca9ed4e10c514 SHA512 35c31a8b113f4cf7516c4ba56dba10b5bfa6b9d5d0ff5733d1c6c32bf72f5a6e61ac5230662cc3dc8a6aa95750f58ad84f67c16c86a05d935234f4d31250112b
-MISC metadata.xml 438 BLAKE2B a24193ce0d919303e0e2c8c260bcb114be973a7dda22ece5cf7ce56cd4a8cfcc24acdfe45a4de61b787b6e56b240e08d53ac506f01414a73d0044f6a35ba8212 SHA512 1e3a7f5a2f9ea84793ec938eb657fcbd6d5748f1cb055d085c638e30d1b5c1154a9dc0026d6e3592de074125c17926a4429757844f7d02b960f4a9a8d94a0433
+EBUILD alsa-lib-1.1.6-r1.ebuild 2060 BLAKE2B 8a2e25921cba37d8e0e5985faab131ca359d363dae7c347dc9ff9f52b206cb3e5b59eb0ebb2b38487e85184a329eb335e2d4a5860cded27195fe64c6d181b8de SHA512 d46f1d30068df97006f3c3d84623bb16015e28a1f79cf0f8b44e8e78cc6d222ad1a4bae3a6957d6e4f55d29593e7916ca791aceaf42142dd5b33a8dc5bee597e
+MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..f03ea3f74dac
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-missing_files.patch" #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch
new file mode 100644
index 000000000000..909a00b985b2
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch
@@ -0,0 +1,196 @@
+https://bugs.gentoo.org/652422
+
+--- alsa-lib-1.1.6/src/conf/cards/aliases.alisp
++++ alsa-lib-1.1.6/src/conf/cards/aliases.alisp
+@@ -0,0 +1,29 @@
++(setq snd_card_aliases_array
++  (
++    ("YMF724" 		. "YMF744")
++    ("YMF724F"		. "YMF744")
++    ("YMF740"		. "YMF744")
++    ("YMF740C"		. "YMF744")
++    ("YMF754"		. "YMF744")
++    ("CMIPCI"		. "CMI8338")
++    ("CMI8738"		. "CMI8338")
++    ("CMI8738-MC4"	. "CMI8738-MC6")
++    ("E-mu APS"		. "EMU10K1")
++    ("GUS Max"		. "GUS")
++    ("GUS ACE" 		. "GUS")
++    ("GUS Extreme"	. "GUS")
++    ("AMD InterWave"	. "GUS")
++    ("Dynasonic 3-D"	. "GUS")
++    ("InterWave STB"	. "GUS")
++  )
++)
++
++(defun snd_card_alias (cardname)
++  (setq r (assq cardname snd_card_aliases_array))
++  (setq r (if (null r) cardname r))
++  (unsetq r)
++)
++
++(defun snd_card_alias_unset ()
++  (unsetq snd_card_aliases_array snd_card_alias)
++)
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp
+@@ -0,0 +1,11 @@
++;
++; SiS SI7018 mixer abstract layer
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndoc_mixer_open (hctl pcm)
++  (princ "sndoc_mixer_open: hctl=" hctl " pcm=" pcm "\n")
++  0
++)
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp
+@@ -0,0 +1,11 @@
++;
++; SiS SI7018 mixer abstract layer
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndop_mixer_open (hctl pcm)
++  (princ "sndop_mixer_open: hctl=" hctl " pcm=" pcm "\n")
++  0
++)
+--- alsa-lib-1.1.6/src/conf/smixer.conf
++++ alsa-lib-1.1.6/src/conf/smixer.conf
+@@ -0,0 +1,13 @@
++_full smixer-python.so
++usb {
++	searchl "USB"
++	lib smixer-usb.so
++}
++ac97 {
++	searchl "AC97a:"
++	lib smixer-ac97.so
++}
++hda {
++	searchl "HDA:"
++	lib smixer-hda.so
++}
+--- alsa-lib-1.1.6/src/conf/sndo-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/sndo-mixer.alisp
+@@ -0,0 +1,115 @@
++;
++; Toplevel configuration for the ALSA Ordinary Mixer Interface
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndo_include (hctl stream)
++  (setq info (Acall "ctl_card_info" (Acall "hctl_ctl" hctl)))
++  (if (= (Aerror info) 0)
++    (progn
++      (setq info (Aresult info))
++      (setq driver (cdr (assq "driver" (unsetq info))))
++      (setq file (concat (path "data") "/alsa/cards/" (snd_card_alias driver) "/sndo" stream "-mixer.alisp"))
++      (setq r (include file))
++      (when (= r -2) (Asyserr "unable to find file " file))
++    )
++    (setq r (Aerror info))
++  )
++  (unsetq info driver file r)
++)
++
++(defun sndo_mixer_open_fcn (hctl stream pcm)
++  (setq fcn (concat "sndo" stream "_mixer_open"))
++  (setq r (if (exfun fcn) (funcall fcn hctl pcm) 0))
++  (when (= r 0)
++    (setq hctls (if hctls (cons hctls (cons hctl)) hctl))
++  )
++  (unsetq fcn r)
++)
++
++(defun sndo_mixer_open_hctl (name stream pcm)
++  (setq hctl (Acall "hctl_open" name nil))
++  (setq r (Aerror hctl))
++  (when (= r 0)
++    (setq hctl (Aresult hctl))
++    (setq r (sndo_include hctl stream))
++    (if (= r 0)
++       (setq r (sndo_mixer_open_fcn hctl stream pcm))
++       (Acall "hctl_close" hctl)
++    )
++  )
++  (unsetq hctl r)
++)
++
++(defun sndo_mixer_open_virtual (name stream pcm)
++  (setq file (concat (path "data") "/alsa/virtual/" name "/sndo" stream "-mixer.alisp"))
++  (setq r (include file))
++  (when (= r -2) (Asyserr "unable to find file " file))
++  (when (= r 0) (setq r (sndo_mixer_open_fcn nil stream pcm)))
++  (unsetq file r)
++)
++
++(defun sndo_mixer_open1 (name stream)
++  (if (compare-strings name 0 2 "hw:" 0 2)
++    (sndo_mixer_open_hctl name stream nil)
++    (sndo_mixer_open_virtual name stream nil)
++  )
++)
++
++(defun sndo_mixer_open (pname cname)
++  (setq r (sndo_mixer_open1 pname "p"))
++  (when (= r 0) (setq r (sndo_mixer_open1 cname "c")))
++  (when (!= r 0) (sndo_mixer_close))
++  (unsetq sndo_mixer_open
++	  sndo_mixer_open_pcm sndo_mixer_open_pcm1
++          sndo_mixer_open_virtual sndo_mixer_open_fcn
++	  sndo_include r)
++)
++
++(defun sndo_mixer_open_pcm1 (pcm stream)
++  (setq info (Acall "pcm_info" pcm))
++  (setq r (Aerror info))
++  (when (= r 0)
++    (setq info (Aresult info))
++    (setq card (cdr (assq "card" info)))
++    (setq r
++      (if (< card 0)
++	(sndo_mixer_open_virtual (Acall "pcm_name" pcm) stream pcm)
++        (sndo_mixer_open_hctl (format "hw:%i" card) stream pcm)
++      )
++    )
++  )
++  (unsetq info card r)
++)
++
++(defun sndo_mixer_open_pcm (ppcm cpcm)
++  (setq r (sndo_mixer_open_pcm1 ppcm "p"))
++  (when (= r 0) (setq r (sndo_mixer_open_pcm1 cpcm "c")))
++  (when (!= r 0) (sndo_mixer_close))
++  (unsetq sndo_mixer_open
++	  sndo_mixer_open_pcm sndo_mixer_open_pcm1
++          sndo_mixer_open_virtual sndo_mixer_open_fcn
++	  sndo_include r)
++)
++
++(defun sndo_mixer_close1 (hctl stream)
++  (when hctl
++    (progn
++      (setq fcn (concat "sndo" stream "_mixer_close"))
++      (when (exfun fcn) (funcall fcn hctl))
++      (unsetq fcn)
++      (Acall "hctl_close" hctl)
++    )
++  )
++)
++
++(defun sndo_mixer_close nil
++  (sndo_mixer_close1 (nth 1 hctls) "c")
++  (sndo_mixer_close1 (nth 0 hctls) "p")
++  (snd_card_alias_unset)
++  (unsetq hctls)
++)
++
++(include (concat (path "data") "/alsa/cards/aliases.alisp"))
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
index d1e21028a986..356924f368ba 100644
--- a/media-libs/alsa-lib/metadata.xml
+++ b/media-libs/alsa-lib/metadata.xml
@@ -6,6 +6,7 @@
   </maintainer>
   <use>
     <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag>
+    <flag name="thread-safety">thread-safe API functions</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id>