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/Manifest.gz | Bin 67093 -> 67095 bytes 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 +++++++ media-libs/kcolorpicker/Manifest | 2 +- media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild | 2 +- media-libs/kimageannotator/Manifest | 2 +- .../kimageannotator/kimageannotator-0.6.0.ebuild | 2 +- 9 files changed, 134 insertions(+), 101 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') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index bfcf095bd6b6..35f620ba4345 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ 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) + diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest index 86ed7be30339..1d7d4cce66e2 100644 --- a/media-libs/kcolorpicker/Manifest +++ b/media-libs/kcolorpicker/Manifest @@ -1,5 +1,5 @@ DIST kColorPicker-0.1.6.tar.gz 12028 BLAKE2B dda08211b56186a34afa9049a2770d98b25659fb0e9fed344f9305420ddc5f69517684236d2d1b1613cec0661f6af43fc463a0cc403bead27d0b6c535030d7d4 SHA512 9702b0dfd9d340aa2b043711b27f2ac1994ff6cdd06e912deb410bd3500a2b68fa046d91bbd1392f3c95905e4cf7660819d70864cc85e55cb4c8879e820e7cec DIST kColorPicker-0.2.0.tar.gz 12735 BLAKE2B 39b0c80ec5b498800dd251901b0bd57c839693f071185afacefa8d5a715ff18f2297c50486d98871471c40e0904a07ff40198b548d9368937b120a1eef07929f SHA512 44f9f317ebe5dd3131a9e44071f9f5b397b0d5cceece566f3ecf19932c8e36dafe1a434e623239421bead9413f0859bc3380174d7f14843770691e4d15a956eb EBUILD kcolorpicker-0.1.6.ebuild 746 BLAKE2B 3a9a0d72af85c2ab13233e75f94e67ea1b4d2c9257af716f18a6b4439f1a1e7c7abf1add00462a86aca387931bd41b2843283121a3e0d88dd3f52f036eec0dd9 SHA512 9edfc22cc8ae8d2e7177e8517d73b606a24a1dd8b6f52897b068d1d0df99d3948d9d34f274fd0b7cafe36dd3ccc4fb40bc5a48eeccc309d596bee9b4360a4e3b -EBUILD kcolorpicker-0.2.0.ebuild 749 BLAKE2B 24035e99785a93d83f31091af3c2b6f4afef9a61d94b3154a81bbe1f2db69e005319e143fc23030fe3f9610b365f9bfc82242ea7c5678e2db9bf032c9ff5a9a7 SHA512 c54796ae1f70f73b943693e30bf05943cde07cd562575db608b8595e11c4143d49aa29fed8b3d02e2fddcefa792d1938bc5662707a770e5a5db8729600762849 +EBUILD kcolorpicker-0.2.0.ebuild 756 BLAKE2B a3efd88cb5b93b660926ef46059b9a677ccd81755f492afc5e856991ceb929bd29f9c61d6a6ee79c09a7a26b6bf519ce7531ea6bdccd36a6bd2fb8ebf6b4d76a SHA512 125422e7b7c46a980b32bbb77433d36c43efbf897808059692ca58ff1a20cfe921a630bb9c09ac1b06f54dd64244fd964f8cf733c1b77da7793b6cb202fc083d MISC metadata.xml 613 BLAKE2B b96e90131adc5be0575362e88ccaef939d42f532ef2694af9a77ba71dd6b6b930a30a12dba331e9819727fdc717e6374b128981004ce7af3f06728c1bea995f1 SHA512 e2b7fde171e6d3a528aa02f4130bf153e6a63eafce449a0a092e7a3d52b36a8126e3b496de1cc66d5dfe3c7623a62ea9693d96453cbf0ed5ae4fbde2c15c287d diff --git a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild index 4e15369406c2..2963e9a9562e 100644 --- a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild +++ b/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar. LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test" RDEPEND=" diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest index 847f08b1023f..7e791df9482c 100644 --- a/media-libs/kimageannotator/Manifest +++ b/media-libs/kimageannotator/Manifest @@ -3,5 +3,5 @@ DIST kImageAnnotator-0.5.3.tar.gz 219782 BLAKE2B 30f532a563761a665da1f926629ebd6 DIST kImageAnnotator-0.6.0.tar.gz 257662 BLAKE2B 3736d0e862f1d3f3f9728e4d4d611c7e406d40fe022a2441b1a80355997d86a194064ecade63b7657d3cbf1f63364b8b74654d9c92d809ac056b7dc999d97415 SHA512 5782acd552af2297813164c0612810ec0d2127c174773040d99ec9d281f3575832b06667736a5521e88fa2d57ea6410e42a5d95232cb2dbdd9608917e5d6e896 EBUILD kimageannotator-0.5.2.ebuild 844 BLAKE2B cfb64f43519cc673715dd7bac1d96f9e523223d12ba4165577e93f5239568612bd1d5f5639e682c558923b2a5259701d2d10dcbd9f87813da6ae8b8ae82f4ea8 SHA512 9378cf9e8a52a23f68cd743822d41a3c59673449971b8768c5455f95f3bda3ec0d9f47e1eef6100c2f99b8ce2621969e511eeae54224c4441eab9770dbe293a2 EBUILD kimageannotator-0.5.3.ebuild 843 BLAKE2B ffe4a7b9328e2e14e2e336a50d9c2ff8a216c7dedcee21f970dcc84c8373a872393115c232d333b4f125b7c7ae581189d54dc0a6aaa37a8787cd22fe58020f02 SHA512 de46ae33b992cf10c772d3ecef8f8df34bb210b0aad92d0423467370a922e089c40c236ed342a94c6f87ef9e5ff9be0a92e6350887a715a543f6cc9fe132d222 -EBUILD kimageannotator-0.6.0.ebuild 898 BLAKE2B 117e4700c4b5b5f3e98a461f754359c8d75b103e060d3b907c457a8945b0d5a08e8ae73adbdf3fa138ebcb8c8f7711da165fdb4be565a61fbcb29d75439cb3ac SHA512 5688a8cd613ed9e8615e1d518d210dbddcaf871fd3f3c1cd670431163db54303b5cde3d637e44e41a4b48c77007859f56dc5b6dea686ceae628a4e5e95fc7db6 +EBUILD kimageannotator-0.6.0.ebuild 905 BLAKE2B caa9afec02624d480654ba93550120bdeb993a0467c3028c825cd2c76cc6a651ba12d3e4beb2f338d6b5d46f7eed0022917538c7e1563195f63c91665ea16f8b SHA512 6a46d6cc55a4c449b115d7669b717146c24d9937fc3a16ca5927d11ed0ff478c00f43466b76beadf31b2adcb6af8be855106ebb0dabbb2d243e57f6ba6af4bfd MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc diff --git a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild index 430ca94fb112..73229b1a5341 100644 --- a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild +++ b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="test" RDEPEND=" -- cgit v1.2.3