Attachment #221197 for bug #252338




# $FreeBSD: head/multimedia/libxine/Makefile 555210 2020-11-15 13:16:54Z mikael $

PORTNAME=	xine
DISTVERSION=	1.2.11
PORTREVISION=	13
CATEGORIES=	multimedia
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX=	lib

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
LIB_DEPENDS=	libFLAC.so:audio/flac \
		liba52.so:audio/liba52 \
		libvorbis.so:audio/libvorbis \

		libdvdnav.so:multimedia/libdvdnav

USES=		compiler cpe gl gmake gnome iconv libtool:keepla jpeg \
		localbase pathfix perl5 pkgconfig tar:xz xorg
LLD_UNSAFE=	yes
CPE_PRODUCT=	xine-lib
CPE_VENDOR=	xine

USE_XORG=	x11 xcb xv xinerama xext sm ice
USE_GL=		gl glu
USE_PERL5=	build
USE_SDL=	sdl
USE_LDCONFIG=	yes
CONFIGURE_ARGS=	--with-libflac \
		--without-esound
		--disable-v4l \
		--without-alsa \
		--without-esound \
		--disable-musepack

MAKE_ENV=	V=1
MAKE_ARGS=	pkgdatadir="${DATADIR}" \
		datadir="${DATADIR}" \
		libdir="${PREFIX}/lib"

CFLAGS_i386=	-fomit-frame-pointer

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

OPTIONS_DEFINE=		AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB GNOMEVFS2 \
			GNUTLS IPV6 JACK LIBBLURAY MUSEPACK NFS NLS PIXBUF PULSEAUDIO \
			REAL SDL SFTP SMB SNDIO VAAPI WAVPACK WAYLAND XVMC
OPTIONS_DEFAULT=	DVB PIXBUF VAAPI
OPTIONS_DEFINE_i386=	W32DLL
OPTIONS_DEFAULT_i386=	W32DLL
OPTIONS_GROUP=		V4L
OPTIONS_GROUP_V4L=	LIBV4L V4L1 V4L2
OPTIONS_RADIO=		IMAGEMAGICK
OPTIONS_RADIO_IMAGEMAGICK=IMAGEMAGICK6 IMAGEMAGICK7
OPTIONS_SUB=		yes

AOM_DESC=		Enable libaom AV1 decoder support
DAV1D_DESC=		Enable dav1d AV1 decoder support
DMX_IMAGE_DESC=		DMX image plugin
DVB_DESC=		DVB plugin
GNUTLS_DESC=		Enable TLS support for https and ftps using gnutls
IMAGEMAGICK6_DESC=	${IMAGEMAGICK_DESC} version 6.x
IMAGEMAGICK7_DESC=	${IMAGEMAGICK_DESC} version 7.x
LIBV4L_DESC=		Use libv4l for Video 4 Linux 2
MUSEPACK_DESC=		Enable support for Musepack decoding (internal)
NFS_DESC=		Enable NFS support using libnfs
REAL_DESC=		Enable Real binary codecs support
SDL_DESC=		Enable support for SDL 1 video output
SFTP_DESC=		Enable SFTP support using libssh2
V4L_DESC=		Video 4 Linux support
V4L1_DESC=		Video 4 Linux 1 support
V4L2_DESC=		Video 4 Linux 2 support
W32DLL_DESC=		Win32 codec support
WAYLAND_DESC=		Enable Wayland support

AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
AALIB_CONFIGURE_ENABLE=		aalib
ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
ALSA_CONFIGURE_WITH=		alsa
AOM_LIB_DEPENDS=		libaom.so:multimedia/aom
AOM_CONFIGURE_WITH=		libaom
CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
CACA_CONFIGURE_WITH=		caca
DAV1D_LIB_DEPENDS=		libdav1d.so:multimedia/dav1d
DAV1D_CONFIGURE_WITH=		dav1d
DVB_CONFIGURE_ENABLE=		dvb
GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE=	tls
IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick
IMAGEMAGICK_IMPLIES=		DMX_IMAGE
IMAGEMAGICK6_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
IMAGEMAGICK6_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
IMAGEMAGICK6_IMPLIES=		${IMAGEMAGICK_IMPLIES}
IMAGEMAGICK7_LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
IMAGEMAGICK7_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
IMAGEMAGICK7_IMPLIES=		${IMAGEMAGICK_IMPLIES}
IPV6_CONFIGURE_ENABLE=		ipv6
JACK_LIB_DEPENDS=		libjack.so:audio/jack
JACK_CONFIGURE_WITH=		jack
LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE=	bluray
LIBV4L_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
LIBV4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
LIBV4L_CONFIGURE_ENABLE=	libv4l
MUSEPACK_CONFIGURE_ENABLE=	musepack
NLS_USES=			gettext
NLS_CONFIGURE_ENABLE=		nls
NFS_LIB_DEPENDS=		libnfs.so:net/libnfs
NFS_CONFIGURE_ENABLE=		nfs
PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
PIXBUF_IMPLIES=			DMX_IMAGE
PIXBUF_USE=			GNOME=gdkpixbuf2,glib20
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
REAL_CONFIGURE_ENABLE=		real-codecs
SDL_CONFIGURE_WITH=		sdl
SDL_USE=			SDL=sdl
SFTP_LIB_DEPENDS=		libssh2.so:security/libssh2
SFTP_CONFIGURE_ENABLE=		sftp
SMB_USES=			samba:lib
SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
SMB_CONFIGURE_ENABLE=		samba
SNDIO_CONFIGURE_ENABLE=		sndio
SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE=		sndio
VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva \
				libva-glx.so:multimedia/libva-glx
