commit 62e53b2823c58ae0f09b3d97839f2b526ca208d9 Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org&gt; Date: Wed Oct 16 11:57:49 2024 +0900 Fix FTBFS with c99, -Werror=implicit-function-declaration -Werror=incompatible-pointer-types dvd95-include-type-cat-c99.patch | 110 +++++++++++++++++++++++++++++++++++++++ dvd95.spec | 10 +++- 2 files changed, 119 insertions(+), 1 deletion(-) --- diff --git a/dvd95-include-type-cat-c99.patch b/dvd95-include-type-cat-c99.patch new file mode 100644 index 0000000..70e9168 --- /dev/null +++ b/dvd95-include-type-cat-c99.patch @@ -0,0 +1,110 @@ +Binary files dvd95-orig/dvdauthor/.libs/dvdauthor.o and dvd95-new/dvdauthor/.libs/dvdauthor.o differ +Binary files dvd95-orig/dvdauthor/.libs/dvdvob.o and dvd95-new/dvdauthor/.libs/dvdvob.o differ +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdauthor.h dvd95-new/dvdauthor/dvdauthor.h +--- dvd95-orig/dvdauthor/dvdauthor.h 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdauthor.h 2024-10-15 23:58:10.917031226 +0900 +@@ -41,6 +41,8 @@ void pgc_set_color(struct pgc *p,int ind + void pgc_set_buttongroup(struct pgc *p,int index,unsigned char *map); + #endif + void pgc_set_stilltime(struct pgc *p,int still); ++void dvdpgc__init(void); ++void dvdvob__init(void); + + enum { VIDEO_ANY=0, VIDEO_MPEG, VIDEO_FORMAT, VIDEO_ASPECT, VIDEO_RESOLUTION, VIDEO_WIDESCREEN, VIDEO_FRAMERATE, VIDEO_CAPTION }; + enum { AUDIO_ANY=0, AUDIO_FORMAT, AUDIO_QUANT, AUDIO_DOLBY, AUDIO_LANG, AUDIO_CHANNELS, AUDIO_SAMPLERATE }; +Binary files dvd95-orig/dvdauthor/dvdauthor.o and dvd95-new/dvdauthor/dvdauthor.o differ +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdcli.c dvd95-new/dvdauthor/dvdcli.c +--- dvd95-orig/dvdauthor/dvdcli.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdcli.c 2024-10-15 23:53:59.565585994 +0900 +@@ -26,6 +26,7 @@ + + #include "conffile.h" + #include "dvdauthor.h" ++#include "libauthor.h" + #include "readxml.h" + #include "rgb.h" + +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdcompile.c dvd95-new/dvdauthor/dvdcompile.c +--- dvd95-orig/dvdauthor/dvdcompile.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdcompile.c 2024-10-15 23:48:38.733027769 +0900 +@@ -24,6 +24,7 @@ + #include "dvdauthor.h" + #include "da-internal.h" + #include "dvdvm.h" ++#include "libauthor.h" + + static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdcompile.c#15 $"; + +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdifo.c dvd95-new/dvdauthor/dvdifo.c +--- dvd95-orig/dvdauthor/dvdifo.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdifo.c 2024-10-15 23:53:30.278535034 +0900 +@@ -25,6 +25,7 @@ + + #include "dvdauthor.h" + #include "da-internal.h" ++#include "libauthor.h" + + static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdifo.c#19 $"; + +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdpgc.c dvd95-new/dvdauthor/dvdpgc.c +--- dvd95-orig/dvdauthor/dvdpgc.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdpgc.c 2024-10-15 23:53:43.066557287 +0900 +@@ -25,6 +25,7 @@ + + #include "dvdauthor.h" + #include "da-internal.h" ++#include "libauthor.h" + + static const char RCSID[]="$Id: //depot/dvdauthor/src/dvdpgc.c#20 $"; + +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/dvdvml.c dvd95-new/dvdauthor/dvdvml.c +--- dvd95-orig/dvdauthor/dvdvml.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/dvdvml.c 2024-10-15 23:52:52.023468474 +0900 +@@ -79,7 +79,7 @@ + #else + #define YY_PROTO(proto) () + #endif +- ++#include "libauthor.h" + /* Returned upon end-of-file. */ + #define YY_NULL 0 + +Binary files dvd95-orig/dvdauthor/dvdvob.o and dvd95-new/dvdauthor/dvdvob.o differ +diff -urp '--exclude=*~' dvd95-orig/dvdauthor/readxml.c dvd95-new/dvdauthor/readxml.c +--- dvd95-orig/dvdauthor/readxml.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/dvdauthor/readxml.c 2024-10-15 23:58:47.576109757 +0900 +@@ -27,6 +27,7 @@ + + #include <libxml/xmlreader.h> + ++#include "libauthor.h" + #include "readxml.h" + + #ifdef HAVE_LANGINFO_CODESET +Binary files dvd95-orig/src/dvd2vob.o and dvd95-new/src/dvd2vob.o differ +Binary files dvd95-orig/src/dvdbackup.o and dvd95-new/src/dvdbackup.o differ +diff -urp '--exclude=*~' dvd95-orig/src/systools.c dvd95-new/src/systools.c +--- dvd95-orig/src/systools.c 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/src/systools.c 2024-10-16 00:06:25.065089752 +0900 +@@ -357,8 +357,8 @@ char * mode; + new_argv[2] = command; + new_argv[3] = NULL; + (void) execve( SH_PATH, +- (const char **) new_argv, +- (const char **)environ); ++ (char * const *)new_argv, ++ (char * const *)environ); + /* Die if it failed. */ + _exit(127); + } +diff -urp '--exclude=*~' dvd95-orig/src/vaporize.h dvd95-new/src/vaporize.h +--- dvd95-orig/src/vaporize.h 2013-03-01 05:47:05.000000000 +0900 ++++ dvd95-new/src/vaporize.h 2024-10-16 00:00:49.435370790 +0900 +@@ -26,6 +26,7 @@ int VaporizeFactor(double factor, int dy + int VaporizeInjection(char *fileName); + int Vaporize(long long size, void *parm); + int VaporizeTerm(void); ++void VaporizeForgeSubs( int v ); + void VaporizeSizes(int *pVideoPacketSize, int *pAudioPacketSize, int *pSubPacketSize, int *pNavPacketSize); + void VaporizePacks(int *videoPacks, int *auxPacks); + #ifdef __cplusplus diff --git a/dvd95.spec b/dvd95.spec index 9d5f9f8..c4a97ba 100644 --- a/dvd95.spec +++ b/dvd95.spec @@ -1,13 +1,16 @@ Summary: Graphical dvd9 to dvd5 converter Name: dvd95 Version: 1.7p0 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL-2.0-or-later URL: http://dvd95.sourceforge.net/ Source: https://sourceforge.net/code-snapshots/git/d/dv/dvd95/code.git/dvd95-code... Patch0: dvd95-1.6p0-desktop.patch Patch1: dvd95-hardening.patch Patch2: dvd95-format-security.patch +# Patch for c99 confirmant, fix for +# -Werror=implicit-function-declaration, -Werror=incompatible-pointer-types +Patch3: dvd95-include-type-cat-c99.patch Requires: mplayer Requires: mencoder @@ -45,6 +48,7 @@ DVD95 support two copy modes : %patch -P0 -p1 -b .desktop %patch -P1 -p1 -b .hardening %patch -P2 -p1 -b .format-security +%patch -P3 -p1 -b .c99 autoreconf -i @@ -68,6 +72,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dvd95.desktop %changelog +* Wed Oct 16 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org&gt; - 1.7p0-19 +- Fix FTBFS with c99, -Werror=implicit-function-declaration + -Werror=incompatible-pointer-types + * Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.7p0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild