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/Manifest.gz | Bin 67069 -> 67078 bytes 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 ------------------- media-libs/libmikmod/Manifest | 3 +- ...ibmikmod-3.3.11.1-macro-strict-prototypes.patch | 14 +++++ media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild | 4 ++ media-libs/libogg/Manifest | 3 +- .../libogg-1.3.5-macro-wstrict-prototypes.patch | 20 +++++++ media-libs/libogg/libogg-1.3.5-r1.ebuild | 33 +++++++++++ media-libs/libogg/libogg-1.3.5.ebuild | 32 ---------- media-libs/libvorbis/Manifest | 3 +- .../libvorbis-1.3.7-macro-wstrict-prototypes.patch | 20 +++++++ media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild | 57 ++++++++++++++++++ media-libs/libvorbis/libvorbis-1.3.7.ebuild | 55 ----------------- media-libs/opus/Manifest | 3 +- .../opus-1.3.1-macro-wstrict-prototypes.patch | 20 +++++++ media-libs/opus/opus-1.3.1-r3.ebuild | 54 ----------------- media-libs/opus/opus-1.3.1-r4.ebuild | 55 +++++++++++++++++ 20 files changed, 330 insertions(+), 208 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 create mode 100644 media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch create mode 100644 media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch create mode 100644 media-libs/libogg/libogg-1.3.5-r1.ebuild delete mode 100644 media-libs/libogg/libogg-1.3.5.ebuild create mode 100644 media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch create mode 100644 media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild delete mode 100644 media-libs/libvorbis/libvorbis-1.3.7.ebuild create mode 100644 media-libs/opus/files/opus-1.3.1-macro-wstrict-prototypes.patch delete mode 100644 media-libs/opus/opus-1.3.1-r3.ebuild create mode 100644 media-libs/opus/opus-1.3.1-r4.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index bb86fd8826ea..7f63339c606a 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ 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 -} diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest index a9ef6d572339..1d4a1beaff68 100644 --- a/media-libs/libmikmod/Manifest +++ b/media-libs/libmikmod/Manifest @@ -1,3 +1,4 @@ +AUX libmikmod-3.3.11.1-macro-strict-prototypes.patch 381 BLAKE2B e0babfce0c5ec317ae802b471c8e443e07f9619ddd8a72cb9817c48040eabab59e3a2104e6ee890ac6e15e4e16c8f11260adcaa4540e11b853792b9256984c71 SHA512 9b22bf50541b2e903996cea20afb43541f1c3d5e2f11424d8eb2ff1d6dda6bef678db5f86a698f7f38b294a4cde6d8d76fa5020f8a72a0ca8229ecec4c6c3494 DIST libmikmod-3.3.11.1.tar.gz 1240373 BLAKE2B 9de58eea739f8f7a5c4ff482093974f67a623fd0acd3b65752b0832b1376fb05ca00e7fbd09c242a25fb76d90d662afc3886808fbe6cabb15332f263adba37ad SHA512 f2439e2b691613847cd0787dd4e050116683ce7b05c215b8afecde5c6add819ea6c18e678e258c0a80786bef463f406072de15127f64368f694287a5e8e1a9de -EBUILD libmikmod-3.3.11.1-r1.ebuild 2168 BLAKE2B d173989b2af3120be2320447a10bab4bfde62a43e7b07a62ca8022e2a2ada57e53a0cde5726436251d68f29c880c2817d38f73cf1e50f48bd9b42e46afc3c98e SHA512 da872fb9cbe91942e1b4e0e38d4702d6b3093261170d85f8f3ab84c1d2a2100f4999b7f916b7df01d4af0f111e5f5cbd8ff76662a7dbf690b867fc983f451da4 +EBUILD libmikmod-3.3.11.1-r1.ebuild 2231 BLAKE2B bb959a89ca83c211e606d5f5582a9e678a5a7f08b03253dc53facc06fe38d99fcd81b321f26f4bd8e100b5978479d526d7f1f97aa1a8ae8b504a676b76f266bc SHA512 dad39071e51161a40761a2841d7bc3efb50e0e580f357abd99b8d2a8af29969da423dd85c00c3120043ed7b6598bc4b648ef1e989407a61cd9f98da34815ef89 MISC metadata.xml 330 BLAKE2B f865c47d2fe40d5bb20da22fc2b3a93568b7b3756a424367a2be855b49ea8287af72f5973ccfc8c4c4c7f501c9b9d468539e8d929699acada27e0fee40206bba SHA512 9ef7a547be98060ffb33c04cc09bc2fad66a26b9a71c5602a3627a69c9e9e280573e61239318b689bdfeaa157215672e03ee8838893ea1923b618421c2888111 diff --git a/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch b/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch new file mode 100644 index 000000000000..9e408866df16 --- /dev/null +++ b/media-libs/libmikmod/files/libmikmod-3.3.11.1-macro-strict-prototypes.patch @@ -0,0 +1,14 @@ +Already fixed upstream in https://github.com/sezero/mikmod/commit/4ceeed3f3929b9d9f7cfe891d44f43d202b64416. + +Fixes -Wstrict-prototypes. +--- a/libmikmod.m4 ++++ b/libmikmod.m4 +@@ -79,7 +79,7 @@ char* my_strdup (char *str) + return new_str; + } + +-int main() ++int main(void) + { + int major,minor,micro; + int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version; diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild index 96b5ee258b0b..56f0a26c6fa8 100644 --- a/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild +++ b/media-libs/libmikmod/libmikmod-3.3.11.1-r1.ebuild @@ -32,6 +32,10 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/libmikmod-config ) +PATCHES=( + "${FILESDIR}"/${P}-macro-strict-prototypes.patch +) + src_prepare() { default diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest index 4d6500effd9e..1eb45b0e33dd 100644 --- a/media-libs/libogg/Manifest +++ b/media-libs/libogg/Manifest @@ -1,4 +1,5 @@ AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316 +AUX libogg-1.3.5-macro-wstrict-prototypes.patch 467 BLAKE2B 4434a774d9cfe47ca5142f3538a9e20bbe0589dc78136785477f6f1e3e5f8d24e34590163bbf7eaba8c04d7c9ecbdc5819c0a3bfa568e125f90ef6a9cee47b18 SHA512 062302760cb9292a185dac8748135b9288b4c933f7c9f2f73c74d2348926d0def88562a9ceb935e76669af51e732364a7bc3ba84436cb1e896cb7ab228bc4a47 DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7 -EBUILD libogg-1.3.5.ebuild 815 BLAKE2B bf111643a820ac66ce3d010e0e2b946088108a8205a88dd5db0f31b6e111b98bb4b9141f59249d6d091fb9b778769c855a4fdf50450f56ed09d6ee0f1a651644 SHA512 f7b4425be30a5bf878eb87831ba0b887e9506816336822de020304c20e6a12d2e7bcdf69b350bc64baa2dcf75884054e288e7f6083d3ed1aa8ba1f9b287535fa +EBUILD libogg-1.3.5-r1.ebuild 873 BLAKE2B 5598982bdd7bc07483c9f7d8cd0062c88efde08a4de89cf2d7272123df3e881ac334d8b6d021b7c7ca4267161bcb076bc225dd011fa7d1ce292cf4009e992ee2 SHA512 b80421324d752bc49da7dca7677b4a71af828a28447205e35f2e44379217347d058208f03d0725db937698a292b50a30333bfe23e6cc37ac7cdd60e257ccca86 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 diff --git a/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch b/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch new file mode 100644 index 000000000000..3da8dc74c614 --- /dev/null +++ b/media-libs/libogg/files/libogg-1.3.5-macro-wstrict-prototypes.patch @@ -0,0 +1,20 @@ +https://gitlab.xiph.org/xiph/ogg/-/merge_requests/14 + +From f6097edcf4fe5ff40077fec7733fe32827f75128 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Nov 2022 03:23:55 +0000 +Subject: [PATCH] ogg.m4: fix -Wstrict-prototypes + +Signed-off-by: Sam James +--- a/ogg.m4 ++++ b/ogg.m4 +@@ -62,7 +62,7 @@ dnl + #include + #include + +-int main () ++int main (void) + { + system("touch conf.oggtest"); + return 0; +GitLab diff --git a/media-libs/libogg/libogg-1.3.5-r1.ebuild b/media-libs/libogg/libogg-1.3.5-r1.ebuild new file mode 100644 index 000000000000..438b3c5c4cc0 --- /dev/null +++ b/media-libs/libogg/libogg-1.3.5-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal + +DESCRIPTION="The Ogg media file format library" +HOMEPAGE="https://xiph.org/ogg/" +SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch + "${FILESDIR}"/${PN}-1.3.5-macro-wstrict-prototypes.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ogg/config_types.h +) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild deleted file mode 100644 index e7006959b9f2..000000000000 --- a/media-libs/libogg/libogg-1.3.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="The Ogg media file format library" -HOMEPAGE="https://xiph.org/ogg/" -SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ogg/config_types.h -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf $(use_enable static-libs static) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest index c156d85603b7..46873e5395bf 100644 --- a/media-libs/libvorbis/Manifest +++ b/media-libs/libvorbis/Manifest @@ -1,3 +1,4 @@ +AUX libvorbis-1.3.7-macro-wstrict-prototypes.patch 497 BLAKE2B ea1ca5edf942a0d7176f483629e6965c529495c5262661981660dbfba20b9521368424bd531645f19d92515962a30957a25eff2fdcbed096f461fa184495f488 SHA512 a13d1c323b811ba62b96f10232d1332e3ef5d90e7f4e02ff28de74a264c00bc660475c712fd3f90e1234d60fe13bcf3879442b5bac26cde8ff31bc09854c1ff7 DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd -EBUILD libvorbis-1.3.7.ebuild 1294 BLAKE2B 90209f46312aa37d50e31466361af9aa24e0dac738ee00301c7c3676e9edbe11f0948e1005af2976fdd1379cc8289fe5028d4c4abf00a9d6cb717be92d6ba442 SHA512 430ed83ae7183bc08f76337bb3e04b2182edb48fd4d14306d488e75262c14ecac64deab7d7798a11b728f3a90b623e1afe7952a144c923ae4bd52a6a2f4c01ea +EBUILD libvorbis-1.3.7-r1.ebuild 1321 BLAKE2B d296e56ad06da78b05f83307ccdbda2cf01e94b37387d1b7ee3dac8c0386c9d83a895b7e16473c22f08a1299f4c6f69fc53381c26bb62b0744e2b1afe884824a SHA512 9d0382efd13cca83cd912e4659d5a6262ceed6e1915291a94792ad1e4bf2395aa8e231aec97a7a1d3cfb242da1b082fd020a5e77efa3ae0c87d3e56143107d17 MISC metadata.xml 330 BLAKE2B ef2876f07a60f57ac3309470378db229270bd5a8162e0f4d46a4aa5ae452576824c2e48a67a9ca07e30f79d5e3537eb0256250e5a32b90ff124c9fe350f8dde4 SHA512 cc71c708a55c934552da506a07db9809036ae5432005ca52b23db5fb71c830e1536565ad499b2bd926905dcc88e08cc8c248989df77e48b60b14fae9f6c81d78 diff --git a/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch b/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch new file mode 100644 index 000000000000..24e163d5adf8 --- /dev/null +++ b/media-libs/libvorbis/files/libvorbis-1.3.7-macro-wstrict-prototypes.patch @@ -0,0 +1,20 @@ +https://gitlab.xiph.org/xiph/vorbis/-/merge_requests/25 + +From 63132c52ee4694171f663ecf536ab1236b6c46ba Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Nov 2022 03:27:44 +0000 +Subject: [PATCH] vorbis.m4: fix -Wstrict-prototypes + +Signed-off-by: Sam James +--- a/vorbis.m4 ++++ b/vorbis.m4 +@@ -67,7 +67,7 @@ dnl + #include + #include + +-int main () ++int main (void) + { + vorbis_block vb; + vorbis_dsp_state vd; +GitLab diff --git a/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild new file mode 100644 index 000000000000..f90fe66fd547 --- /dev/null +++ b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="The Ogg Vorbis sound file format library" +HOMEPAGE="https://xiph.org/vorbis/" +SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs test" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.7-macro-wstrict-prototypes.patch +) + +src_prepare() { + default + + sed -i \ + -e '/CFLAGS/s:-O20::' \ + -e '/CFLAGS/s:-mcpu=750::' \ + -e '/CFLAGS/s:-mno-ieee-fp::' \ + configure.ac || die + + # Un-hack docdir redefinition. + find -name 'Makefile.am' \ + -exec sed -i \ + -e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \ + {} + || die + + eautoreconf +} + +multilib_src_configure() { + local myconf=( + --enable-shared + $(use_enable static-libs static) + $(use_enable test oggtest) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild deleted file mode 100644 index 9b1d80665e32..000000000000 --- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools multilib-minimal - -DESCRIPTION="The Ogg Vorbis sound file format library" -HOMEPAGE="https://xiph.org/vorbis/" -SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs test" - -RESTRICT="!test? ( test )" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]" - -DEPEND="${RDEPEND}" - -src_prepare() { - default - - sed -i \ - -e '/CFLAGS/s:-O20::' \ - -e '/CFLAGS/s:-mcpu=750::' \ - -e '/CFLAGS/s:-mno-ieee-fp::' \ - configure.ac || die - - # Un-hack docdir redefinition. - find -name 'Makefile.am' \ - -exec sed -i \ - -e 's:$(datadir)/doc/$(PACKAGE)-$(VERSION):@docdir@/html:' \ - {} + || die - - eautoreconf -} - -multilib_src_configure() { - local myconf=( - --enable-shared - $(use_enable static-libs static) - $(use_enable test oggtest) - ) - - einfo "Running configure in ${BUILD_DIR}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest index 5c5ea069c748..b409f06a86f4 100644 --- a/media-libs/opus/Manifest +++ b/media-libs/opus/Manifest @@ -1,4 +1,5 @@ AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c +AUX opus-1.3.1-macro-wstrict-prototypes.patch 469 BLAKE2B a68a9506ee1d3c08f0106f9270e6d4132f15b23434f844a9b33b8326590687d6ecaaa91b21cbc921b03f0aa5d2bfcd004a276099c19fe25ded6dc25b28093f50 SHA512 9467be13f0c0c9fcc1026830d206738871a97b2005ad540c5286112c0921051f995e475ebf4e1701b2fce7dfb2c8dfedd2a7bb1d54dfb7b623433ae98b71a9ca DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd -EBUILD opus-1.3.1-r3.ebuild 1338 BLAKE2B eb8e496b45f0d655846d33bf2e78cd1c9f2d42265ee91706c714e82eb78a2e83d53921ce2591f8ba344e398e0bac39e8407fc01d605460ab271be8b3131ea55f SHA512 34216e28a8fbfc498e5d15b201a2e2192c5be92d8dec11fb4a9ea39c41db2818252e398d63b35f8b806a7fa29a082b016495027a12da15167a38f3695157221c +EBUILD opus-1.3.1-r4.ebuild 1396 BLAKE2B 61734d61d0f4a2cc973821e3ebfcda2ed0d9ac96a4550512b71408472408eddbbbe5fd0027434a151388d06b14845270d102dbf72c1116b928b400e6bbc1d099 SHA512 31e110ab734cfbd63d364f3891421ff44188be244b7f5a29f3c941259bb945032b1a9617290b9b7eaec142118cf77d34443258eaae05bec09afc441c2f630ed3 MISC metadata.xml 464 BLAKE2B af27614c44aeb6d0d0eb053566be211c7997afe134138f7331276e406ad981e7e72303ae6ea9ad01d1a5772d6bce373d03f2996f4a126ce5414fd27626f90593 SHA512 e8d7151b3c61c6cdc6630f743237622bbb57128d1ae507b0ecee718a075f41133f68975ac805f2e886446508a73c158071ea0552a33c5dcd1ef434929f878c90 diff --git a/media-libs/opus/files/opus-1.3.1-macro-wstrict-prototypes.patch b/media-libs/opus/files/opus-1.3.1-macro-wstrict-prototypes.patch new file mode 100644 index 000000000000..34edb539b29c --- /dev/null +++ b/media-libs/opus/files/opus-1.3.1-macro-wstrict-prototypes.patch @@ -0,0 +1,20 @@ +https://gitlab.xiph.org/xiph/opus/-/merge_requests/56 + +From 402615a38851f7180c3ac01e246fcbc7de9fd451 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Nov 2022 03:19:54 +0000 +Subject: [PATCH] opus.m4: fix -Wstrict-prototypes + +Signed-off-by: Sam James +--- a/opus.m4 ++++ b/opus.m4 +@@ -63,7 +63,7 @@ dnl + #include + #include + +-int main () ++int main (void) + { + system("touch conf.opustest"); + return 0; +GitLab diff --git a/media-libs/opus/opus-1.3.1-r3.ebuild b/media-libs/opus/opus-1.3.1-r3.ebuild deleted file mode 100644 index 591e14778028..000000000000 --- a/media-libs/opus/opus-1.3.1-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-minimal - -DESCRIPTION="Open codec for interactive speech and music transmission over the Internet" -HOMEPAGE="https://opus-codec.org/" -SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" -INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon" -IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}" - -BDEPEND=" - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch -) - -multilib_src_configure() { - local myeconfargs=( - $(use_enable custom-modes) - $(multilib_native_use_enable doc) - $(use_enable static-libs static) - ) - - local i - # We want to disable intrinsics if no flags are enabled - # (This is a fun Bash construct to do that!) - # bug #752069 - for i in ${INTRINSIC_FLAGS} ; do - use ${i} && myeconfargs+=( --enable-intrinsics ) && break - done || myeconfargs+=( --disable-intrinsics ) - - if is-flagq -ffast-math || is-flagq -Ofast; then - myeconfargs+=( --enable-float-approx ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} diff --git a/media-libs/opus/opus-1.3.1-r4.ebuild b/media-libs/opus/opus-1.3.1-r4.ebuild new file mode 100644 index 000000000000..f0cf24b1ed2b --- /dev/null +++ b/media-libs/opus/opus-1.3.1-r4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib-minimal + +DESCRIPTION="Open codec for interactive speech and music transmission over the Internet" +HOMEPAGE="https://opus-codec.org/" +SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86" +INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon" +IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}" + +BDEPEND=" + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch + "${FILESDIR}"/${PN}-1.3.1-macro-wstrict-prototypes.patch +) + +multilib_src_configure() { + local myeconfargs=( + $(use_enable custom-modes) + $(multilib_native_use_enable doc) + $(use_enable static-libs static) + ) + + local i + # We want to disable intrinsics if no flags are enabled + # (This is a fun Bash construct to do that!) + # bug #752069 + for i in ${INTRINSIC_FLAGS} ; do + use ${i} && myeconfargs+=( --enable-intrinsics ) && break + done || myeconfargs+=( --disable-intrinsics ) + + if is-flagq -ffast-math || is-flagq -Ofast; then + myeconfargs+=( --enable-float-approx ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name "*.la" -delete || die +} -- cgit v1.2.3