VAAPI_CONFIGURE_ENABLE=		vaapi
V4L1_BUILD_DEPENDS=		${LIBV4L_BUILD_DEPENDS}
V4L1_CONFIGURE_ENABLE=		v4l
V4L2_BUILD_DEPENDS=		${LIBV4L_BUILD_DEPENDS}
V4L2_CONFIGURE_ENABLE=		v4l2
W32DLL_CONFIGURE_ENABLE=	w32dll
W32DLL_PLIST_FILES=		${PLUGINSDIR}/xineplug_decode_qt.so \
				${PLUGINSDIR}/xineplug_decode_w32dll.so
WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
WAVPACK_CONFIGURE_WITH=		wavpack
WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland \
				libwayland-client.so:graphics/wayland
WAYLAND_CONFIGURE_ENABLE=	wayland

.if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
XVMC_CONFIGURE_WITH=		xvmc-lib=XvMCNVIDIA

BUILD_DEPENDS+=	as:devel/binutils
.endif

.if ${PORT_OPTIONS:MIMAGEMAGICK6} || ${PORT_OPTIONS:MIMAGEMAGICK7}
PLIST_SUB+=		IMAGEMAGICK=""
.else
CONFIGURE_ARGS+=	--without-imagemagick
PLIST_SUB+=		IMAGEMAGICK="@comment "
.endif

post-patch:
.if ${COMPILER_TYPE} == "clang"
	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
		${WRKSRC}/src/libw32dll/Makefile.in
.endif

		${WRKSRC}/src/video_out/Makefile.in
	@${REINPLACE_CMD} -e "s|#define _ATOM QT_ATOM('', '', '', '')||" \
		${WRKSRC}/src/demuxers/demux_qt.c \
		${WRKSRC}/configure
post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so

Lines 1-3 Link Here

(-)multimedia/libxine/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535162154	1	TIMESTAMP = 1609529764
2	SHA256 (xine-lib-1.2.9.tar.xz) = 32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d	2	SHA256 (xine-lib-1.2.11.tar.xz) = ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005
3	SIZE (xine-lib-1.2.9.tar.xz) = 5180452	3	SIZE (xine-lib-1.2.11.tar.xz) = 5282204




$OpenBSD: patch-include_config_h,v 1.1 2018/02/16 14:27:53 sthen Exp $

Index: include/config.h
--- include/config.h.orig
+++ include/config.h
@@ -24,9 +24,11 @@
 /* Ugly build time sanity guard.
  * ./configure might mistake X32 mode as plain 64bit,
  * but compiler itself sets __ILP32__ when in x32.
+ * Even worse: clang sets this in 32 mode as well,
+ * so also test __i386__ here.
  */
 #ifdef ARCH_X86
-#  if defined(__ILP32__) && !defined(ARCH_X86_X32)
+#  if defined(__ILP32__) && !defined(__i386) && !defined(__i386__) && !defined(ARCH_X86_X32)
 #    ifdef ARCH_WARN
 #        warning "configure did not detect ARCH_X86_X32!"
 #    endif




--- src/input/input_v4l.c.orig
+++ src/input/input_v4l.c
@@ -1394,10 +1394,6 @@
 	/* On buffer overrun we need to re prepare the capturing pcm device */
 	snd_pcm_prepare(this->pcm_handle);
 	break;
-      case -ESTRPIPE:   /* Suspend event */
-	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-                "input_v4l: PCM suspend event occured\n");
-	break;
       default:	      /* Unknown */
 	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
                 "input_v4l: Unknown PCM error code: %d\n", pcmreturn);




include/xine/sorted_array.h
include/xine/spu.h
include/xine/spu_decoder.h
include/xine/tickets.h
include/xine/vdr.h
include/xine/version.h
include/xine/video_decoder.h

