gentoo auto-resync : 15:03:2024 - 06:47:25

5 files changed, 140 insertions, 3 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 57d28d8cbf80..ab827f85bada 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 7e7e3c2b7f15..9ed4d7443217 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,3 +1,5 @@
+AUX 0001-fix-K-R-C-on-various-counts.patch 2916 BLAKE2B eed8fa39af8af82b8b741589623deb14be1523997778c334bb67884cd1754b536c55041c6e76a8f5f94c08defb313a3bb126eb2c53e567a21d087183e1e4327c SHA512 d318fab637d88d22b8ba0569683000e5830a16c5c4635d6cf8a3d9dd1e71a26ed183f891ce6b338aa31262ab75df9770ea2eeb90c9902c23eb1181b5ea886112
+AUX 0001-fix-missing-prototype-for-internal-jpeg-ABI.patch 1132 BLAKE2B cc388562e84219a968f99e1b3479ae50b2f72f6365eb70675a32cf6b2a7de181ff01433ad429b26cc9e8601c901f86c2fd3ac5a3b6ba6a35e90f72d9bab8dcf0 SHA512 63e6d8e2dccb8ce1ef706cc2a3fd8dd91659a337a1d666c27de56a8206b1b4c66e8f24a490e609779725313d46c8fed3a2e4e208c08c1f56c7c51a6ac2d7c560
 AUX mpeg-tools-1.5b-64bit_fixes.patch 6914 BLAKE2B 4b9c42f10bc8e44dd402233a933c523cb5fdf15802575e762efacb5f165efeaff45ebfdfc414f6819c9f959301bf6844d7cdc7488145e7ee76192d34cbc6f08b SHA512 1d45ceb3b5bcd8c536b0d1f5a29e2e010dcc0bbff687588e795772188100fe2370e42ff889b649912c97363cd112db0ef4bd1ea22b13b6c5d4cf5b62ba9f2465
 AUX mpeg-tools-1.5b-as-needed.patch 1524 BLAKE2B e153902331f7c58c7e9a10f7c9c6cb95a801d96b4961ffa43a2aae8cd8fa10096c391a87540c76e478a7e164834baa243c442aa44b38d9794ab0aa3ece2a2df5 SHA512 9bfa844b66a0eee2c025e1e01cb8802d4ea0fb2d5a4f8172c10516732a9edb5b02877b0e8d4298f5e8d2bdbe46ab1b067562c067cbd866a921b7f76032da7a65
 AUX mpeg-tools-1.5b-build.patch 1349 BLAKE2B c724711b8f6c43f537995e78b134da59eeb1101ebac0e38422389f819ca74f1ae528bb14e6cf723135576b9b60fec157fa6cfb0364ebad4b13a4b31f966f88bf SHA512 e1854262fcb1a3373c7ba907e672eaa4432c0c5e5d963df0174bc01010cbfdb5ea1679102ed905daaf3ef0171a93097a5ee20638c37a45149c57e4fcf26f0271
@@ -7,5 +9,5 @@ AUX mpeg-tools-1.5b-tempfile-convert.patch 4117 BLAKE2B 0ef961ec23cb88da70d1317a
 AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2546 BLAKE2B e5c1f72de985dbfd3eb28f9fdcded691d498cc8106a65c3020e0d9c8fd312ef6875e6541a1bfaa684c23925bd53903259d90ed6176416ff953451a4cba158c02 SHA512 08e1fed266b3b921a214cd0d881ebe219b79a7b7b3044abe9348a7d2ec28a7b7ad50c538a64cc6818839724923bb7bd021614ca8f9fe5d23c0e419f2c549beee
 AUX mpeg-tools-1.5b-tempfile-tests.patch 5304 BLAKE2B c23b571b117c0dfc5e115dfa47b318051859ab758fb4a77f482deac5d470001d1cd289717d779133e961024a17677fcbe4cf224b18ce2c104d37197f7d268841 SHA512 3942aa4d6d4935d7401b422837df254fabdc37c9b1c1d42fe978e746f1b74a6964990f14bf0905b3963e180c90b32e4b7150079137635e6c2a42c357f1472f7e
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r5.ebuild 1758 BLAKE2B fccbc220d9e73d136b5b70614cb9887d10ad6aba42988c93de27745ea3f452857ceb8ee9d9a44ce45d4d1c72c8b9fd6050aba3853d274ca719fafcc0af925efb SHA512 480f536ae7cbbdee5a3b9f5ead46d89cfe5d9c71a9ce8f0abaecb4d540d272a0db6b7f71472a9f59b9be0ed8d9e3fe69ebba4e5eaa82c8145a2ee8dca2f797d7
+EBUILD mpeg-tools-1.5b-r5.ebuild 2040 BLAKE2B be4d7836950cab129008e395ba2bdfbe267eec78c1593e1b0f1fba6bc00e54ab628c78214a3974a33c7aed345b71505de478fad0c414c408d2828f0c02fb6ff7 SHA512 82025d805b5c6161471645f68df6fa71ef80d6ab7d73ebd0bc0a7f420e98a814d3289a6ac1650a6b25b3e3c4607378ae30f52810e5f7ed9ce898100c36c50c11
 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de
