From bed152ba1fc2f1316eaefb5c3d24d48195560f76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Nov 2022 07:07:57 +0000 Subject: gentoo auto-resync : 23:11:2022 - 07:07:57 --- media-libs/flac/Manifest | 3 +- .../flac-1.4.2-macro-wstrict-prototypes.patch | 31 ++++++++++ media-libs/flac/flac-1.4.2-r1.ebuild | 66 ++++++++++++++++++++++ media-libs/flac/flac-1.4.2.ebuild | 62 -------------------- 4 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch create mode 100644 media-libs/flac/flac-1.4.2-r1.ebuild delete mode 100644 media-libs/flac/flac-1.4.2.ebuild (limited to 'media-libs/flac') diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest index e9376d237974..349a6d98aeb6 100644 --- a/media-libs/flac/Manifest +++ b/media-libs/flac/Manifest @@ -1,5 +1,6 @@ +AUX flac-1.4.2-macro-wstrict-prototypes.patch 729 BLAKE2B 45e52b52283cde5e0a294d962cb9ca34edd166002cf3705b0858878a8d112bb84955e15ae98a6daabaaaf965e1d08f5a6f342badfe9fd3201faf1deb68349f33 SHA512 cc3d73a2868e595bbaa887e7b9105fb397e0fd02bad515f90cfb1a9519ae76ca014c2bf589e8fe68cf5e1798cba762d9efc538bb144d932bc87bd4649bbd798a DIST flac-1.3.4.tar.xz 1038356 BLAKE2B 0553cd42705f31d6a98d10e8b73953265e97c6b1e46bb59c7d97d12ec1b4aae4c3d6f5e85b9e5d1513f7efac82a65ea9dc59d89d8df0254ff3ab1188039c55c5 SHA512 4a626e8a1bd126e234c0e5061e3b46f3a27c2065fdfa228fd8cf00d3c7fa2c05fafb5cec36acce7bfce4914bfd7db0b2a27ee15decf2d8c4caad630f62d44ec9 DIST flac-1.4.2.tar.xz 1013700 BLAKE2B 60a40806c6c54fe836235cea2c476051c6f82e6a50ac6d160b4ab783b8b0c33f1763ba2816e5e490acd6320de0764ea3c4b35708820a17f40ccada3f72bac687 SHA512 20bdf0990a7432ac765037764bc8733a0d5646866fe6cc6f4868152d2a051c89676e501012ae489c7f87b3aacb45a5b30265afaca164cf0cf53ac058644a74c5 EBUILD flac-1.3.4.ebuild 1564 BLAKE2B 8bd7aef1a3ad5d9d4acdb92d19df3b6c3d667c4614d9263d59e345a3683bd8e24adf72129be46e355266ec33ff2239efcede265bba8874a1f251b8f5a21ed085 SHA512 cd7b12fd21f8d09b09028c5fd1d128f2826f3894ef3072328e0e6f51d5c62220493f1f4ec953128354369f3aa3e6f9e2a00a301766be43724657d0c72f3deab8 -EBUILD flac-1.4.2.ebuild 1710 BLAKE2B bd6c4b99ecda873cf29a5e4368388694444890e7f85076ca01d77999c1e9662a767af79ad5ab18ba38bc53ac7026704246f80917a06c251ace72aa6d0cc7fe35 SHA512 5986a8be82dfb5620ea2fa34cce0b61eedaaba56392939f5ec640e4bf22e96aac339ecc11474f5d6f3284b131cde243cda6a4f4b75a88f4268d7817326b4736c +EBUILD flac-1.4.2-r1.ebuild 1781 BLAKE2B abc7f391bf535f1481c24f7dba601e59943d25ee90ac148e224f0b93b1a6e8b0701ae368038d7266b3c5a9bcee094961b3ccbdb8179afd10f24a223e8fd69c10 SHA512 9bb73175f3acd557b0ebfa7d67517d97af111ad32ce0c0c49bf59d2606d30c64262ebae2a430775d674b8b1549910274767f892e2da77aca7074c2c7689e0b0e MISC metadata.xml 377 BLAKE2B 9fa4c0dc0300b2d2deb791a29d7a2ce6b00e05399ccc29581bc4ab83b1bdff3fecd2edbe6cef3cf8b4111cae5064edf4ccec9205e6791fb57f41d363c6352e95 SHA512 9d9d3c80a5a7c0255476ddc86ebf2fc76e42fc278185e9d5c4c814ff395f6d7d74e9a3e680be2966e89113a76dd482e1fe53f761a59474cf46e8b2469849fc2e diff --git a/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch b/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch new file mode 100644 index 000000000000..d836f6aa2206 --- /dev/null +++ b/media-libs/flac/files/flac-1.4.2-macro-wstrict-prototypes.patch @@ -0,0 +1,31 @@ +https://github.com/xiph/flac/pull/521 + +From afd9e9006d2c18d184db098bec0a0618cb4f0283 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Nov 2022 03:31:30 +0000 +Subject: [PATCH] libFLAC.m4, libFLAC++.m4: fix -Wstrict-prototypes + +Signed-off-by: Sam James +--- a/src/libFLAC++/libFLAC++.m4 ++++ b/src/libFLAC++/libFLAC++.m4 +@@ -57,7 +57,7 @@ dnl + #include + #include + +-int main () ++int main (void) + { + system("touch conf.libFLAC++test"); + return 0; +--- a/src/libFLAC/libFLAC.m4 ++++ b/src/libFLAC/libFLAC.m4 +@@ -58,7 +58,7 @@ dnl + #include + #include + +-int main () ++int main (void) + { + system("touch conf.libFLACtest"); + return 0; + diff --git a/media-libs/flac/flac-1.4.2-r1.ebuild b/media-libs/flac/flac-1.4.2-r1.ebuild new file mode 100644 index 000000000000..df75f0e6829f --- /dev/null +++ b/media-libs/flac/flac-1.4.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +DESCRIPTION="Free lossless audio encoder and decoder" +HOMEPAGE="https://xiph.org/flac/" +SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz" + +LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1" +# - +SLOT="0/10-12" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs" + +# AVX configure switch is for both AVX & AVX2 +REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) +" + +RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + sys-devel/gettext + virtual/pkgconfig + abi_x86_32? ( dev-lang/nasm )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.2-macro-wstrict-prototypes.patch +) + +multilib_src_configure() { + local myeconfargs=( + --disable-doxygen-docs + --disable-examples + $([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations") + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_ppc_vsx vsx) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cxx cpplibs) + $(use_enable debug) + $(use_enable ogg) + $(use_enable static-libs static) + + # cross-compile fix (bug #521446) + # no effect if ogg support is disabled + --with-ogg + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + if [[ ${UID} != 0 ]]; then + emake -j1 check + else + ewarn "Tests will fail if ran as root, skipping." + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-libs/flac/flac-1.4.2.ebuild b/media-libs/flac/flac-1.4.2.ebuild deleted file mode 100644 index 7f778649fd96..000000000000 --- a/media-libs/flac/flac-1.4.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-minimal - -DESCRIPTION="Free lossless audio encoder and decoder" -HOMEPAGE="https://xiph.org/flac/" -SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz" - -LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1" -# - -SLOT="0/10-12" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="+cxx debug ogg cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_x86_avx2 cpu_flags_x86_avx static-libs" - -# AVX configure switch is for both AVX & AVX2 -REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) -" - -RDEPEND="ogg? ( media-libs/libogg[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - sys-devel/gettext - virtual/pkgconfig - abi_x86_32? ( dev-lang/nasm )" - -multilib_src_configure() { - local myeconfargs=( - --disable-doxygen-docs - --disable-examples - $([[ ${CHOST} == *-darwin* ]] && echo "--disable-asm-optimizations") - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_ppc_vsx vsx) - $(use_enable cpu_flags_x86_avx avx) - $(use_enable cxx cpplibs) - $(use_enable debug) - $(use_enable ogg) - $(use_enable static-libs static) - - # cross-compile fix (bug #521446) - # no effect if ogg support is disabled - --with-ogg - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - if [[ ${UID} != 0 ]]; then - emake -j1 check - else - ewarn "Tests will fail if ran as root, skipping." - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die -} -- cgit v1.2.3