gentoo auto-resync : 23:01:2024 - 10:47:12

4 files changed, 2 insertions, 140 deletions

diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 893be50f84b7..eddbfedbe156 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,6 +1,3 @@
-AUX fdk-aac-2.0.2-always_inline.patch 2581 BLAKE2B 46f18480fe138f4b6fd98bf3474673234e1fc3e88020be07bc63284634b971a902cbe3b1996c676e12c30e502e877d7a0b4e328b97a469dd2ed7d6bd759d5161 SHA512 030bfb1ad2dc53618a0387852910687e89bacb4cefd8d7a9a230bcda5a0c0e5493e464771691491d5da4c9bc8c83ff48a99dec5e384d2c50ebcd672a051a7ce3
-DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
 DIST fdk-aac-2.0.3.tar.gz 2906697 BLAKE2B a3dbf45c637680bda178c2886926cb459ef00660ec6b0e9eef6e48a7b04de961659da8cf0016b6e7376ce6d513abc142b43068c65b10c8cba2ed6b3aec0a9521 SHA512 7494d9cf3814b4abcc8fdf02cc40e8b49d744b1744869389da33d93302799dec9b4d67ce25d912de6d9a635a59a1d4c459c99c9ad2e90186d3af48d0f8282af7
-EBUILD fdk-aac-2.0.2.ebuild 1457 BLAKE2B d5cb052398140b0f23a2747d4167c39a96cbafccafc335c3fcba4e929f827a4dfd5a927f6146f6e997d8ec6fbcf371071e36dab821516b4f1232ea029218c288 SHA512 55bfac3100c7790eaeffeb0fd175dfeb012db50c0748f94b4c38708a399268b2d3c9e029b284f7836169262d887a682eeb35038fb0690db3762d70f3536dd454
-EBUILD fdk-aac-2.0.3.ebuild 1406 BLAKE2B f597b0fada84cdc1f74f084cc14c08e5ba6d364a0754ed241ee7aba14f6eb7d648d69fa60a2baf3b172ee07ff3718ddcf25b1d73f5e5d864bd1fe484adb172a5 SHA512 bc02f9e212fcfc97f0d3666934849fd421ac4f4a4140a9d03781694d63f3e4661644d2caba6d48a6021af60dad5143ed4c3ac9fee98da166ff8fc7260af6faa7
+EBUILD fdk-aac-2.0.3.ebuild 1405 BLAKE2B 8e4e867ccedd34d07749d8c6561e7b3669358cfaaa855b14154b5a7d9f189db6fe9aafe0110fd7853481c89348b430d30abbc6bbe763b5d915085137522be59c SHA512 b5aabcb9ad0a2fe51a78d6bfffce827ddf7c15c96efe49bf3dbe604cad09c7fd529447996c2c4871a83f0a3922d3c3d87b73ca192f22fe652631465e6e71b9c3
 MISC metadata.xml 392 BLAKE2B 0e1ca535b679acd5bf93b63803e7ae0f2dc5ff3265f3e8ac7e35896ffd546c29a37aee845506f6759691db5af8ff5fd48126f580c378f8ac5bb46f551c1b6ed1 SHA512 dd4a4fdf0504cc45ffe35b972fbdfdd17e3f23f8acd52bbe1e55e79e5a63750594908c044fb17a9e329cbe89e4527f8d85219821a1800b01493a85146feee48c
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
deleted file mode 100644
index 69677bca87e4..000000000000
--- a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
-	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
-	inherit autotools git-r3
-else
-	inherit libtool
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
-	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-	else # Official release
-		SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="Fraunhofer AAC codec library"
-HOMEPAGE="https://sourceforge.net/projects/opencore-amr/ https://github.com/mstorsjo/fdk-aac"
-LICENSE="FraunhoferFDK"
-# subslot == N where N is libfdk-aac.so.N
-SLOT="0/2"
-
-IUSE="examples"
-
-PATCHES=( "${FILESDIR}"/${P}-always_inline.patch )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(multilib_native_use_enable examples example)
-	)
-	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		mv "${ED}/usr/bin/"{,fdk-}aac-enc || die
-	fi
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use examples && einfo "aac-enc was renamed to fdk-aac-enc to prevent file collision with other packages"
-}
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.3.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.3.ebuild
index ae8f713c88b4..17a63704bd74 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.3.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	inherit libtool
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release
diff --git a/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch b/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch
deleted file mode 100644
index afb2dbe1026d..000000000000
--- a/media-libs/fdk-aac/files/fdk-aac-2.0.2-always_inline.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7f328b93ee2aa8bb4e94613b6ed218e7525d8dc0 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 10 Jul 2021 13:06:57 +0200
-Subject: [PATCH] Do not force inlining of indirect functions
-
-* A function called indirectly cannot be decorated
-  with `__attribute((always_inline))`, as this is
-  guaranteed to only work with direct calls:
-    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63220#c1
-
-Bug: https://bugs.gentoo.org/798045
----
- libFDK/include/fft.h | 4 ++--
- libFDK/src/fft.cpp   | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libFDK/include/fft.h b/libFDK/include/fft.h
-index d394046..4ef62b4 100644
---- a/libFDK/include/fft.h
-+++ b/libFDK/include/fft.h
-@@ -139,7 +139,7 @@ void ifft(int length, FIXP_DBL *pInput, INT *scalefactor);
-  * bit scale headroom. The values are interleaved, real/imag pairs.
-  */
- LNK_SECTION_CODE_L1
--static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
-+static inline void fft_4(FIXP_DBL *x) {
-   FIXP_DBL a00, a10, a20, a30, tmp0, tmp1;
- 
-   a00 = (x[0] + x[4]) >> 1; /* Re A + Re B */
-@@ -168,7 +168,7 @@ static FDK_FORCEINLINE void fft_4(FIXP_DBL *x) {
- 
- #ifndef FUNCTION_fft_8
- LNK_SECTION_CODE_L1
--static FDK_FORCEINLINE void fft_8(FIXP_DBL *x) {
-+static inline void fft_8(FIXP_DBL *x) {
-   FIXP_SPK w_PiFOURTH = {{FIXP_SGL(0x5A82), FIXP_SGL(0x5A82)}};
- 
-   FIXP_DBL a00, a10, a20, a30;
-diff --git a/libFDK/src/fft.cpp b/libFDK/src/fft.cpp
-index 4e6fdd2..c9ee784 100644
---- a/libFDK/src/fft.cpp
-+++ b/libFDK/src/fft.cpp
-@@ -170,7 +170,7 @@ amm-info@iis.fraunhofer.de
- 
- /* Performs the FFT of length 2. Input vector unscaled, output vector scaled
-  * with factor 0.5 */
--static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
-+static inline void fft2(FIXP_DBL *RESTRICT pDat) {
-   FIXP_DBL r1, i1;
-   FIXP_DBL r2, i2;
- 
-@@ -196,7 +196,7 @@ static FDK_FORCEINLINE void fft2(FIXP_DBL *RESTRICT pDat) {
- 
- #ifndef FUNCTION_fft3
- /* Performs the FFT of length 3 according to the algorithm after winograd. */
--static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
-+static inline void fft3(FIXP_DBL *RESTRICT pDat) {
-   FIXP_DBL r1, r2;
-   FIXP_DBL s1, s2;
-   FIXP_DBL pD;
-@@ -233,7 +233,7 @@ static FDK_FORCEINLINE void fft3(FIXP_DBL *RESTRICT pDat) {
- 
- /* performs the FFT of length 5 according to the algorithm after winograd */
- /* This version works with a prescale of 2 instead of 3 */
--static FDK_FORCEINLINE void fft5(FIXP_DBL *RESTRICT pDat) {
-+static inline void fft5(FIXP_DBL *RESTRICT pDat) {
-   FIXP_DBL r1, r2, r3, r4;
-   FIXP_DBL s1, s2, s3, s4;
-   FIXP_DBL t;
--- 
-2.32.0
-