include/xine/vo_scale.h
include/xine/xine_buffer.h
include/xine/xine_internal.h
include/xine/xine_module.h
include/xine/xine_plugin.h
include/xine/xineintl.h
include/xine/xineutils.h

lib/libxine-interface.la
lib/libxine.so
lib/libxine.so.2
lib/libxine.so.2.9.0
%%PLUGINSDIR%%/mime.types
%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
%%PLUGINSDIR%%/post/xineplug_post_goom.so

%%PLUGINSDIR%%/post/xineplug_post_switch.so
%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
%%ALSA%%%%PLUGINSDIR%%/xineplug_ao_out_alsa.so
%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
%%PLUGINSDIR%%/xineplug_ao_out_oss.so
%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so
%%PLUGINSDIR%%/xineplug_decode_a52.so
%%DAV1D%%%%PLUGINSDIR%%/xineplug_decode_dav1d.so
%%PLUGINSDIR%%/xineplug_decode_dts.so
%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
%%PLUGINSDIR%%/xineplug_decode_faad.so

%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
%%PLUGINSDIR%%/xineplug_decode_gsm610.so
%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
%%AOM%%%%PLUGINSDIR%%/xineplug_decode_libaom.so
%%PLUGINSDIR%%/xineplug_decode_libjpeg.so
%%PLUGINSDIR%%/xineplug_decode_libpng.so
%%PLUGINSDIR%%/xineplug_decode_libvpx.so
%%PLUGINSDIR%%/xineplug_decode_lpcm.so
%%PLUGINSDIR%%/xineplug_decode_mad.so
%%MUSEPACK%%%%PLUGINSDIR%%/xineplug_decode_mpc.so
%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
%%PLUGINSDIR%%/xineplug_decode_rawvideo.so
%%REAL%%%%PLUGINSDIR%%/xineplug_decode_real.so
%%PLUGINSDIR%%/xineplug_decode_spu.so
%%PLUGINSDIR%%/xineplug_decode_spucc.so
%%PLUGINSDIR%%/xineplug_decode_spucmml.so
%%PLUGINSDIR%%/xineplug_decode_spudvb.so
%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
%%PLUGINSDIR%%/xineplug_decode_to_spdif.so
%%PLUGINSDIR%%/xineplug_decode_vdpau.so
%%PLUGINSDIR%%/xineplug_dmx_asf.so
%%PLUGINSDIR%%/xineplug_dmx_audio.so

%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
%%PLUGINSDIR%%/xineplug_inp_mms.so
%%PLUGINSDIR%%/xineplug_inp_network.so
%%NFS%%%%PLUGINSDIR%%/xineplug_inp_nfs.so
%%V4L2%%%%PLUGINSDIR%%/xineplug_inp_pvr.so
%%PLUGINSDIR%%/xineplug_inp_rtp.so
%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
%%SFTP%%%%PLUGINSDIR%%/xineplug_inp_ssh.so
%%V4L1%%%%PLUGINSDIR%%/xineplug_inp_v4l.so
%%V4L2%%%%PLUGINSDIR%%/xineplug_inp_v4l2.so
%%PLUGINSDIR%%/xineplug_inp_vcd.so
%%PLUGINSDIR%%/xineplug_inp_vcdo.so
%%PLUGINSDIR%%/xineplug_nsf.so
%%PLUGINSDIR%%/xineplug_sputext.so
%%GNUTLS%%%%PLUGINSDIR%%/xineplug_tls_gnutls.so
%%PLUGINSDIR%%/xineplug_vdr.so
%%WAYLAND%%%%PLUGINSDIR%%/xineplug_vo_gl_egl_wl.so
%%PLUGINSDIR%%/xineplug_vo_gl_egl_x11.so
%%PLUGINSDIR%%/xineplug_vo_gl_glx.so
%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so
%%PLUGINSDIR%%/xineplug_vo_out_raw.so
%%SDL%%%%PLUGINSDIR%%/xineplug_vo_out_sdl.so
%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
%%PLUGINSDIR%%/xineplug_vo_out_vdpau.so
%%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so

Return to bug 252338

Lines 2-9 Link Here

