gentoo auto-resync : 23:11:2022 - 07:07:57

3 files changed, 28 insertions, 5 deletions

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 <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 03:27:44 +0000
+Subject: [PATCH] vorbis.m4: fix -Wstrict-prototypes
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/vorbis.m4
++++ b/vorbis.m4
+@@ -67,7 +67,7 @@ dnl
+ #include <vorbis/codec.h>
+ #include <vorbis/vorbisenc.h>
+ 
+-int main ()
++int main (void)
+ {
+     vorbis_block 	vb;
+     vorbis_dsp_state	vd;
+GitLab
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
index 9b1d80665e32..f90fe66fd547 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="The Ogg Vorbis sound file format library"
@@ -16,11 +17,13 @@ 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
 
@@ -46,7 +49,6 @@ multilib_src_configure() {
 		$(use_enable test oggtest)
 	)
 
-	einfo "Running configure in ${BUILD_DIR}"
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }