From 1b2360e7bab42e4045232887cb4f6c4a24ca3975 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Feb 2025 00:11:16 +0000 Subject: gentoo auto-resync : 07:02:2025 - 00:11:15 --- media-libs/alsa-lib/Manifest | 3 +- media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild | 100 -------------------- media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild | 104 +++++++++++++++++++++ .../files/alsa-lib-1.2.13-headers-again.patch | 40 ++++++++ 4 files changed, 146 insertions(+), 101 deletions(-) delete mode 100644 media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild create mode 100644 media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild create mode 100644 media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch (limited to 'media-libs/alsa-lib') diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 75f2c4600388..d282b3053f1f 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -1,5 +1,6 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90 AUX alsa-lib-1.2.11-topology-correct-version-script-path.patch 1167 BLAKE2B 0540456e96eb47279d952b888d7c7ada54b7850e0a2a091b98bafc7969e97cdd829ecf7572a03eaa8b5da3d8e548b3c787eda66502673954bd583809b98a5f3d SHA512 a8ed806a9a98a0c351a76f043bb8344746f5258c13d8d08be547556e0f9c1c65472398d9d6cdeb87c22fb1340b8cc23c10bb1aee42063544c31f4afbcf8fa84e +AUX alsa-lib-1.2.13-headers-again.patch 1302 BLAKE2B 79d581927427552ea934ee4f81ca142ca5cdcd44b064f1287720aacef91ecd37d386d11284230b27e643c6a82d573e8c81dd2e90417bf5eff7c0963b9a374f5b SHA512 18b656d393da25a0ce7d40e5c1734e9d83d6224426a2e29fc405edfcb004ead8814ff89644f31e3558ae5488b3ae854debe545e9a64f735f2c23fe6bda686517 AUX alsa-lib-1.2.13-seq-ump-headers.patch 1262 BLAKE2B eb4c76aa3d72d026690881b7a051b8da6b8f8837120889a364a85e16fe76190d57fbd23c52c6f5ab52262805e0ff29d3a22270beae14bcbbd25f4c02f2c72391 SHA512 13c5c009505ff502ac52c0f7745c947c49cf6332e26d667f876ef4afbe6b240ff7f87946d1b5d542260d020e599336d54e37d17d7ad72532581792a85fb41d12 AUX alsa-lib-1.2.13-update-symbol-name.patch 1574 BLAKE2B d685102ff60f4ed1bcdca4cf943110aa9abd3d4a421668804b60a38409fd83f1213661355d77a39a0bd8fe55f02e5750fb77fcdd284f0cf7709082d292797833 SHA512 d283736ae62eb055d0a5c7200b555193b6a57300887483310756f94ddca16b6a11f22fdf91998d3673a2c470279b677d4002c682d503dc1e3984cf22a3920379 DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d @@ -7,5 +8,5 @@ DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0 DIST alsa-lib-1.2.13.tar.bz2 1116739 BLAKE2B 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3 SHA512 b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e EBUILD alsa-lib-1.2.12.ebuild 2588 BLAKE2B f63344a40d1d07be7c8ba1b57634d872aad48f5c334e8b3d95e55a512e91264ff1f197a38b54ec011ce096cf9219da1ea713362536f75d06a9e5ccd150246454 SHA512 67caebc57c286cdc5c13e7a77e5edd8fe5c56a8d56d126369fd21873a224df37a75e3b831a2316c1de3efd0d47e35fb76eedd0589c8b804f911084a8ce14c76e -EBUILD alsa-lib-1.2.13-r1.ebuild 2727 BLAKE2B cc2c46ac14e2d89783c33eb29e3c7c5105cf445bf1a9921cb5027dc808c56118a5c9cf0e3b66d7c7098976d4f66f7c912371d5e00071563d31ecd4eda15dd75d SHA512 fde7620308c114b6f529e40f62ed4577003d6d50903ae2ca416ab41e4320ce9b56fe90fe2f1e56927967becd5e233252132bc2ec48215838a3f5954fba14bb50 +EBUILD alsa-lib-1.2.13-r2.ebuild 2830 BLAKE2B a6b663eba7558c16fe3db53e72a13242af8ef022806a20b8cb5f75181f03471f24b3c4aa09a11974632df2a403c6af7581018826ca0cd36d2afba625fb1cb668 SHA512 876ecdb6f47b7589dcb3f46a9b72ac29f2ee93d9f439464e67e25478a53de480e1253e159bf3a73a197851db0b6f44b30a3cc7da196fbbfb5f970bbdcb00cfb9 MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild deleted file mode 100644 index 8b47c423b17e..000000000000 --- a/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -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="7e3a3c2b0a092d0f568ba3c98365030dd91cc877" - 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 ~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-text/doxygen-1.2.6 )" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 - "${FILESDIR}/${PN}-1.2.13-update-symbol-name.patch" # bug #943399 - "${FILESDIR}/${PN}-1.2.13-seq-ump-headers.patch" # bug #943696 -) - -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. - # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. - # Let us know if you can identify one.) - 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 '*.la' -delete || die - - dodoc ChangeLog doc/asoundrc.txt NOTES TODO -} diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild new file mode 100644 index 000000000000..9248789746ba --- /dev/null +++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +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="7e3a3c2b0a092d0f568ba3c98365030dd91cc877" + 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 ~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-text/doxygen-1.2.6 )" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 + "${FILESDIR}/${PN}-1.2.13-update-symbol-name.patch" # bug #943399 + "${FILESDIR}/${P}-seq-ump-headers.patch" # bug #943696 + "${FILESDIR}/${P}-headers-again.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() { + # Tests fail to build w/ C23 (bug #944447) + append-cflags -std=gnu17 + + # 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. + # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it. + # Let us know if you can identify one.) + 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 '*.la' -delete || die + + dodoc ChangeLog doc/asoundrc.txt NOTES TODO +} diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch new file mode 100644 index 000000000000..ee666cd56fe7 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.2.13-headers-again.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/949127 +https://bugs.gentoo.org/946562 +https://bugs.gentoo.org/944447 +https://github.com/alsa-project/alsa-lib/issues/430 +https://github.com/alsa-project/alsa-lib/issues/436 +https://github.com/alsa-project/alsa-lib/commit/c8bc54a9cae3d5080dc7a298aee573b10f2bbf62 + +From c8bc54a9cae3d5080dc7a298aee573b10f2bbf62 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Sun, 2 Feb 2025 19:18:25 +0100 +Subject: [PATCH] test/playmidi1: fix compilation caused by conflict between + midifile.h and ump_msg.h + +It's a fast fix. The better way is to fix midifile.h or remote this example +(we have already some + +Closes: https://github.com/alsa-project/alsa-lib/issues/436 +Signed-off-by: Jaroslav Kysela +--- + test/playmidi1.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/playmidi1.c b/test/playmidi1.c +index 831e95783..286aaa86e 100644 +--- a/test/playmidi1.c ++++ b/test/playmidi1.c +@@ -45,10 +45,11 @@ + #include + #include + ++#include "../include/asoundlib.h" ++ + #include "midifile.h" /* SMF library header */ + #include "midifile.c" /* SMF library code */ + +-#include "../include/asoundlib.h" + + /* send the real-time time stamps (instead of midi ticks) to the ALSA sequencer */ + static int use_realtime = 0; + -- cgit v1.2.3