(-)multimedia/libxine/Makefile (-24 / +70 lines)
2	# $FreeBSD: head/multimedia/libxine/Makefile 555210 2020-11-15 13:16:54Z mikael $	2	# $FreeBSD: head/multimedia/libxine/Makefile 555210 2020-11-15 13:16:54Z mikael $
3		3
4	PORTNAME= xine	4	PORTNAME= xine
5	PORTVERSION= 1.2.9	5	DISTVERSION= 1.2.11
6	PORTREVISION= 13
7	CATEGORIES= multimedia	6	CATEGORIES= multimedia
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
9	PKGNAMEPREFIX= lib	8	PKGNAMEPREFIX= lib
Lines 15-21 Link Here
15	LICENSE= GPLv2+	14	LICENSE= GPLv2+
16	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
17		16
18	BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat
19	LIB_DEPENDS= libFLAC.so:audio/flac \	17	LIB_DEPENDS= libFLAC.so:audio/flac \
20	liba52.so:audio/liba52 \	18	liba52.so:audio/liba52 \
21	libvorbis.so:audio/libvorbis \	19	libvorbis.so:audio/libvorbis \
Lines 40-46 Link Here
40	libdvdnav.so:multimedia/libdvdnav	38	libdvdnav.so:multimedia/libdvdnav
41		39
42	USES= compiler cpe gl gmake gnome iconv libtool:keepla jpeg \	40	USES= compiler cpe gl gmake gnome iconv libtool:keepla jpeg \
43	localbase pathfix perl5 pkgconfig sdl tar:xz xorg	41	localbase pathfix perl5 pkgconfig tar:xz xorg
44	LLD_UNSAFE= yes	42	LLD_UNSAFE= yes
45	CPE_PRODUCT= xine-lib	43	CPE_PRODUCT= xine-lib
46	CPE_VENDOR= xine	44	CPE_VENDOR= xine
Lines 48-123 Link Here
48	USE_XORG= x11 xcb xv xinerama xext sm ice	46	USE_XORG= x11 xcb xv xinerama xext sm ice
49	USE_GL= gl glu	47	USE_GL= gl glu
50	USE_PERL5= build	48	USE_PERL5= build
51	USE_SDL= sdl
52	USE_LDCONFIG= yes	49	USE_LDCONFIG= yes
53	CONFIGURE_ARGS= --with-libflac \	50	CONFIGURE_ARGS= --with-libflac \
54	--disable-real-codecs \	51	--without-esound
55	--disable-v4l \
56	--without-alsa \
57	--without-esound \
58	--disable-musepack
59		52
60	MAKE_ENV= V=1	53	MAKE_ENV= V=1
61	MAKE_ARGS= pkgdatadir="${DATADIR}" \	54	MAKE_ARGS= pkgdatadir="${DATADIR}" \
62	datadir="${DATADIR}" \	55	datadir="${DATADIR}" \
63	libdir="${PREFIX}/lib"	56	libdir="${PREFIX}/lib"
64		57
65	CFLAGS_i386= -fomit-frame-pointer	58	CFLAGS_i386= -fomit-frame-pointer
66		59
67	DOCSDIR= ${PREFIX}/share/doc/xine-lib	60	DOCSDIR= ${PREFIX}/share/doc/xine-lib
68	# Please sync with XINE_PLUGINSDIR in multimedia/xine	61	# Please sync with XINE_PLUGINSDIR in multimedia/xine
69	# and multimedia/vdr-plugin-xineliboutput	62	# and multimedia/vdr-plugin-xineliboutput
70	PLUGINSDIR= lib/xine/plugins/2.7	63	PLUGINSDIR= lib/xine/plugins/2.9
71	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"	64	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"
72		65
73	OPTIONS_DEFINE= DOCS NLS CACA DVB DMX_IMAGE IPV6 IMAGEMAGICK JACK \	66	OPTIONS_DEFINE= AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB GNOMEVFS2 \
74	GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \	67	GNUTLS IPV6 JACK LIBBLURAY MUSEPACK NFS NLS PIXBUF PULSEAUDIO \
75	VAAPI LIBBLURAY	68	REAL SDL SFTP SMB SNDIO VAAPI WAVPACK WAYLAND XVMC
76	OPTIONS_DEFAULT= DVB PIXBUF VAAPI	69	OPTIONS_DEFAULT= DVB PIXBUF VAAPI
77	OPTIONS_DEFINE_i386= W32DLL	70	OPTIONS_DEFINE_i386= W32DLL
78	OPTIONS_DEFAULT_i386= W32DLL	71	OPTIONS_DEFAULT_i386= W32DLL
		72	OPTIONS_GROUP= V4L
		73	OPTIONS_GROUP_V4L= LIBV4L V4L1 V4L2
		74	OPTIONS_RADIO= IMAGEMAGICK
		75	OPTIONS_RADIO_IMAGEMAGICK=IMAGEMAGICK6 IMAGEMAGICK7
79	OPTIONS_SUB= yes	76	OPTIONS_SUB= yes
80		77
		78	AOM_DESC= Enable libaom AV1 decoder support
		79	DAV1D_DESC= Enable dav1d AV1 decoder support
81	DMX_IMAGE_DESC= DMX image plugin	80	DMX_IMAGE_DESC= DMX image plugin
82	DVB_DESC= DVB plugin	81	DVB_DESC= DVB plugin
		82	GNUTLS_DESC= Enable TLS support for https and ftps using gnutls
		83	IMAGEMAGICK6_DESC= ${IMAGEMAGICK_DESC} version 6.x
		84	IMAGEMAGICK7_DESC= ${IMAGEMAGICK_DESC} version 7.x
		85	LIBV4L_DESC= Use libv4l for Video 4 Linux 2
		86	MUSEPACK_DESC= Enable support for Musepack decoding (internal)
		87	NFS_DESC= Enable NFS support using libnfs
		88	REAL_DESC= Enable Real binary codecs support
		89	SDL_DESC= Enable support for SDL 1 video output
		90	SFTP_DESC= Enable SFTP support using libssh2
		91	V4L_DESC= Video 4 Linux support
		92	V4L1_DESC= Video 4 Linux 1 support
		93	V4L2_DESC= Video 4 Linux 2 support
83	W32DLL_DESC= Win32 codec support	94	W32DLL_DESC= Win32 codec support
		95	WAYLAND_DESC= Enable Wayland support
84		96
85	AALIB_LIB_DEPENDS= libaa.so:graphics/aalib	97	AALIB_LIB_DEPENDS= libaa.so:graphics/aalib
86	AALIB_CONFIGURE_ENABLE= aalib	98	AALIB_CONFIGURE_ENABLE= aalib
		99	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
		100	ALSA_CONFIGURE_WITH= alsa
		101	AOM_LIB_DEPENDS= libaom.so:multimedia/aom
		102	AOM_CONFIGURE_WITH= libaom
87	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca	103	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca
88	CACA_CONFIGURE_WITH= caca	104	CACA_CONFIGURE_WITH= caca
		105	DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
		106	DAV1D_CONFIGURE_WITH= dav1d
89	DVB_CONFIGURE_ENABLE= dvb	107	DVB_CONFIGURE_ENABLE= dvb
90	GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2	108	GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2
91	GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs	109	GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs
92	IMAGEMAGICK_CONFIGURE_WITH= imagemagick	110	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
93	IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6	111	GNUTLS_CONFIGURE_ENABLE= tls
		112	IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick
94	IMAGEMAGICK_IMPLIES= DMX_IMAGE	113	IMAGEMAGICK_IMPLIES= DMX_IMAGE
		114	IMAGEMAGICK6_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6
		115	IMAGEMAGICK6_CONFIGURE_ON= ${IMAGEMAGICK_CONFIGURE_ON}
		116	IMAGEMAGICK6_IMPLIES= ${IMAGEMAGICK_IMPLIES}
		117	IMAGEMAGICK7_LIB_DEPENDS= libMagickWand-7.so:graphics/ImageMagick7
		118	IMAGEMAGICK7_CONFIGURE_ON= ${IMAGEMAGICK_CONFIGURE_ON}
		119	IMAGEMAGICK7_IMPLIES= ${IMAGEMAGICK_IMPLIES}
95	IPV6_CONFIGURE_ENABLE= ipv6	120	IPV6_CONFIGURE_ENABLE= ipv6
96	JACK_LIB_DEPENDS= libjack.so:audio/jack	121	JACK_LIB_DEPENDS= libjack.so:audio/jack
97	JACK_CONFIGURE_WITH= jack	122	JACK_CONFIGURE_WITH= jack
98	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray	123	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
99	LIBBLURAY_CONFIGURE_ENABLE= bluray	124	LIBBLURAY_CONFIGURE_ENABLE= bluray
		125	LIBV4L_BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat
		126	LIBV4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
		127	LIBV4L_CONFIGURE_ENABLE= libv4l
		128	MUSEPACK_CONFIGURE_ENABLE= musepack
100	NLS_USES= gettext	129	NLS_USES= gettext
101	NLS_CONFIGURE_ENABLE= nls	130	NLS_CONFIGURE_ENABLE= nls
		131	NFS_LIB_DEPENDS= libnfs.so:net/libnfs
		132	NFS_CONFIGURE_ENABLE= nfs
102	PIXBUF_CONFIGURE_ENABLE= gdkpixbuf	133	PIXBUF_CONFIGURE_ENABLE= gdkpixbuf
103	PIXBUF_IMPLIES= DMX_IMAGE	134	PIXBUF_IMPLIES= DMX_IMAGE
104	PIXBUF_USE= GNOME=gdkpixbuf2,glib20	135	PIXBUF_USE= GNOME=gdkpixbuf2,glib20
105	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	136	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
106	PULSEAUDIO_CONFIGURE_WITH= pulseaudio	137	PULSEAUDIO_CONFIGURE_WITH= pulseaudio
		138	REAL_CONFIGURE_ENABLE= real-codecs
		139	SDL_CONFIGURE_WITH= sdl
		140	SDL_USE= SDL=sdl
		141	SFTP_LIB_DEPENDS= libssh2.so:security/libssh2
		142	SFTP_CONFIGURE_ENABLE= sftp
107	SMB_USES= samba:lib	143	SMB_USES= samba:lib
108	SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \	144	SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
109	LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"	145	LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
110	SMB_CONFIGURE_ENABLE= samba	146	SMB_CONFIGURE_ENABLE= samba
111	SNDIO_CONFIGURE_ENABLE= sndio
112	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio	147	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
		148	SNDIO_CONFIGURE_ENABLE= sndio
113	VAAPI_LIB_DEPENDS= libva.so:multimedia/libva \	149	VAAPI_LIB_DEPENDS= libva.so:multimedia/libva \
114	libva-glx.so:multimedia/libva-glx	150	libva-glx.so:multimedia/libva-glx
115	VAAPI_CONFIGURE_ENABLE= vaapi	151	VAAPI_CONFIGURE_ENABLE= vaapi
		152	V4L1_BUILD_DEPENDS= ${LIBV4L_BUILD_DEPENDS}
		153	V4L1_CONFIGURE_ENABLE= v4l
		154	V4L2_BUILD_DEPENDS= ${LIBV4L_BUILD_DEPENDS}
		155	V4L2_CONFIGURE_ENABLE= v4l2
116	W32DLL_CONFIGURE_ENABLE= w32dll	156	W32DLL_CONFIGURE_ENABLE= w32dll
117	W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_qt.so \	157	W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_qt.so \
118	${PLUGINSDIR}/xineplug_decode_w32dll.so	158	${PLUGINSDIR}/xineplug_decode_w32dll.so
119	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack	159	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
120	WAVPACK_CONFIGURE_WITH= wavpack	160	WAVPACK_CONFIGURE_WITH= wavpack
		161	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \
		162	libwayland-client.so:graphics/wayland
		163	WAYLAND_CONFIGURE_ENABLE= wayland
121		164
122	.if defined(WITH_NVIDIA304_GL) \|\| exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)	165	.if defined(WITH_NVIDIA304_GL) \|\| exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
123	XVMC_CONFIGURE_WITH= xvmc-lib=XvMCNVIDIA	166	XVMC_CONFIGURE_WITH= xvmc-lib=XvMCNVIDIA
Lines 134-149 Link Here
134	BUILD_DEPENDS+= as:devel/binutils	177	BUILD_DEPENDS+= as:devel/binutils
135	.endif	178	.endif
136		179
		180	.if ${PORT_OPTIONS:MIMAGEMAGICK6} \|\| ${PORT_OPTIONS:MIMAGEMAGICK7}
		181	PLIST_SUB+= IMAGEMAGICK=""
		182	.else
		183	CONFIGURE_ARGS+= --without-imagemagick
		184	PLIST_SUB+= IMAGEMAGICK="@comment "
		185	.endif
		186
137	post-patch:	187	post-patch:
138	.if ${COMPILER_TYPE} == "clang"	188	.if ${COMPILER_TYPE} == "clang"
139	@${REINPLACE_CMD} -e 's\|-fno-rename-registers\|\|' \	189	@${REINPLACE_CMD} -e 's\|-fno-rename-registers\|\|' \
140	${WRKSRC}/src/libw32dll/wine/Makefile.in	190	${WRKSRC}/src/libw32dll/Makefile.in
141	.endif	191	.endif
142	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \	192
143	${WRKSRC}/src/video_out/Makefile.in
144	@${REINPLACE_CMD} -e "s\|#define _ATOM QT_ATOM('', '', '', '')\|\|" \
145	${WRKSRC}/src/demuxers/demux_qt.c \
146	${WRKSRC}/configure
147	post-install:	193	post-install:
148	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so	194	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
149	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so	195	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so

Lines 1-18 Link Here

(-)multimedia/libxine/files/patch-include_config.h (-18 lines)
1	$OpenBSD: patch-include_config_h,v 1.1 2018/02/16 14:27:53 sthen Exp $
2
3	Index: include/config.h
4	--- include/config.h.orig
5	+++ include/config.h
6	@@ -24,9 +24,11 @@
7	/* Ugly build time sanity guard.
8	* ./configure might mistake X32 mode as plain 64bit,
9	* but compiler itself sets __ILP32__ when in x32.
10	+ * Even worse: clang sets this in 32 mode as well,
11	+ * so also test __i386__ here.
12	*/
13	#ifdef ARCH_X86
14	-# if defined(__ILP32__) && !defined(ARCH_X86_X32)
15	+# if defined(__ILP32__) && !defined(__i386) && !defined(__i386__) && !defined(ARCH_X86_X32)
16	# ifdef ARCH_WARN
17	# warning "configure did not detect ARCH_X86_X32!"
18	# endif

