commit: fe2b298518a36f2aa5885bd45331545425628d1b Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Jan 23 10:00:17 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Jan 23 10:00:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2b2985
media-libs/fdk-aac: dropped obsolete 2.0.2 Bug: https://bugs.gentoo.org/922692 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-libs/fdk-aac/Manifest | 1 - media-libs/fdk-aac/fdk-aac-2.0.2.ebuild | 63 ------------------- .../files/fdk-aac-2.0.2-always_inline.patch | 72 ---------------------- 3 files changed, 136 deletions(-) diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest index c5edf2c7ecb5..ba8d7f6e9f39 100644 --- a/media-libs/fdk-aac/Manifest +++ b/media-libs/fdk-aac/Manifest @@ -1,2 +1 @@ -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 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/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 <s...@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-i...@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 -
