CVS commit: pkgsrc/multimedia/libdvdplay

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Oct 12 02:57:36 UTC 2025

Modified Files:
        pkgsrc/multimedia/libdvdplay: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libdvdplay/patches: patch-src_command.c
            patch-src_msg.h patch-src_nav.c patch-src_tools.c

Log Message:
various fixes that GCC 14 insists on (at least one real bug fixed.)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/libdvdplay/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/libdvdplay/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libdvdplay/patches/patch-src_command.c \
    pkgsrc/multimedia/libdvdplay/patches/patch-src_msg.h \
    pkgsrc/multimedia/libdvdplay/patches/patch-src_nav.c \
    pkgsrc/multimedia/libdvdplay/patches/patch-src_tools.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libdvdplay/Makefile
diff -u pkgsrc/multimedia/libdvdplay/Makefile:1.13 pkgsrc/multimedia/libdvdplay/Makefile:1.14
--- pkgsrc/multimedia/libdvdplay/Makefile:1.13  Fri May 22 12:43:52 2020
+++ pkgsrc/multimedia/libdvdplay/Makefile       Sun Oct 12 02:57:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/05/22 12:43:52 adam Exp $
+# $NetBSD: Makefile,v 1.14 2025/10/12 02:57:35 mrg Exp $
 
 DISTNAME=      libdvdplay-1.0.1
 PKGREVISION=   4
@@ -13,5 +13,7 @@ GNU_CONFIGURE=        yes
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
 
+#CFLAGS.NetBSD+= -Wno-implicit-int -Wno-implicit-function-declaration -Wno-builtin-declaration-mismatch -Wno-incompatible-pointer-types -Wno-int-conversion
+
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/libdvdplay/distinfo
diff -u pkgsrc/multimedia/libdvdplay/distinfo:1.5 pkgsrc/multimedia/libdvdplay/distinfo:1.6
--- pkgsrc/multimedia/libdvdplay/distinfo:1.5   Tue Oct 26 11:01:08 2021
+++ pkgsrc/multimedia/libdvdplay/distinfo       Sun Oct 12 02:57:35 2025
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:01:08 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/10/12 02:57:35 mrg Exp $
 
 BLAKE2s (libdvdplay-1.0.1.tar.gz) = 11ba297807f4bc8fedc3149cb2f22bca6c313558762afa3caa4f2d1b63b97250
 SHA512 (libdvdplay-1.0.1.tar.gz) = 5d17557bac7bbda17c5cbc2ac272f8f98297f155b0d76b3e85ef360e3cc2531abb36bf27bb795c5042f19d5d30e3a8f223725c2398791e2de61297b7fbe391c4
 Size (libdvdplay-1.0.1.tar.gz) = 227746 bytes
+SHA1 (patch-src_command.c) = 87b3ff709b862fa481ace40154b65bca7b1b2ff2
+SHA1 (patch-src_msg.h) = 8b8db382548c374b4367adeae67dd5f1bba1b454
+SHA1 (patch-src_nav.c) = 2f6ecd591707ac5eae2aec76baaf7095dad9397d
+SHA1 (patch-src_tools.c) = 0b7cff4e7370bd5d5caeba2cedc191794f321c25

Added files:

Index: pkgsrc/multimedia/libdvdplay/patches/patch-src_command.c
diff -u /dev/null pkgsrc/multimedia/libdvdplay/patches/patch-src_command.c:1.1
--- /dev/null   Sun Oct 12 02:57:36 2025
+++ pkgsrc/multimedia/libdvdplay/patches/patch-src_command.c    Sun Oct 12 02:57:35 2025
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_command.c,v 1.1 2025/10/12 02:57:35 mrg Exp $
+
+Include <ctype.h> for everyone, not just windows.
+Include "msg.h".
+Fix the call to _dvdplay_trace().
+
+--- src/command.c.orig 2025-10-11 19:47:34.491155332 -0700
++++ src/command.c      2025-10-11 19:42:13.513727472 -0700
+@@ -38,9 +38,7 @@
+ #endif
+ #include <assert.h>
+ 
+-#ifdef WIN32
+-#   include <ctype.h>
+-#endif
++#include <ctype.h>
+ 
+ #include "common.h"
+ 
+@@ -52,6 +50,7 @@
+ #include "tools.h"
+ #include "command.h"
+ #include "vmg.h"
++#include "msg.h"
+ 
+ /* freebsd compatibility */
+ #ifndef PRIu8
+@@ -739,7 +738,7 @@ static dvdbool_t _SystemSet( dvdplay_ptr
+         {
+             if( _Bits( &dvdplay->cmd, 2 + i, 0, 1 ) )
+             {
+-                _dvdplay_trace(  "%s = ", system_reg_table[i] );
++                _dvdplay_trace( dvdplay, "%s = ", system_reg_table[i] );
+ 
+                 i_data = _RegOrData_2( dvdplay,
+                             _Bits( &dvdplay->cmd, 0, 3, 1 ), 2 + i );
Index: pkgsrc/multimedia/libdvdplay/patches/patch-src_msg.h
diff -u /dev/null pkgsrc/multimedia/libdvdplay/patches/patch-src_msg.h:1.1
--- /dev/null   Sun Oct 12 02:57:36 2025
+++ pkgsrc/multimedia/libdvdplay/patches/patch-src_msg.h        Sun Oct 12 02:57:35 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_msg.h,v 1.1 2025/10/12 02:57:35 mrg Exp $
+
+Include dvdplay.h and fix the prototype to match functions.
+
+--- src/msg.h.orig     2025-10-11 19:47:27.261813594 -0700
++++ src/msg.h  2025-10-11 19:37:26.539660978 -0700
+@@ -21,7 +21,9 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+  *****************************************************************************/
+ 
+-void _dvdplay_Err  ( const dvdplay_ptr, const char * psz_format, ... );
+-void _dvdplay_Warn ( const dvdplay_ptr, const char * psz_format, ... );
+-void _dvdplay_Dbg  ( const dvdplay_ptr, const char * psz_format, ... );
+-void _dvdplay_Trace( const dvdplay_ptr, const char * psz_format, ... );
++#include "dvdplay/dvdplay.h"
++
++void _dvdplay_err  ( const dvdplay_ptr, const char * psz_format, ... );
++void _dvdplay_warn ( const dvdplay_ptr, const char * psz_format, ... );
++void _dvdplay_dbg  ( const dvdplay_ptr, const char * psz_format, ... );
++void _dvdplay_trace( const dvdplay_ptr, const char * psz_format, ... );
Index: pkgsrc/multimedia/libdvdplay/patches/patch-src_nav.c
diff -u /dev/null pkgsrc/multimedia/libdvdplay/patches/patch-src_nav.c:1.1
--- /dev/null   Sun Oct 12 02:57:36 2025
+++ pkgsrc/multimedia/libdvdplay/patches/patch-src_nav.c        Sun Oct 12 02:57:35 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_nav.c,v 1.1 2025/10/12 02:57:35 mrg Exp $
+
+Include info.h and add a forward prototype.
+
+--- src/nav.c.orig     2003-03-10 09:20:06.000000000 -0800
++++ src/nav.c  2025-10-11 19:44:51.178774901 -0700
+@@ -41,6 +41,7 @@
+ 
+ #include "dvdplay/dvdplay.h"
+ #include "dvdplay/nav.h"
++#include "dvdplay/info.h"
+ 
+ #include "tools.h"
+ #include "command.h"
+@@ -55,6 +56,8 @@ static int MouseButton   ( pci_t * p_pci
+ static int NextDataPacket( const dvdplay_ptr dvdplay, byte_t** pp_buffer );
+ static int ReadNav       ( dvdplay_ptr dvdplay, byte_t* p_buffer );
+ 
++int dvdplay_cmd( dvdplay_ptr dvdplay, vm_cmd_t *cmd );
++
+ #define CELL \
+     dvdplay->state.p_pgc->cell_playback[dvdplay->state.i_cellN - 1 ]
+ 
Index: pkgsrc/multimedia/libdvdplay/patches/patch-src_tools.c
diff -u /dev/null pkgsrc/multimedia/libdvdplay/patches/patch-src_tools.c:1.1
--- /dev/null   Sun Oct 12 02:57:36 2025
+++ pkgsrc/multimedia/libdvdplay/patches/patch-src_tools.c      Sun Oct 12 02:57:36 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tools.c,v 1.1 2025/10/12 02:57:36 mrg Exp $
+
+Include msg.h.
+
+--- src/tools.c.orig   2003-01-29 14:26:09.000000000 -0800
++++ src/tools.c        2025-10-11 19:45:38.224930564 -0700
+@@ -45,6 +45,7 @@
+ 
+ #include "command.h"
+ #include "vmg.h"
++#include "msg.h"
+ 
+ /*
+  * get functions: they return some data