From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C928C158064 for ; Thu, 9 May 2024 00:36:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A8C1E2D3B; Thu, 9 May 2024 00:36:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6F79E2D3B for ; Thu, 9 May 2024 00:36:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C11E133F9FD for ; Thu, 9 May 2024 00:36:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 300521A3F for ; Thu, 9 May 2024 00:36:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1715214847.b8bb7f1065bf5701e62f118b5ef7cf727543d0de.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/, media-libs/audiofile/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/audiofile/audiofile-0.3.6-r6.ebuild media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch X-VCS-Directories: media-libs/audiofile/ media-libs/audiofile/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b8bb7f1065bf5701e62f118b5ef7cf727543d0de X-VCS-Branch: master Date: Thu, 9 May 2024 00:36:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69152b3d-1b43-4899-bdca-0c94348a383c X-Archives-Hash: d72bc01468a11200f01e61310b333bb8 commit: b8bb7f1065bf5701e62f118b5ef7cf727543d0de Author: NHOrus yahoo com> AuthorDate: Tue Apr 2 08:13:05 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 9 00:34:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8bb7f10 media-libs/audiofile: replace deprecated template unary_function Adds the patch from the bug to the tree. [sam: Add bug ref to patch.] Closes: https://bugs.gentoo.org/914349 Signed-off-by: NHOrus yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/36054 Signed-off-by: Sam James gentoo.org> media-libs/audiofile/audiofile-0.3.6-r6.ebuild | 59 +++++++++++++++++++ .../files/audiofile-0.3.6-clang-deprecation.patch | 68 ++++++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/media-libs/audiofile/audiofile-0.3.6-r6.ebuild b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild new file mode 100644 index 000000000000..63b3eb3bfc60 --- /dev/null +++ b/media-libs/audiofile/audiofile-0.3.6-r6.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools gnome.org multilib-minimal + +DESCRIPTION="An elegant API for accessing audio files" +HOMEPAGE="https://audiofile.68k.org/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/1" # subslot = soname major version +KEYWORDS="~amd64" +IUSE="flac" + +RDEPEND="flac? ( >=media-libs/flac-1.2.1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.6-gcc6-build-fixes.patch + "${FILESDIR}"/${PN}-0.3.6-CVE-2015-7747.patch + "${FILESDIR}"/${PN}-0.3.6-mingw32.patch + "${FILESDIR}"/${PN}-0.3.6-CVE-2017-68xx.patch + "${FILESDIR}"/${PN}-0.3.6-CVE-2018-13440-CVE-2018-17095.patch + "${FILESDIR}"/${PN}-0.3.6-strict-prototypes.patch + "${FILESDIR}"/${PN}-0.3.6-clang-deprecation.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + # Tests depend on statically compiled binaries to work, so we'll have to + # delete them later rather than not compile them at all + local myconf=( + --enable-largefile + # static needed for tests, bug #869677 + --enable-static + --disable-werror + --disable-examples + $(use_enable flac) + ) + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_test() { + emake check +} + +multilib_src_install_all() { + einstalldocs + + # package provides .pc file + find "${ED}" -name '*.la' -delete || die + find "${ED}" -name '*.a' -delete || die +} diff --git a/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch b/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch new file mode 100644 index 000000000000..bccb9c1948e9 --- /dev/null +++ b/media-libs/audiofile/files/audiofile-0.3.6-clang-deprecation.patch @@ -0,0 +1,68 @@ +https://bugs.gentoo.org/914349 +--- a/libaudiofile/modules/SimpleModule.h ++++ b/libaudiofile/modules/SimpleModule.h +@@ -125,13 +125,17 @@ struct signConverter + static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; + static const int kMinSignedValue = -1 << kScaleBits; + +- struct signedToUnsigned : public std::unary_function ++ struct signedToUnsigned + { ++ typedef SignedType argument_type; ++ typedef UnsignedType result_type; + UnsignedType operator()(SignedType x) { return x - kMinSignedValue; } + }; + +- struct unsignedToSigned : public std::unary_function ++ struct unsignedToSigned + { ++ typedef SignedType argument_type; ++ typedef UnsignedType result_type; + SignedType operator()(UnsignedType x) { return x + kMinSignedValue; } + }; + }; +@@ -323,8 +327,10 @@ private: + }; + + template +-struct intToFloat : public std::unary_function ++struct intToFloat + { ++ typedef Arg argument_type; ++ typedef Result result_type; + Result operator()(Arg x) const { return x; } + }; + +@@ -389,14 +395,18 @@ private: + }; + + template +-struct lshift : public std::unary_function ++struct lshift + { ++ typedef Arg argument_type; ++ typedef Result result_type; + Result operator()(const Arg &x) const { return x << shift; } + }; + + template +-struct rshift : public std::unary_function ++struct rshift + { ++ typedef Arg argument_type; ++ typedef Result result_type; + Result operator()(const Arg &x) const { return x >> shift; } + }; + +@@ -491,8 +501,10 @@ private: + }; + + template +-struct floatToFloat : public std::unary_function ++struct floatToFloat + { ++ typedef Arg argument_type; ++ typedef Result result_type; + Result operator()(Arg x) const { return x; } + }; +