From fd87b7c771378b2116981e3924bee5805148e118 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Nov 2023 17:18:34 +0000 Subject: gentoo auto-resync : 22:11:2023 - 17:18:34 --- media-libs/Manifest.gz | Bin 69438 -> 69446 bytes media-libs/fcft/Manifest | 2 +- media-libs/fcft/fcft-3.1.5.ebuild | 2 +- media-libs/harfbuzz/Manifest | 2 +- media-libs/harfbuzz/harfbuzz-8.2.2.ebuild | 2 +- media-libs/libmpg123/Manifest | 2 +- media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild | 95 +++++++++++++++++++ media-libs/libmpg123/libmpg123-1.32.3.ebuild | 104 --------------------- media-libs/opencv/Manifest | 7 +- .../files/opencv-4.8.0-fix-cuda-12.2.0.patch | 40 ++++++++ media-libs/opencv/opencv-4.8.0-r1.ebuild | 1 + media-libs/opencv/opencv-4.8.0.ebuild | 1 + media-libs/opencv/opencv-4.8.1.ebuild | 1 + 13 files changed, 147 insertions(+), 112 deletions(-) create mode 100644 media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild delete mode 100644 media-libs/libmpg123/libmpg123-1.32.3.ebuild create mode 100644 media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 112a6bd96ec3..17e4dd8a1c56 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest index 144c49f3dad0..d5c18e944b60 100644 --- a/media-libs/fcft/Manifest +++ b/media-libs/fcft/Manifest @@ -4,6 +4,6 @@ DIST fcft-3.1.5.tar.gz 742014 BLAKE2B 39266ab2a7ea422671414d97c21a90b0eeabe9ed74 DIST fcft-3.1.6.tar.gz 699121 BLAKE2B 597ce1a701db29d3a8b913d831f1847c9526c450352b565436c843388447d8203b54b3d24ab668690986488c102f281c46685a2072bf4afee2bf58465ab9d6c3 SHA512 4fe4e318561706bd446e79b0df8df4fa5b542b9d546aa7361a1523593c26040d827ce059658c0eac89a77b83c771fd43bc74e2fe29cd16b2846a2db7ec733f49 EBUILD fcft-3.1.2-r1.ebuild 2072 BLAKE2B 413f9b8ca65d8a4fee9f6dc06f6a82a5fd71c20e367b4c6d323c5884c716ecf564c6d5be2d711d716a594c6df12dba9674e003114b33ef7dc05bf41f03c4d84b SHA512 afc54726a34924b5b1f68f234598fdaf06ef60ebb66764a1d5304b1f4957e3b60125659a3c7c51d3039896c5bd24bacac74d684713c982c119c619d53a9218ec EBUILD fcft-3.1.3.ebuild 2073 BLAKE2B 3c850b1a7f0afb115d1ba7bd251e719febf4d25a03f40ad2ff1f00c0d26a3b30b9f87d0557f16b6a078d3a9fa6bf6ea9cdd413cc5dfe0b9955fde9971da02125 SHA512 a21760c0192c8f1296a7b8c9b9f6f532436359a46dde213bfb12b3f47db85f3f9bf418bb0d2ee894dee9da55eae1d0d8afd97aab1ab5e9fe50dd683639b50cc9 -EBUILD fcft-3.1.5.ebuild 2073 BLAKE2B 3c850b1a7f0afb115d1ba7bd251e719febf4d25a03f40ad2ff1f00c0d26a3b30b9f87d0557f16b6a078d3a9fa6bf6ea9cdd413cc5dfe0b9955fde9971da02125 SHA512 a21760c0192c8f1296a7b8c9b9f6f532436359a46dde213bfb12b3f47db85f3f9bf418bb0d2ee894dee9da55eae1d0d8afd97aab1ab5e9fe50dd683639b50cc9 +EBUILD fcft-3.1.5.ebuild 2072 BLAKE2B 413f9b8ca65d8a4fee9f6dc06f6a82a5fd71c20e367b4c6d323c5884c716ecf564c6d5be2d711d716a594c6df12dba9674e003114b33ef7dc05bf41f03c4d84b SHA512 afc54726a34924b5b1f68f234598fdaf06ef60ebb66764a1d5304b1f4957e3b60125659a3c7c51d3039896c5bd24bacac74d684713c982c119c619d53a9218ec EBUILD fcft-3.1.6.ebuild 2073 BLAKE2B 3c850b1a7f0afb115d1ba7bd251e719febf4d25a03f40ad2ff1f00c0d26a3b30b9f87d0557f16b6a078d3a9fa6bf6ea9cdd413cc5dfe0b9955fde9971da02125 SHA512 a21760c0192c8f1296a7b8c9b9f6f532436359a46dde213bfb12b3f47db85f3f9bf418bb0d2ee894dee9da55eae1d0d8afd97aab1ab5e9fe50dd683639b50cc9 MISC metadata.xml 485 BLAKE2B 6afa04131e16f8240d2a2d878dfa709b5c5458d5710de56691c39315e57b2b4219efc11f185e98341c5553334c5eb7c9bcbc723290e7613b20dfff0d066cacd5 SHA512 aa6e49b3cdaac9c16cdf9f213a0471aa11a304a15a9f3cd1ffd5e643b2ec00089eb2925d9fde235369b535a09992e71a2f2ae29f41bfa84277e1f47efbbe7d7c diff --git a/media-libs/fcft/fcft-3.1.5.ebuild b/media-libs/fcft/fcft-3.1.5.ebuild index 435d0ad9feb0..39a674f519c8 100644 --- a/media-libs/fcft/fcft-3.1.5.ebuild +++ b/media-libs/fcft/fcft-3.1.5.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}" # ZLIB for nanosvg LICENSE="MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="amd64 ~arm64" IUSE="examples +harfbuzz +libutf8proc test" REQUIRED_USE=" libutf8proc? ( harfbuzz ) diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 58e9dd0b120b..bc3530f1933f 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -4,7 +4,7 @@ DIST harfbuzz-8.2.2.tar.xz 18905228 BLAKE2B 5a26aa802b6e1afec734e59a9c280b4d336b DIST harfbuzz-8.3.0.tar.xz 19002808 BLAKE2B 3749d2ff7955e135cf0d740bf6fe8b5c20a6bbf171480a29e6ae14fde8c26e1457506278b8c66e3b9630cbeb006874c19075c784a575e490c41297274a27fe59 SHA512 6b8753c0b55d34a1a46a64466b9b0de8bc4748c42b29fa9463616a5f48db08ceb4a80cce416e10861778b98dc96d0638d9dd8d7204e404662154f419f3f61f21 EBUILD harfbuzz-8.2.0.ebuild 2705 BLAKE2B 4d83ad53365051b51e22f35f0e7a9176de13f82cca53f3b47c875a52acbe7c39e84cd00faf42c99c8551d571cc9c2f550789c73b041288e44fd9e061df749ef7 SHA512 f4a7d0001b5d79051b3e8c716ec134a9ddc8c1c9e020946fe7280775fc5097c6455f6ab210e6c0bb25ff7663ebe58d0be6f8b087a3b3193d0490619d6c291996 EBUILD harfbuzz-8.2.1.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25 -EBUILD harfbuzz-8.2.2.ebuild 2712 BLAKE2B d18fe86ab7d9c35db85f6f945004991065d2f59fcdd846c4bbbad90d4f49cdf27790b28ceda4c534906108d15d2f2a0c0f00dfabce1ccf2d9e47f54880db795d SHA512 6083124617ec6b5b0effa33485831544018a5862158c86a08a731795b1fc4ac145b4f7442900d44dbbd751b5759c398f9f7d43715fc9701cbfc55ccd8b4c3b88 +EBUILD harfbuzz-8.2.2.ebuild 2711 BLAKE2B d2b84ec1c9cbc0f50547e327e1ecaae26a726be44ec78e22afd8ff9630e5e15d6ba7855c9a731ed50eaf24e562380f227f0bebf87485dfb72973a0156ee35d46 SHA512 98b62f28b17e60af4b25b7306e23dacb42a8a63421c92de54d4662bdff027c77bf4de2169ec7dcc082441b60f0f5cb6cf0e8971270e3d420068663ab351db4ee EBUILD harfbuzz-8.3.0.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25 EBUILD harfbuzz-9999.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70 diff --git a/media-libs/harfbuzz/harfbuzz-8.2.2.ebuild b/media-libs/harfbuzz/harfbuzz-8.2.2.ebuild index c50563c15f32..34fb1cd87dac 100644 --- a/media-libs/harfbuzz/harfbuzz-8.2.2.ebuild +++ b/media-libs/harfbuzz/harfbuzz-8.2.2.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/libmpg123/Manifest b/media-libs/libmpg123/Manifest index 02e234a51ba1..1f9ae4667f50 100644 --- a/media-libs/libmpg123/Manifest +++ b/media-libs/libmpg123/Manifest @@ -1,5 +1,5 @@ AUX mpg123-1.32.3-build-programs-component.patch 1304 BLAKE2B f0e4694bba608c20ed0cb1db0cf5f1c90ec522fc2eee6c01e8440fd39351e7d6a3e4165bac3a0ea3c1355bd7351dd6fefec9a02f8925226064ff741f01e3033a SHA512 b049a1da5b0185637f07445bcb5a00d37ba8c51456f10ee555e73fcacde2a3227ec900eaa334f84605a6956610831df5fceedef6c078375a82a0808c492b46a6 AUX mpg123-1.32.3-build-with-installed-libs.patch 7957 BLAKE2B 668aecace3cde2acb25474ea235b20b7c81398c1e4c91216dc95acaa3961683e6f87c0e1b5b3ffec0486484de7c2cf9fb85a41549013698ce3734ac41dba952e SHA512 6e59255199c19b5f3ca4cc9c3175b0f3e01440d44820806c3b3ad37291afa771809c556ce5369b9df45d98c6e300576b55ef1c61668fd0286372cb0afcf550a4 DIST mpg123-1.32.3.tar.bz2 1111054 BLAKE2B 67f889403c2bb639d675ec5ebea5a19c4b7174971d62bdd8d940ad659e6b0c06dada38422fc9d71b878917aa89e305ec48c8faa78d65d507cd6a0c9a79951359 SHA512 946c1073b6eebfd65333ec543df1caeea25864479e9c8e153fb53d8b636cc756d8d81947f7b5cbedbbfb1ea664d3fb27562ed36e7726d95e80591bd2ad622afc -EBUILD libmpg123-1.32.3.ebuild 2766 BLAKE2B de730a7d5dcbc365973090978d1cf3dd4107e448a42ef98c3ebada11051f2dbdf2adb31516a091b5aed90e4e75c56dfdfea617fd4761881426cdff6d2395fe7a SHA512 26043fbc612ab141ee704240eaa138260b4d349651a62e5511d577f812dbee65bc82671740d4f7ab3e423be6660957c891b8c50052b992deed2a9640eae5a14e +EBUILD libmpg123-1.32.3-r1.ebuild 2629 BLAKE2B 3af23d9b824f2b7b54fb16e4c7c36f31682077bd065fcb0648e7bfdde3b6e967b0565097addbbc834e7ece53497782116d15a52290b89b5cd261172004249b3f SHA512 e21f077e78a1362583190afe9058787dccfadad964114885cb98bfa5ad42c6356adc17a743a420ce8d1022435ec8e3375f6b4b0263a04165a002d47089a56ba7 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e diff --git a/media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild b/media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild new file mode 100644 index 000000000000..a02cd6cb5043 --- /dev/null +++ b/media-libs/libmpg123/libmpg123-1.32.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="mpg123" +MY_P="${MY_PN}-${PV}" +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +DESCRIPTION="Libraries for realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3" +HOMEPAGE="https://www.mpg123.org/" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2" + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="int-quality cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" + +# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs. +# Note: build system prefers libsdl2 > libsdl. We could in theory add both +# but it's tricky when it comes to handling switching between them properly. +# We'd need a USE flag for both sdl1 and sdl2 and to make them clash. +RDEPEND=" + dev-libs/libltdl:0 + ! libsdl. We could in theory add both -# but it's tricky when it comes to handling switching between them properly. -# We'd need a USE flag for both sdl1 and sdl2 and to make them clash. -RDEPEND=" - dev-libs/libltdl:0 - ! +Date: Tue, 1 Aug 2023 13:02:42 +0300 +Subject: [PATCH] cuda: fix for compatibility with CUDA Toolkit >= 12.2.0 + +--- + modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp | 2 +- + modules/dnn/src/cuda4dnn/primitives/region.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +index f067dddaa701..91ff33f81718 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp +@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + * or there might be several weights + * or we don't have to scale + */ +- if (weight != 1.0) ++ if (weight != static_cast(1.0f)) + { + kernels::scale1_with_bias1(stream, output, input, weight, 1.0); + } +diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp +index d22d44214e7b..3af05155feea 100644 +--- a/modules/dnn/src/cuda4dnn/primitives/region.hpp ++++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp +@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { + new_coords + ); + +- if (nms_iou_threshold > 0) { ++ if (nms_iou_threshold > static_cast(0.0f)) { + auto output_mat = output_wrapper->getMutableHostMat(); + CV_Assert(output_mat.type() == CV_32F); + for (int i = 0; i < input.get_axis_size(0); i++) { diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild index 2910615c0b36..ad47071aba4d 100644 --- a/media-libs/opencv/opencv-4.8.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild @@ -295,6 +295,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { diff --git a/media-libs/opencv/opencv-4.8.0.ebuild b/media-libs/opencv/opencv-4.8.0.ebuild index 772cd8408d98..82322d2d67fb 100644 --- a/media-libs/opencv/opencv-4.8.0.ebuild +++ b/media-libs/opencv/opencv-4.8.0.ebuild @@ -290,6 +290,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { diff --git a/media-libs/opencv/opencv-4.8.1.ebuild b/media-libs/opencv/opencv-4.8.1.ebuild index 0bfc5cab4674..3f219f22a627 100644 --- a/media-libs/opencv/opencv-4.8.1.ebuild +++ b/media-libs/opencv/opencv-4.8.1.ebuild @@ -300,6 +300,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch + "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch ) pkg_pretend() { -- cgit v1.2.3