commit: 6abca05fd236198f409f23bd6eed74b6a5165de2 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Nov 13 08:10:58 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 22 17:33:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6abca05f
media-libs/faad2: add 2.11.0 Closes: https://bugs.gentoo.org/859844 Closes: https://bugs.gentoo.org/917031 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/33784 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/faad2/Manifest | 1 + media-libs/faad2/faad2-2.11.0.ebuild | 36 ++++++++++++ .../faad2-2.11.0-check-if-lrintf-is-defined.patch | 64 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest index 05527727aa59..9c8bd3315341 100644 --- a/media-libs/faad2/Manifest +++ b/media-libs/faad2/Manifest @@ -1 +1,2 @@ DIST faad2-2.10.1.tar.gz 803488 BLAKE2B f25bf9242675250b910bd5540487cf708d6e195e1ddca0b27588678e5fbf2bedf9d41e6bc607aa34bb2dbff95a8a4071e74e2f9bd9493ccb7ef040ce9bf81b4c SHA512 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3 +DIST faad2-2.11.0.tar.gz 656610 BLAKE2B 2fdbe4b1c7743952277f699a186197adedd851650ac37ec31292eabed32693611aa75fb207e57bc814c639905285fffe092008e887ae713f5d2f84c4d1c4831a SHA512 b85aab9b2d2afdca7096c999bcb7fabfccce4781760d9eb14d23fdd38691729927b09464708abf49a751e70c4475151ca14c5a7419b5cf4d9ec70c433dc86282 diff --git a/media-libs/faad2/faad2-2.11.0.ebuild b/media-libs/faad2/faad2-2.11.0.ebuild new file mode 100644 index 000000000000..d706d0296c32 --- /dev/null +++ b/media-libs/faad2/faad2-2.11.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="AAC audio decoding library" +HOMEPAGE="https://www.audiocoding.com/faad2.html https://github.com/knik0/faad2/"; +SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# no tests +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/faad2-2.11.0-check-if-lrintf-is-defined.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + ) + + cmake-multilib_src_configure +} + +src_install() { + cmake-multilib_src_install + + # TODO: remove in next release + newman frontend/faad.man faad.1 +} diff --git a/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch b/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch new file mode 100644 index 000000000000..0d05eb3f04ea --- /dev/null +++ b/media-libs/faad2/files/faad2-2.11.0-check-if-lrintf-is-defined.patch @@ -0,0 +1,64 @@ +https://github.com/knik0/faad2/issues/188 +https://github.com/knik0/faad2/issues/190 + +From 1001f9576cbb29242671c489cd861de61cfe08e2 Mon Sep 17 00:00:00 2001 +From: Fabian Greffrath <[email protected]> +Date: Thu, 9 Nov 2023 08:23:53 +0100 +Subject: [PATCH] check for lrintf() presence and define HAVE_LRINTF + accordingly + +Fixes #188 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ + # - Solaris 11.4 SRU 15 : 3.15 + cmake_minimum_required(VERSION 3.15) + ++include(CheckSymbolExists) ++ + project(LIBFAAD2 LANGUAGES C) + + # If FAAD is being bundled in another project, we don't want to +@@ -90,6 +92,13 @@ set(FAAD_DEFINES + PACKAGE_VERSION=\"${FAAD_VERSION}\" + ) + ++check_symbol_exists(lrintf "math.h" HAVE_LRINTF) ++if(HAVE_LRINTF) ++ list(APPEND FAAD_DEFINES ++ HAVE_LRINTF=1 ++ ) ++endif() ++ + set(FAAD_FLAGS + -Wall + ) + +From 047fd22172a7ff6974b9ac6ca7e4ffdb1944f2e0 Mon Sep 17 00:00:00 2001 +From: Fabian Greffrath <[email protected]> +Date: Fri, 10 Nov 2023 20:01:30 +0100 +Subject: [PATCH] check for lrintf() in -lm and force linking if available + +Fixes #190 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,7 @@ + # - Solaris 11.4 SRU 15 : 3.15 + cmake_minimum_required(VERSION 3.15) + ++include(CheckLibraryExists) + include(CheckSymbolExists) + + project(LIBFAAD2 LANGUAGES C) +@@ -106,6 +107,11 @@ set(FAAD_DEFINES + PACKAGE_VERSION=\"${FAAD_VERSION}\" + ) + ++check_library_exists(m lrintf "" HAVE_LIBM) ++if(HAVE_LIBM) ++ list(APPEND CMAKE_REQUIRED_LIBRARIES m) ++endif() ++ + check_symbol_exists(lrintf "math.h" HAVE_LRINTF) + if(HAVE_LRINTF) + list(APPEND FAAD_DEFINES
