6:57 a.m.
commit f1839e0f4effeb2e2fa361353e98f4b723484e45
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Fri Jan 31 15:56:59 2025 +0900
Support C23 strict function prototype
Support C23, remove bool keyword usage
dvd95-c23-avoid-bool-keyword.patch | 39 ++++++++++++++++++++++++++
dvd95-c23-function-prototype.patch | 56 ++++++++++++++++++++++++++++++++++++++
dvd95.spec | 13 +++++++--
3 files changed, 106 insertions(+), 2 deletions(-)
---
diff --git a/dvd95-c23-avoid-bool-keyword.patch b/dvd95-c23-avoid-bool-keyword.patch
new file mode 100644
index 0000000..842e169
--- /dev/null
+++ b/dvd95-c23-avoid-bool-keyword.patch
@@ -0,0 +1,39 @@
+commit 1be2ee9b89f96bc50d52138c6f12d2979f4715fc
+Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
+Date: Fri Jan 31 15:01:28 2025 +0900
+
+ save
+
+diff --git a/src/callbacks.c b/src/callbacks.c
+index e06cf5a..57b88b1 100644
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -51,10 +51,10 @@ static gboolean RecordAudioSelected( GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer userdata )
+ {
+- gboolean bool;
++ gboolean gbool;
+
+- gtk_tree_model_get( model, iter, AUDIO_COL1_CHECK, &bool, -1);
+- if( bool ) {
++ gtk_tree_model_get( model, iter, AUDIO_COL1_CHECK, &gbool, -1);
++ if( gbool ) {
+ int noPiste;
+
+ gtk_tree_model_get( model, iter, AUDIO_COL8_NO, &noPiste, -1);
+@@ -74,11 +74,11 @@ static gboolean RecordSubSelected( GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer userdata )
+ {
+- gboolean bool;
++ gboolean gbool;
+
+- gtk_tree_model_get( model, iter, SUB_COL1_CHECK, &bool, -1);
++ gtk_tree_model_get( model, iter, SUB_COL1_CHECK, &gbool, -1);
+
+- if( bool ) {
++ if( gbool ) {
+ int noPiste;
+
+ gtk_tree_model_get( model, iter, SUB_COL6_NO, &noPiste, -1);
diff --git a/dvd95-c23-function-prototype.patch b/dvd95-c23-function-prototype.patch
new file mode 100644
index 0000000..34fe49b
--- /dev/null
+++ b/dvd95-c23-function-prototype.patch
@@ -0,0 +1,56 @@
+commit a8ca76462f4d88547624673e6c6c094a2af6a237
+Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
+Date: Fri Jan 31 14:54:02 2025 +0900
+
+ once save
+
+diff --git a/dvdauthor/libauthor.c b/dvdauthor/libauthor.c
+index e8e923d..6446570 100644
+--- a/dvdauthor/libauthor.c
++++ b/dvdauthor/libauthor.c
+@@ -36,7 +36,7 @@ COMMENTAIRE :
+
+ static jmp_buf JmpEnv;
+
+-static void ( * StatusFunction)();
++static void ( * StatusFunction)(char *);
+
+ static char * FileTable = NULL;
+ static int NrFile;
+@@ -125,7 +125,7 @@ void AuthorStatus( char * format, ... )
+ Linux!jef 2006/02/24 22:09:01
+ ------------------------------------------------------------------------------*/
+
+-void SetStatusFunction( void (*stFun)() )
++void SetStatusFunction( void (*stFun)(char *) )
+ {
+ StatusFunction = stFun;
+ }
+diff --git a/dvdauthor/libauthor.h b/dvdauthor/libauthor.h
+index 066a929..bc71349 100644
+--- a/dvdauthor/libauthor.h
++++ b/dvdauthor/libauthor.h
+@@ -20,7 +20,7 @@ COMMENTAIRE :
+ extern "C" {
+ #endif
+ void AuthorStatus PROTO((char *format, ...));
+-void SetStatusFunction PROTO((void (*stFun)()));
++void SetStatusFunction PROTO((void (*stFun)(char *)));
+ int DvdAuthorMain PROTO((int argc, char **argv));
+ void Exit PROTO((int retCode));
+ void ExitAuthor PROTO((void));
+diff --git a/src/vaporize.c b/src/vaporize.c
+index 13522ef..6ac80bb 100644
+--- a/src/vaporize.c
++++ b/src/vaporize.c
+@@ -149,8 +149,8 @@ char *injections_file = NULL; // where to inject internal status
from
+ const char progname [] = "vamps"; // we're sucking bytes!
+ static int NoAudioTrack;
+ static int NoSubpTrack;
+-static int ( * ReadFun)();
+-static int ( * WriteFun)();
++static int ( * ReadFun)(void *, unsigned char *, int);
++static int ( * WriteFun)(void *, unsigned char *, int);
+ static void * Parm;
+ static jmp_buf JmpEnv;
+ static int VideoPacketSize;
diff --git a/dvd95.spec b/dvd95.spec
index f6e86db..63ee55b 100644
--- a/dvd95.spec
+++ b/dvd95.spec
@@ -1,7 +1,7 @@
Summary: Graphical dvd9 to dvd5 converter
Name: dvd95
Version: 1.7p0
-Release: 20%{?dist}
+Release: 21%{?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...
@@ -11,6 +11,10 @@ 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
+# Patch for C23 strict function prototype
+Patch4: dvd95-c23-function-prototype.patch
+# Patch for C23 to avoid bool keyword
+Patch5: dvd95-c23-avoid-bool-keyword.patch
Requires: mplayer
Requires: mencoder
@@ -49,9 +53,10 @@ DVD95 support two copy modes :
%patch -P1 -p1 -b .hardening
%patch -P2 -p1 -b .format-security
%patch -P3 -p1 -b .c99
+%patch -P4 -p1 -b .c23_proto
+%patch -P5 -p1 -b .c23_bool
autoreconf -i
-
%build
%configure
%make_build
@@ -72,6 +77,10 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/dvd95.desktop
%changelog
+* Fri Jan 31 2025 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.7p0-21
+- Support C23 strict function prototype
+- Support C23, remove bool keyword usage
+
* Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
1.7p0-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild