From 7785404bd292918a4afd4780ccfc36d6626a49ca Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Oct 2022 03:04:34 +0000 Subject: gentoo auto-resync : 31:10:2022 - 03:04:34 --- media-libs/alsa-lib/Manifest | 3 +- media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild | 97 ++++++++++++++++++++++ media-libs/alsa-lib/alsa-lib-1.2.8.ebuild | 96 --------------------- .../files/alsa-lib-1.2.8-clang16-macro.patch | 31 +++++++ 4 files changed, 130 insertions(+), 97 deletions(-) create mode 100644 media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild delete mode 100644 media-libs/alsa-lib/alsa-lib-1.2.8.ebuild create mode 100644 media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch (limited to 'media-libs/alsa-lib') diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 349f7d7c00ad..e197af86487d 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -1,7 +1,8 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90 +AUX alsa-lib-1.2.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f932f472a2d6cc53c9d10373a76def7a7e7e21f33b6cf804630a7b6b4c37c8422fe4580cfa9e8e490abb2faf89cbf98d05f03 SHA512 5be97f4a609a285a976197b6f7320f82c2c1a3425e00b7c7c2f58cc4e8c61ce4270ec49c068882268924fe7dec32557f36c206870df5abf3b715e8ad2494655e DIST alsa-lib-1.2.7.2.tar.bz2 1085117 BLAKE2B 9ae3d4358d802970249e1b904faa7c4d646dec1d8c93e0de9c4b70065e912b910303d77e8f9f68c97b883ec270cf0dd8b97146b4a85f3aede4f290683c462fce SHA512 79e5920384e570a1acd8ecd1eb8812879333c3cedb1d15780080afc40125b97df893c33f4163d9dd863871b628bc6026265f8ace2c8634fc1af5b52b62ac9cfe DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688 EBUILD alsa-lib-1.2.7.2-r1.ebuild 2538 BLAKE2B 03e5450487342313b88d3fc092c10eaf3fc563deda3d0289f5978d8780669fe1c94f4f79fc2c25f6aef788f2feeb226b9e670d5eb88d904294aa1847d5e1cd99 SHA512 b60edde961118761c07f10088b72c3ec77884e02c14805fb6f0465b576a047598dd3551223ff449180f65fc07284c0d3234fe94c1760f72f6ed5a58bfa8693f3 EBUILD alsa-lib-1.2.7.2.ebuild 2550 BLAKE2B 1c42ad20cb4b4044fba20a164a2c6e225872e840a2277a7cb4c7b18ebf6c1b455d24f2b5a0dd724a9c08bc594a98bb424cb60eed526afd6dfd8b7c15d26b3932 SHA512 4c064583506992e8400c254d6069a52ad732e1c84fd81ab94d4a31403a540f14e62b10b9f6e7c15d348f7bdfdfd10479fec4647f10881a0b9dc57d72e56064fb -EBUILD alsa-lib-1.2.8.ebuild 2501 BLAKE2B 12944f160fc9bd3e3674609dac9b054a1179b0a4b155759e51c00f916c183d20bdb156eb1af72e6e60fe022591d938083030c687383c16a29197b68fff12da94 SHA512 faa04db0c873fba60256868bf2c69063ecd3f02f81d88a5c049ec20319f8c6566e6fb699b0aa4d54566e33b9fa1ab25e872eb90be976c6829a60e7884ec9ca71 +EBUILD alsa-lib-1.2.8-r1.ebuild 2548 BLAKE2B ab447ea6e693dad0f6c442f1cd795c005a9c65f9ffaf6c55aad8672b01e25ad262928dc6aab6d625cf8101769b8271b19a0ed60c8c6594d54aa9ffc14c9beee1 SHA512 fc286ec2750e32040e9a7f11d39de61ff04f4b8804a1d61739c0e858cce8852a1f930fe9a9a67c8334b2fd1dd33660fa0c7b59b2646255b3b21bd869e82a3e4f MISC metadata.xml 624 BLAKE2B b2f57320a348a39867c5ee362a9bea5df1518b4fa41cd99468fe87fea487da85e188889a7c77f0380b3beadd1807c86b444886d953263c218ca3746bc1aa2a5e SHA512 79f2bbc1d17edff04dc940355646e84583164407598c2a26d8decbfda3ad5de62e2926ec12c929c3b06a5fc7e9c1bce4a40e631d2bc4038979f9e240b7a33c09 diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild new file mode 100644 index 000000000000..60c8f343db4e --- /dev/null +++ b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit autotools multilib-minimal flag-o-matic python-single-r1 + +DESCRIPTION="Advanced Linux Sound Architecture Library" +HOMEPAGE="https://alsa-project.org/wiki/Main_Page" +if [[ ${PV} == *_p* ]] ; then + # Please set correct commit ID for a snapshot release! + COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd" + SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${COMMIT:0:7} +else + # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) + SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="alisp debug doc python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + media-libs/alsa-topology-conf + media-libs/alsa-ucm-conf + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 + "${FILESDIR}/${PN}-1.2.8-clang16-macro.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die + # bug #545950 + sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die + + eautoreconf +} + +multilib_src_configure() { + # Broken upstream. Could in theory work with -flto-partitions=none + # but it's a hack to workaround the real problem and not strictly safe. + # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6. + filter-lto + + local myeconfargs=( + --disable-maintainer-mode + --disable-resmgr + --enable-aload + --enable-rawmidi + --enable-seq + --enable-shared + --enable-thread-safety + + $(multilib_native_use_enable python) + $(use_enable alisp) + $(use_with debug) + ) + + 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}::" || die + fi +} + +multilib_src_install() { + multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) + + default +} + +multilib_src_install_all() { + find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die + + dodoc ChangeLog doc/asoundrc.txt NOTES TODO +} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild deleted file mode 100644 index ea97e535b5f7..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit autotools multilib-minimal flag-o-matic python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -if [[ ${PV} == *_p* ]] ; then - # Please set correct commit ID for a snapshot release! - COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd" - SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT:0:7} -else - # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) - SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" -fi - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="alisp debug doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - media-libs/alsa-topology-conf - media-libs/alsa-ucm-conf - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die - # bug #545950 - sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die - - eautoreconf -} - -multilib_src_configure() { - # Broken upstream. Could in theory work with -flto-partitions=none - # but it's a hack to workaround the real problem and not strictly safe. - # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6. - filter-lto - - local myeconfargs=( - --disable-maintainer-mode - --disable-resmgr - --enable-aload - --enable-rawmidi - --enable-seq - --enable-shared - --enable-thread-safety - - $(multilib_native_use_enable python) - $(use_enable alisp) - $(use_with debug) - ) - - 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}::" || die - fi -} - -multilib_src_install() { - multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. ) - - default -} - -multilib_src_install_all() { - find "${ED}" -type f \( -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.2.8-clang16-macro.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch new file mode 100644 index 000000000000..c74a7cc73e26 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch @@ -0,0 +1,31 @@ +https://github.com/alsa-project/alsa-lib/pull/278 + +From 68a233404279366f7c7e34afb6197bcc70f4b7d7 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 30 Oct 2022 18:06:37 +0000 +Subject: [PATCH] utils/alsa.m4: include for exit() + +Clang 16 makes -Wimplicit-function-declaration an error by default +and it's easier to just explicitly include rather +than hope the ALSA headers always have it. + +Signed-off-by: Sam James +--- a/utils/alsa.m4 ++++ b/utils/alsa.m4 +@@ -85,6 +85,7 @@ AC_LANG_PUSH([C]) + AC_MSG_CHECKING([for libasound headers version >= $alsa_min_major_version.$alsa_min_minor_version.$alsa_min_micro_version ($min_alsa_version)]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include ++#include + ]], [[ + /* ensure backward compatibility */ + #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) +@@ -130,6 +131,7 @@ AC_MSG_CHECKING([for libatopology (sound headers version > 1.1.9)]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ++#include + ]], [[ + /* ensure backward compatibility */ + #if !defined(SND_LIB_VERSION) + -- cgit v1.2.3