Attachment #240932 for bug #270291




PORTNAME=	xine
DISTVERSION=	1.2.13
PORTREVISION=	5
CATEGORIES=	multimedia
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${DISTVERSION}
PKGNAMEPREFIX=	lib
DISTNAME=	${PORTNAME}-lib-${DISTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Libraries for xine multimedia player

CONFIGURE_ARGS=	--with-libflac \
		--enable-musepack \
		--enable-real-codecs \
		--without-esound \
		--disable-crypto

MAKE_ENV=	V=1
MAKE_ARGS=	pkgdatadir="${DATADIR}" \

DOCSDIR=	${PREFIX}/share/doc/xine-lib
# Please sync with XINE_PLUGINSDIR in multimedia/xine
# and multimedia/vdr-plugin-xineliboutput
PLUGINSDIR=	lib/xine/plugins/2.11
PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"

OPTIONS_DEFINE=		AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB \

Lines 1-3 Link Here

(-)b/multimedia/libxine/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1646930905	1	TIMESTAMP = 1679084820
2	SHA256 (xine-lib-1.2.12.tar.xz) = d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098	2	SHA256 (xine-lib-1.2.13.tar.xz) = 5f10d6d718a4a51c17ed1b32b031d4f9b80b061e8276535b2be31e5ac4b75e6f
3	SIZE (xine-lib-1.2.12.tar.xz) = 5341212	3	SIZE (xine-lib-1.2.13.tar.xz) = 5004196




https://sourceforge.net/p/xine/tickets/11/

dav1d.c:547:12: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
  settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
  ~~~~~~~~ ^
dav1d.c:548:12: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
  settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
  ~~~~~~~~ ^
dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
  settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
                                          ~~~~~~~~ ^
dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
  settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
                                          ~~~~~~~~ ^
/usr/include/sys/param.h:306:34: note: expanded from macro 'MAX'
#define MAX(a,b) (((a)>(b))?(a):(b))
                                 ^
dav1d.c:551:22: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
            settings.n_frame_threads, settings.n_tile_threads);
            ~~~~~~~~ ^
dav1d.c:551:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
            settings.n_frame_threads, settings.n_tile_threads);
                                      ~~~~~~~~ ^
../../include/xine/xineutils.h:687:40: note: expanded from macro 'xprintf'
        xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__);                        \
                                       ^~~~~~~~~~~

--- src/video_dec/dav1d.c.orig	2022-03-06 16:31:24 UTC
+++ src/video_dec/dav1d.c
@@ -544,11 +544,17 @@ static video_decoder_t *_open_plugin(video_decoder_cla
 
   /* multithreading */
   ncpu = xine_cpu_count();
+#if DAV1D_API_VERSION_MAJOR > 5
+  settings.n_threads = ncpu + 1;
+  xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
+            "Using %d threads\n", settings.n_threads);
+#else
   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
   settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
             "Using %d frame threads, %d tile threads\n",
             settings.n_frame_threads, settings.n_tile_threads);
+#endif
 
   /* dri frame allocator */
   settings.allocator.cookie = this;




Unbreak build of phonon-xine