diff --git a/media-video/mpeg-tools/files/0001-fix-K-R-C-on-various-counts.patch b/media-video/mpeg-tools/files/0001-fix-K-R-C-on-various-counts.patch
new file mode 100644
index 000000000000..1bdada074790
--- /dev/null
+++ b/media-video/mpeg-tools/files/0001-fix-K-R-C-on-various-counts.patch
@@ -0,0 +1,98 @@
+From 0905d53337e2d7d72575684a72a466df1b13c610 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 14 Mar 2024 22:37:59 -0400
+Subject: [PATCH] fix K&R C on various counts
+
+---
+ convert/jmovie2jpeg.c    |  7 ++-----
+ convert/mpeg_demux.c     |  2 +-
+ convert/mtv/movieToVid.c | 16 ++++------------
+ 3 files changed, 7 insertions(+), 18 deletions(-)
+
+diff --git a/convert/jmovie2jpeg.c b/convert/jmovie2jpeg.c
+index 7583135..d77505a 100644
+--- a/convert/jmovie2jpeg.c
++++ b/convert/jmovie2jpeg.c
+@@ -39,17 +39,14 @@
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+-usage (p)
+-char *p;
++void usage (char *p)
+ 
+ {
+     fprintf (stderr, "Usage: %s infilename outfilename start-frame-no end-frame-no\n", p);
+     exit (1);
+ }
+ 
+-main (argc, argv)
+-int argc;
+-char **argv;
++int main (int argc, char **argv)
+ {
+     char *infilename;     /* input filename string */
+     char *obase;          /* output filename base string=>obase##.jpg */
+diff --git a/convert/mpeg_demux.c b/convert/mpeg_demux.c
+index bcce728..505afd1 100644
+--- a/convert/mpeg_demux.c
++++ b/convert/mpeg_demux.c
+@@ -110,7 +110,7 @@ static int gNumPrivate_2_Packets;
+ static FILE *errorOutput;
+ #endif
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+   {
+    unsigned int startCode;
+    int errorCode;
+diff --git a/convert/mtv/movieToVid.c b/convert/mtv/movieToVid.c
+index 4f02a3b..7262db8 100644
+--- a/convert/mtv/movieToVid.c
++++ b/convert/mtv/movieToVid.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <malloc.h>
++#include <strings.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+@@ -64,7 +65,7 @@ MapFile (filename)
+  *--------------------------------------------------------------
+  */
+ 
+-WriteScriptFile (name, dataDir, indexDir, host, headerPtr, offsets, numFrames)
++void WriteScriptFile (name, dataDir, indexDir, host, headerPtr, offsets, numFrames)
+     char *name, *dataDir;
+     char *indexDir, *host;
+     jpheader *headerPtr;
+@@ -120,11 +121,7 @@ WriteScriptFile (name, dataDir, indexDir, host, headerPtr, offsets, numFrames)
+  *--------------------------------------------------------------
+  */
+ 
+-WriteOfsFile (name, dir, headerPtr, offsets, numFrames)
+-    char *name, *dir;
+-    jpheader *headerPtr;
+-    int *offsets;
+-    int numFrames;
++void WriteOfsFile (char *name, char *dir, jpheader *headerPtr, int *offsets, int numFrames)
+ {
+     FILE *outFile;
+     char str[512];
+@@ -172,12 +169,7 @@ WriteOfsFile (name, dir, headerPtr, offsets, numFrames)
+  *--------------------------------------------------------------
+  */
+ 
+-WriteVidFile (name, dir, headerPtr, fot, numFrames, offset)
+-    char *name, *dir;
+-    jpheader *headerPtr;
+-    int *fot;
+-    int numFrames;
+-    int *offset;
++void WriteVidFile (char *name, char *dir, jpheader *headerPtr, int *fot, int numFrames, int *offset)
+ {
+     FILE *vidFile;
+     FILE *audFile;
+-- 
+2.43.2
+
diff --git a/media-video/mpeg-tools/files/0001-fix-missing-prototype-for-internal-jpeg-ABI.patch b/media-video/mpeg-tools/files/0001-fix-missing-prototype-for-internal-jpeg-ABI.patch
new file mode 100644
index 000000000000..ade113830cfa
--- /dev/null
+++ b/media-video/mpeg-tools/files/0001-fix-missing-prototype-for-internal-jpeg-ABI.patch
@@ -0,0 +1,30 @@
+From 4b4d0def00b0a549ea0bf86cfb7452bffc1f9111 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 14 Mar 2024 22:24:51 -0400
+Subject: [PATCH] fix missing prototype for internal jpeg ABI
+
+---
+ mpeg_encode/jpeg.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/mpeg_encode/jpeg.c b/mpeg_encode/jpeg.c
+index 2dc9438..b07c9ea 100644
+--- a/mpeg_encode/jpeg.c
++++ b/mpeg_encode/jpeg.c
+@@ -83,6 +83,13 @@
+ 
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
++/* This prototype comes from jpegint.h; it is not public, but the code uses it
++ * and libjpeg exports it for internal use. Just keep it building. */
++EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
++                                    JSAMPARRAY output_array, int dest_row,
++                                    int num_rows, JDIMENSION num_cols));
++
++
+ /*=======================================================================*
+  *                                                                       *
+  * JMovie2JPEG                                                           *
+-- 
+2.43.2
+
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
index acd331b70b3f..27d3b60126f0 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_PN=mpeg_encode
 DESCRIPTION="Tools for MPEG video"
@@ -28,6 +28,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-jpeg.patch
 	"${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
 	"${FILESDIR}"/${P}-tempfile-tests.patch
+	"${FILESDIR}"/0001-fix-missing-prototype-for-internal-jpeg-ABI.patch
+	"${FILESDIR}"/0001-fix-K-R-C-on-various-counts.patch
 )
 
 src_prepare() {
@@ -43,6 +45,11 @@ src_prepare() {
 }
 
 src_compile() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/861137
+	# Upstream is thoroughly dead, homepage doesn't even exist anymore.
+	filter-lto
+
 	emake CC="$(tc-getCC)"
 	emake -C convert CC="$(tc-getCC)"
 	emake -C convert/mtv CC="$(tc-getCC)"