FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

multimedia/v4l-utils: Fix build on CURRENT/STABLE

Browse Source 
In file included from dvbv5-daemon.c:43:
/usr/include/search.h:80:7: error: expected identifier or '('
   80 | void     tdestroy(void *, void (*)(void *));
      |          ^
dvbv5-daemon.c:24:23: note: expanded from macro 'tdestroy'
   24 | #define tdestroy(...) do {} while (0)
      |                       ^
In file included from dvbv5-daemon.c:43:
/usr/include/search.h:80:7: error: while loop outside of a function
dvbv5-daemon.c:24:29: note: expanded from macro 'tdestroy'
   24 | #define tdestroy(...) do {} while (0)
      |                             ^

Use native tdestroy(3) on 16-CURRENT and 15-STABLE after [1] and [2],
respectively.

[1] https://cgit.freebsd.org/src/commit/?id=b8c99e7d912f0dad84cec80f8c4331646b87a3ec
[2] https://cgit.freebsd.org/src/commit/?h=stable/15&id=6197518ee90541a5e04d03dffda760b888d3a3e7

Reported by:	pkg-fallout
MFH:		2026Q1
This commit is contained in:
Jason E. Hale
2026-01-27 08:49:44 -05:00
parent def88f0388
commit c694950c17
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/libv4l/files/patch-utils_dvb_dvbv5-daemon.c
+9 -5
View File
@@ -1,13 +1,17 @@
--- utils/dvb/dvbv5-daemon.c.orig 2020-04-09 16:29:54 UTC
--- utils/dvb/dvbv5-daemon.c.orig 2022-01-10 11:49:59 UTC
+++ utils/dvb/dvbv5-daemon.c
@@ -18,7 +18,11 @@
@@ -18,7 +18,14 @@
*
*/
+#ifndef __FreeBSD__
#define _XOPEN_SOURCE 600
-#define _XOPEN_SOURCE 600
+#ifdef __FreeBSD__
+# include <sys/param.h>
+# if __FreeBSD_version < 1500505 || (__FreeBSD_version >= 1600000 && __FreeBSD_version < 1600008)
+# define tdestroy(...) do {} while (0)
+# endif
+#else
+#define tdestroy(...) do {} while (0)
+# define _XOPEN_SOURCE 600
+#endif
#define _FILE_OFFSET_BITS 64