In file included from xine/plugins.c:23:
In file included from /usr/local/include/xine/input_plugin.h:27:
/usr/local/include/xine/xineutils.h:197:8: error: unknown type name 'inline'
static inline void _x_freep(void *ptr) {
       ^
/usr/local/include/xine/xineutils.h:197:15: error: expected identifier or '('
static inline void _x_freep(void *ptr) {
              ^

--- include/xine/xineutils.h.orig
+++ include/xine/xineutils.h
@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t 
  * Free allocated memory and set pointer to NULL
  * @param ptr Pointer to the pointer to the memory block which should be freed.
  */
-static inline void _x_freep(void *ptr) {
+static void _x_freep(void *ptr) {
   void **p = (void **)ptr;
   free (*p);
   *p = NULL;

Lines 49-55 lib/libxine.la Link Here

(-)b/multimedia/libxine/pkg-plist (-1 / +1 lines)
49	lib/libxine-interface.la	49	lib/libxine-interface.la
50	lib/libxine.so	50	lib/libxine.so
51	lib/libxine.so.2	51	lib/libxine.so.2
52	lib/libxine.so.2.10.0	52	lib/libxine.so.2.11.0
53	%%PLUGINSDIR%%/mime.types	53	%%PLUGINSDIR%%/mime.types
54	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so	54	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
55	%%PLUGINSDIR%%/post/xineplug_post_goom.so	55	%%PLUGINSDIR%%/post/xineplug_post_goom.so

Return to bug 270291

Lines 1-10 Link Here

(-)b/multimedia/libxine/Makefile (-6 / +6 lines)
1	PORTNAME= xine	1	PORTNAME= xine
2	DISTVERSION= 1.2.12	2	DISTVERSION= 1.2.13
3	PORTREVISION= 5
4	CATEGORIES= multimedia	3	CATEGORIES= multimedia
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}	4	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${DISTVERSION}
6	PKGNAMEPREFIX= lib	5	PKGNAMEPREFIX= lib
7	DISTNAME= ${PORTNAME}-lib-${PORTVERSION}	6	DISTNAME= ${PORTNAME}-lib-${DISTVERSION}
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Libraries for xine multimedia player	9	COMMENT= Libraries for xine multimedia player
Lines 50-56 USE_LDCONFIG= yes Link Here
50	CONFIGURE_ARGS= --with-libflac \	49	CONFIGURE_ARGS= --with-libflac \
51	--enable-musepack \	50	--enable-musepack \
52	--enable-real-codecs \	51	--enable-real-codecs \
53	--without-esound	52	--without-esound \
		53	--disable-crypto
54		54
55	MAKE_ENV= V=1	55	MAKE_ENV= V=1
56	MAKE_ARGS= pkgdatadir="${DATADIR}" \	56	MAKE_ARGS= pkgdatadir="${DATADIR}" \
Lines 62-68 CFLAGS_i386= -fomit-frame-pointer Link Here
62	DOCSDIR= ${PREFIX}/share/doc/xine-lib	62	DOCSDIR= ${PREFIX}/share/doc/xine-lib
63	# Please sync with XINE_PLUGINSDIR in multimedia/xine	63	# Please sync with XINE_PLUGINSDIR in multimedia/xine
64	# and multimedia/vdr-plugin-xineliboutput	64	# and multimedia/vdr-plugin-xineliboutput
65	PLUGINSDIR= lib/xine/plugins/2.10	65	PLUGINSDIR= lib/xine/plugins/2.11
66	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"	66	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"
67		67
68	OPTIONS_DEFINE= AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB \	68	OPTIONS_DEFINE= AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB \

Removed Link Here

(-)a/multimedia/libxine/files/patch-dav1d-1.0 (-47 lines)
1	https://sourceforge.net/p/xine/tickets/11/
2
3	dav1d.c:547:12: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
4	settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
5	~~~~~~~~ ^
6	dav1d.c:548:12: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
7	settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
8	~~~~~~~~ ^
9	dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
10	settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
11	~~~~~~~~ ^
12	dav1d.c:548:52: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
13	settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
14	~~~~~~~~ ^
15	/usr/include/sys/param.h:306:34: note: expanded from macro 'MAX'
16	#define MAX(a,b) (((a)>(b))?(a):(b))
17	^
18	dav1d.c:551:22: error: no member named 'n_frame_threads' in 'struct Dav1dSettings'
19	settings.n_frame_threads, settings.n_tile_threads);
20	~~~~~~~~ ^
21	dav1d.c:551:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings'
22	settings.n_frame_threads, settings.n_tile_threads);
23	~~~~~~~~ ^
24	../../include/xine/xineutils.h:687:40: note: expanded from macro 'xprintf'
25	xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__); \
26	^~~~~~~~~~~
27
28	--- src/video_dec/dav1d.c.orig 2022-03-06 16:31:24 UTC
29	+++ src/video_dec/dav1d.c
30	@@ -544,11 +544,17 @@ static video_decoder_t *_open_plugin(video_decoder_cla
31
32	/* multithreading */
33	ncpu = xine_cpu_count();
34	+#if DAV1D_API_VERSION_MAJOR > 5
35	+ settings.n_threads = ncpu + 1;
36	+ xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
37	+ "Using %d threads\n", settings.n_threads);
38	+#else
39	settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
40	settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
41	xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
42	"Using %d frame threads, %d tile threads\n",
43	settings.n_frame_threads, settings.n_tile_threads);
44	+#endif
45
46	/* dri frame allocator */
47	settings.allocator.cookie = this;

Removed Link Here

(-)a/multimedia/libxine/files/patch-include-xine-xineutils.h (-22 lines)
1	Unbreak build of phonon-xine
2
3	In file included from xine/plugins.c:23:
4	In file included from /usr/local/include/xine/input_plugin.h:27:
5	/usr/local/include/xine/xineutils.h:197:8: error: unknown type name 'inline'
6	static inline void _x_freep(void *ptr) {
7	^
8	/usr/local/include/xine/xineutils.h:197:15: error: expected identifier or '('
9	static inline void _x_freep(void *ptr) {
10	^
11
12	--- include/xine/xineutils.h.orig
13	+++ include/xine/xineutils.h
14	@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t
15	* Free allocated memory and set pointer to NULL
16	* @param ptr Pointer to the pointer to the memory block which should be freed.
17	*/
18	-static inline void _x_freep(void *ptr) {
19	+static void _x_freep(void *ptr) {
20	void p = (void )ptr;
21	free (*p);
22	*p = NULL;