Line 0 Link Here

(-)multimedia/libxine/files/patch-src_input_input__v4l.c (+13 lines)
	1	--- src/input/input_v4l.c.orig
	2	+++ src/input/input_v4l.c
	3	@@ -1394,10 +1394,6 @@
	4	/* On buffer overrun we need to re prepare the capturing pcm device */
	5	snd_pcm_prepare(this->pcm_handle);
	6	break;
	7	- case -ESTRPIPE: /* Suspend event */
	8	- xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
	9	- "input_v4l: PCM suspend event occured\n");
	10	- break;
	11	default: /* Unknown */
	12	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
	13	"input_v4l: Unknown PCM error code: %d\n", pcmreturn);

Lines 28-33 Link Here

(-)multimedia/libxine/pkg-plist (-2 / +20 lines)
28	include/xine/sorted_array.h	28	include/xine/sorted_array.h
29	include/xine/spu.h	29	include/xine/spu.h
30	include/xine/spu_decoder.h	30	include/xine/spu_decoder.h
		31	include/xine/tickets.h
31	include/xine/vdr.h	32	include/xine/vdr.h
32	include/xine/version.h	33	include/xine/version.h
33	include/xine/video_decoder.h	34	include/xine/video_decoder.h
Lines 36-41 Link Here
36	include/xine/vo_scale.h	37	include/xine/vo_scale.h
37	include/xine/xine_buffer.h	38	include/xine/xine_buffer.h
38	include/xine/xine_internal.h	39	include/xine/xine_internal.h
		40	include/xine/xine_module.h
39	include/xine/xine_plugin.h	41	include/xine/xine_plugin.h
40	include/xine/xineintl.h	42	include/xine/xineintl.h
41	include/xine/xineutils.h	43	include/xine/xineutils.h
Lines 45-51 Link Here
45	lib/libxine-interface.la	47	lib/libxine-interface.la
46	lib/libxine.so	48	lib/libxine.so
47	lib/libxine.so.2	49	lib/libxine.so.2
48	lib/libxine.so.2.7.0	50	lib/libxine.so.2.9.0
49	%%PLUGINSDIR%%/mime.types	51	%%PLUGINSDIR%%/mime.types
50	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so	52	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
51	%%PLUGINSDIR%%/post/xineplug_post_goom.so	53	%%PLUGINSDIR%%/post/xineplug_post_goom.so
Lines 54-64 Link Here
54	%%PLUGINSDIR%%/post/xineplug_post_switch.so	56	%%PLUGINSDIR%%/post/xineplug_post_switch.so
55	%%PLUGINSDIR%%/post/xineplug_post_tvtime.so	57	%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
56	%%PLUGINSDIR%%/post/xineplug_post_visualizations.so	58	%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
		59	%%ALSA%%%%PLUGINSDIR%%/xineplug_ao_out_alsa.so
57	%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so	60	%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
58	%%PLUGINSDIR%%/xineplug_ao_out_oss.so	61	%%PLUGINSDIR%%/xineplug_ao_out_oss.so
59	%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so	62	%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
60	%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so	63	%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so
61	%%PLUGINSDIR%%/xineplug_decode_a52.so	64	%%PLUGINSDIR%%/xineplug_decode_a52.so
		65	%%DAV1D%%%%PLUGINSDIR%%/xineplug_decode_dav1d.so
62	%%PLUGINSDIR%%/xineplug_decode_dts.so	66	%%PLUGINSDIR%%/xineplug_decode_dts.so
63	%%PLUGINSDIR%%/xineplug_decode_dvaudio.so	67	%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
64	%%PLUGINSDIR%%/xineplug_decode_faad.so	68	%%PLUGINSDIR%%/xineplug_decode_faad.so
Lines 66-82 Link Here
66	%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so	70	%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
67	%%PLUGINSDIR%%/xineplug_decode_gsm610.so	71	%%PLUGINSDIR%%/xineplug_decode_gsm610.so
68	%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so	72	%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
		73	%%AOM%%%%PLUGINSDIR%%/xineplug_decode_libaom.so
69	%%PLUGINSDIR%%/xineplug_decode_libjpeg.so	74	%%PLUGINSDIR%%/xineplug_decode_libjpeg.so
		75	%%PLUGINSDIR%%/xineplug_decode_libpng.so
