gentoo auto-resync : 11:10:2022 - 01:37:00

3 files changed, 85 insertions, 1 deletions

diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index ef860b3831f3..c96745e3ef0a 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -3,7 +3,8 @@ AUX audiofile-0.3.6-CVE-2017-68xx.patch 12634 BLAKE2B d66ef71b5ce0d8b7356c856eb9
 AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651193984e00904ff916c4d1658d49da4db531d8cfa43b936857dc4ed142e83114890dc59f1c7a1b8d5cdf07127465ec9851323e50c37bd6045a7c07 SHA512 0fc8252ddab1430e960551093de1f4d5dc281440b0a583dde8ecf7ef3e6bad78667c049957cac24a2ff8731a22090d998406a6e4e84d80a9e2d5580663cd1f67
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
+AUX audiofile-0.3.6-strict-prototypes.patch 2339 BLAKE2B ff14877c949bdb218ddd75ee95a0ddcd4014838d461fd19dc2c62feee2c1d3cb2796b12945b172d1a41a137dc197538f68e6e5280f67b39e698d22b46ee5b001 SHA512 26fd421be981208a18bd970054efc50e5b370937af9cd972e7a9206e3b92f389032808e4207726d17807e0c60cdc562826a77c288d85c0ae06534f7f036e2d78
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
 EBUILD audiofile-0.3.6-r4.ebuild 1416 BLAKE2B 6f9cd373d6b44060fa4112b2eebc5f7ffd105a07cf4f90bd5faba092bdf4c61b96b10267344d75e5ca4d0482f2326702db46d486656a8ac4a43a0d4fd0e34984 SHA512 ac0594b20467d54df456d6e720d652a5bb6aeea66fcaba513a2d66e5f53e9137d65ab53bea4d66c21cabad69ee2eb1d83bb3713a7931250a9cdb8a103f62a3f6
-EBUILD audiofile-0.3.6-r5.ebuild 1477 BLAKE2B 6d9d4ec01a01a25d73c8c6c430444e940bb67a53c730634d91913ef2ec5a86f62f8d07b166e6ff2dc5bc2a698f86bb147ad36ed2e37f6927d192ec0dcc79a098 SHA512 18ca01a31f7970ae98ee143e4714a6e5208ea4ca6ebb311c0bebf2745e0922f2591d3207abce8128e03a6736fc3c1d0a18edc7f28bdbed6849b8f0934548325b
+EBUILD audiofile-0.3.6-r5.ebuild 1528 BLAKE2B 1fe49c9c6ef48e21f333932220bc7cd9980d045fbb65d99c918594276002a56631aa089b6aebf17eda1f37a79e41948fcb7318ba26269381cb310c63d8dae218 SHA512 63c43892973cd8ff33af4305bfc2cfd7f9e8820607a03c3a23370c7939a3469681d859e4cc7f77c2c367f40d97d2a1f9a1bb5922f390e5eaa44d14e6fd1888b4
 MISC metadata.xml 450 BLAKE2B 7aa693f92285a5d204d7206189e8c82c9a93146736db0cec6aa203c22f284bceca73b937bc962246f21668779c59a51504de7f52ba2901d4a8687fd28c5c4afb SHA512 eab3f3957975ecb7bb5bee29b221e19176461725fc9bdf5a6a382b8d8d9ed258db969af99fbcdfa9f5cdbfc628f4058605a9fe98fadc3971b227d811afcf185a
diff --git a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
index 02f89e0f9b41..a759228901b9 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${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
 )
 
 src_prepare() {
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch b/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch
new file mode 100644
index 000000000000..6e78b773c93c
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch
@@ -0,0 +1,82 @@
+https://github.com/mpruett/audiofile/pull/64
+
+From 519f6c19d3bcfa048fc468f0094ab4235e7c77b2 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 10 Oct 2022 11:13:10 -0700
+Subject: [PATCH] Fix -Werror=strict-prototypes
+
+This will be required for upcoming gcc and clang versions.
+
+Reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+
+diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c
+index 8fb2323..392766c 100644
+--- a/libaudiofile/g711.c
++++ b/libaudiofile/g711.c
+@@ -74,8 +74,7 @@ static int search(int val, const short *table, int size)
+  * John Wiley & Sons, pps 98-111 and 472-476.
+  */
+ unsigned char
+-_af_linear2alaw(pcm_val)
+-	int		pcm_val;	/* 2's complement (16-bit range) */
++_af_linear2alaw(int pcm_val)		/* 2's complement (16-bit range) */
+ {
+ 	int		mask;
+ 	int		seg;
+@@ -110,8 +109,7 @@ _af_linear2alaw(pcm_val)
+  *
+  */
+ int
+-_af_alaw2linear(a_val)
+-	unsigned char	a_val;
++_af_alaw2linear(unsigned char a_val)
+ {
+ 	int		t;
+ 	int		seg;
+diff --git a/sfcommands/sfinfo.c b/sfcommands/sfinfo.c
+index c8fb913..91221a5 100644
+--- a/sfcommands/sfinfo.c
++++ b/sfcommands/sfinfo.c
+@@ -48,7 +48,7 @@ void errorHandler(long error, const char *message)
+ 		fprintf(stderr, "sfinfo: %s [error %ld]\n", message, error);
+ }
+ 
+-void printusage()
++void printusage(void)
+ {
+ 	printf("usage: sfinfo [options...] soundfiles...\n");
+ 	printf("options:\n");
+@@ -58,7 +58,7 @@ void printusage()
+ 	printf("  -v, --version      Print version\n");
+ }
+ 
+-void printversion()
++void printversion(void)
+ {
+ 	printf("sfinfo: Audio File Library version %s\n", VERSION);
+ }
+https://github.com/mpruett/audiofile/commit/7227a65c9725a89f839d01826ea8427becee30be
+
+From 7227a65c9725a89f839d01826ea8427becee30be Mon Sep 17 00:00:00 2001
+From: Michael Pruett <michael@68k.org>
+Date: Thu, 7 Mar 2013 22:44:56 -0800
+Subject: [PATCH] Fix compiler warning regarding discarding const
+ qualification.
+
+diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c
+index 394543e..8fb2323 100644
+--- a/libaudiofile/g711.c
++++ b/libaudiofile/g711.c
+@@ -43,11 +43,7 @@
+ static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
+ 			    0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
+ 
+-static int
+-search(val, table, size)
+-	int		val;
+-	short		*table;
+-	int		size;
++static int search(int val, const short *table, int size)
+ {
+ 	int		i;
+