CVS commit: pkgsrc/multimedia/xine-lib
"matthew green" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc
Committed By: mrg
Date: Thu Aug 20 07:12:18 UTC 2026
Modified Files:
pkgsrc/multimedia/xine-lib: distinfo
Added Files:
pkgsrc/multimedia/xine-lib/patches: patch-src-input-input__file.c
Log Message:
port to C23 - avoid func() usage that isn't func(void).
something made this be built with -std=gnu23 recently, and this is
the only change it seems to need.
not bumping pkg revision because it doesn't really change, if it
already built.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/multimedia/xine-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/xine-lib/patches/patch-src-input-input__file.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
(unnamed)
(text/x-diff, 2.7 KB)
Modified files:
Index: pkgsrc/multimedia/xine-lib/distinfo
diff -u pkgsrc/multimedia/xine-lib/distinfo:1.121 pkgsrc/multimedia/xine-lib/distinfo:1.122
--- pkgsrc/multimedia/xine-lib/distinfo:1.121 Sat Jan 3 14:10:39 2026
+++ pkgsrc/multimedia/xine-lib/distinfo Thu Aug 20 07:12:18 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.121 2026/01/03 14:10:39 nia Exp $
+$NetBSD: distinfo,v 1.122 2026/08/20 07:12:18 mrg Exp $
BLAKE2s (xine-lib-1.2.13.tar.xz) = e066b7515caf4388d0bf2a73e6d51a1f8acf646e5f198395cb26ad9bcf9384f8
SHA512 (xine-lib-1.2.13.tar.xz) = 088a446dd962c3cef621b56edd48fa2e1b47566108b4097d74899a9e5316a1f205993041d3070f45b706f168837579811e5e98c7e52ec278c683379407084bc4
@@ -10,6 +10,7 @@ SHA1 (patch-include_xine_attributes.h) =
SHA1 (patch-include_xine_post.h) = 3ada327a7f171bdf680074b30f005099011a201c
SHA1 (patch-include_xine_xineutils.h) = 0c8ec0959c82862b31435396e24ceee4ccbcd51a
SHA1 (patch-m4_decoders.m4) = 4a5703b56336a033110aaff5294be80f1621dad3
+SHA1 (patch-src-input-input__file.c) = 12095b1ea8f9709c0f010120fdec20cd797e831f
SHA1 (patch-src-post-audio-stretch.c) = 6f950bcd47fdf68b691744dc105f59f821748ce1
SHA1 (patch-src-post-audio-upmix.c) = 70ca6babfa9a7add0ac70a6024fcff429e1bc49d
SHA1 (patch-src-post-audio-upmix_mono.c) = 2c70ded10118cbeed5be3c948886f7311ddb7bbd
Added files:
Index: pkgsrc/multimedia/xine-lib/patches/patch-src-input-input__file.c
diff -u /dev/null pkgsrc/multimedia/xine-lib/patches/patch-src-input-input__file.c:1.1
--- /dev/null Thu Aug 20 07:12:18 2026
+++ pkgsrc/multimedia/xine-lib/patches/patch-src-input-input__file.c Thu Aug 20 07:12:18 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-src-input-input__file.c,v 1.1 2026/08/20 07:12:18 mrg Exp $
+
+work with modern C.
+
+
+--- src/input/input_file.c.orig 2023-01-25 08:03:17.000000000 -0800
++++ src/input/input_file.c 2026-08-20 00:02:57.343794081 -0700
+@@ -651,7 +651,9 @@ static int file_input_strverscmp (const char *s1, cons
+ /*
+ * Wrapper to file_input_strverscmp() for qsort() calls, which sort mrl_t type array.
+ */
+-static int file_input_sortfiles_default (const xine_mrl_t *s1, const xine_mrl_t *s2) {
++static int file_input_sortfiles_default (const void *v1, const void *v2) {
++ const xine_mrl_t *s1 = v1;
++ const xine_mrl_t *s2 = v2;
+ return(file_input_strverscmp(s1->mrl, s2->mrl));
+ }
+
+@@ -735,7 +737,7 @@ static xine_mrl_t **file_input_class_get_dir (input_cl
+ int num_dir_files = 0;
+ int num_norm_files = 0;
+ int num_files = -1;
+- int (*func) () = file_input_sortfiles_default;
++ int (*func) (const void *, const void *) = file_input_sortfiles_default;
+ int already_tried = 0;
+ int show_hidden_files;
+