70	%%PLUGINSDIR%%/xineplug_decode_libvpx.so	76	%%PLUGINSDIR%%/xineplug_decode_libvpx.so
71	%%PLUGINSDIR%%/xineplug_decode_lpcm.so	77	%%PLUGINSDIR%%/xineplug_decode_lpcm.so
72	%%PLUGINSDIR%%/xineplug_decode_mad.so	78	%%PLUGINSDIR%%/xineplug_decode_mad.so
		79	%%MUSEPACK%%%%PLUGINSDIR%%/xineplug_decode_mpc.so
73	%%PLUGINSDIR%%/xineplug_decode_mpeg2.so	80	%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
74	%%PLUGINSDIR%%/xineplug_decode_rawvideo.so	81	%%PLUGINSDIR%%/xineplug_decode_rawvideo.so
		82	%%REAL%%%%PLUGINSDIR%%/xineplug_decode_real.so
75	%%PLUGINSDIR%%/xineplug_decode_spu.so	83	%%PLUGINSDIR%%/xineplug_decode_spu.so
76	%%PLUGINSDIR%%/xineplug_decode_spucc.so	84	%%PLUGINSDIR%%/xineplug_decode_spucc.so
77	%%PLUGINSDIR%%/xineplug_decode_spucmml.so	85	%%PLUGINSDIR%%/xineplug_decode_spucmml.so
78	%%PLUGINSDIR%%/xineplug_decode_spudvb.so	86	%%PLUGINSDIR%%/xineplug_decode_spudvb.so
79	%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so	87	%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
		88	%%PLUGINSDIR%%/xineplug_decode_to_spdif.so
80	%%PLUGINSDIR%%/xineplug_decode_vdpau.so	89	%%PLUGINSDIR%%/xineplug_decode_vdpau.so
81	%%PLUGINSDIR%%/xineplug_dmx_asf.so	90	%%PLUGINSDIR%%/xineplug_dmx_asf.so
82	%%PLUGINSDIR%%/xineplug_dmx_audio.so	91	%%PLUGINSDIR%%/xineplug_dmx_audio.so
Lines 98-116 Link Here
98	%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so	107	%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
99	%%PLUGINSDIR%%/xineplug_inp_mms.so	108	%%PLUGINSDIR%%/xineplug_inp_mms.so
100	%%PLUGINSDIR%%/xineplug_inp_network.so	109	%%PLUGINSDIR%%/xineplug_inp_network.so
		110	%%NFS%%%%PLUGINSDIR%%/xineplug_inp_nfs.so
		111	%%V4L2%%%%PLUGINSDIR%%/xineplug_inp_pvr.so
101	%%PLUGINSDIR%%/xineplug_inp_rtp.so	112	%%PLUGINSDIR%%/xineplug_inp_rtp.so
102	%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so	113	%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
		114	%%SFTP%%%%PLUGINSDIR%%/xineplug_inp_ssh.so
		115	%%V4L1%%%%PLUGINSDIR%%/xineplug_inp_v4l.so
		116	%%V4L2%%%%PLUGINSDIR%%/xineplug_inp_v4l2.so
103	%%PLUGINSDIR%%/xineplug_inp_vcd.so	117	%%PLUGINSDIR%%/xineplug_inp_vcd.so
104	%%PLUGINSDIR%%/xineplug_inp_vcdo.so	118	%%PLUGINSDIR%%/xineplug_inp_vcdo.so
105	%%PLUGINSDIR%%/xineplug_nsf.so	119	%%PLUGINSDIR%%/xineplug_nsf.so
106	%%PLUGINSDIR%%/xineplug_sputext.so	120	%%PLUGINSDIR%%/xineplug_sputext.so
		121	%%GNUTLS%%%%PLUGINSDIR%%/xineplug_tls_gnutls.so
107	%%PLUGINSDIR%%/xineplug_vdr.so	122	%%PLUGINSDIR%%/xineplug_vdr.so
		123	%%WAYLAND%%%%PLUGINSDIR%%/xineplug_vo_gl_egl_wl.so
		124	%%PLUGINSDIR%%/xineplug_vo_gl_egl_x11.so
		125	%%PLUGINSDIR%%/xineplug_vo_gl_glx.so
108	%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so	126	%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
109	%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so	127	%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
110	%%PLUGINSDIR%%/xineplug_vo_out_opengl.so	128	%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
111	%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so	129	%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so
112	%%PLUGINSDIR%%/xineplug_vo_out_raw.so	130	%%PLUGINSDIR%%/xineplug_vo_out_raw.so
113	%%PLUGINSDIR%%/xineplug_vo_out_sdl.so	131	%%SDL%%%%PLUGINSDIR%%/xineplug_vo_out_sdl.so
114	%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so	132	%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
115	%%PLUGINSDIR%%/xineplug_vo_out_vdpau.so	133	%%PLUGINSDIR%%/xineplug_vo_out_vdpau.so
116	%%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so	134	%%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so