View | Details | Raw Unified | Return to bug 252338 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/libxine/Makefile (-15 / +42 lines)
Lines 2-9 Link Here
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
PORTVERSION=	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 67-97 Link Here
67
DOCSDIR=	${PREFIX}/share/doc/xine-lib
66
DOCSDIR=	${PREFIX}/share/doc/xine-lib
68
# Please sync with XINE_PLUGINSDIR in multimedia/xine
67
# Please sync with XINE_PLUGINSDIR in multimedia/xine
69
# and multimedia/vdr-plugin-xineliboutput
68
# and multimedia/vdr-plugin-xineliboutput
70
PLUGINSDIR=	lib/xine/plugins/2.7
69
PLUGINSDIR=	lib/xine/plugins/2.9
71
PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
70
PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
72
71
73
OPTIONS_DEFINE=		DOCS NLS CACA DVB DMX_IMAGE IPV6 IMAGEMAGICK JACK \
72
OPTIONS_DEFINE=		AALIB AOM CACA DAV1D DOCS DMX_IMAGE DVB GNOMEVFS2 IPV6 \
74
			GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \
73
			JACK LIBBLURAY NFS NLS \
75
			VAAPI LIBBLURAY
74
			PIXBUF PULSEAUDIO SFTP SMB SNDIO TLS VAAPI WAVPACK \
75
			XVMC
76
OPTIONS_DEFAULT=	DVB PIXBUF VAAPI
76
OPTIONS_DEFAULT=	DVB PIXBUF VAAPI
77
OPTIONS_DEFINE_i386=	W32DLL
77
OPTIONS_DEFINE_i386=	W32DLL
78
OPTIONS_DEFAULT_i386=	W32DLL
78
OPTIONS_DEFAULT_i386=	W32DLL
79
OPTIONS_RADIO=		IMAGEMAGICK
80
OPTIONS_RADIO_IMAGEMAGICK=IMAGEMAGICK6 IMAGEMAGICK7
79
OPTIONS_SUB=		yes
81
OPTIONS_SUB=		yes
80
82
83
AOM_DESC=		Enable libaom AV1 decoder support
84
DAV1D_DESC=		Enable dav1d AV1 decoder support
81
DMX_IMAGE_DESC=		DMX image plugin
85
DMX_IMAGE_DESC=		DMX image plugin
82
DVB_DESC=		DVB plugin
86
DVB_DESC=		DVB plugin
87
IMAGEMAGICK6_DESC=	${IMAGEMAGICK_DESC} version 6.x
88
IMAGEMAGICK7_DESC=	${IMAGEMAGICK_DESC} version 7.x
89
NFS_DESC=		Enable NFS support using libnfs
90
SFTP_DESC=		Enable SFTP support using libssh2
91
TLS_DESC=		Enable TLS support for https and ftps using gnutls
83
W32DLL_DESC=		Win32 codec support
92
W32DLL_DESC=		Win32 codec support
84
93
85
AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
94
AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
86
AALIB_CONFIGURE_ENABLE=		aalib
95
AALIB_CONFIGURE_ENABLE=		aalib
96
AOM_LIB_DEPENDS=		libaom.so:multimedia/aom
97
AOM_CONFIGURE_WITH=		libaom
87
CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
98
CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
88
CACA_CONFIGURE_WITH=		caca
99
CACA_CONFIGURE_WITH=		caca
100
DAV1D_LIB_DEPENDS=		libdav1d.so:multimedia/dav1d
101
DAV1D_CONFIGURE_WITH=		dav1d
89
DVB_CONFIGURE_ENABLE=		dvb
102
DVB_CONFIGURE_ENABLE=		dvb
90
GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
103
GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
91
GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
104
GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
92
IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
105
IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick
93
IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
94
IMAGEMAGICK_IMPLIES=		DMX_IMAGE
106
IMAGEMAGICK_IMPLIES=		DMX_IMAGE
107
IMAGEMAGICK6_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
108
IMAGEMAGICK6_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
109
IMAGEMAGICK6_IMPLIES=		${IMAGEMAGICK_IMPLIES}
110
IMAGEMAGICK7_LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
111
IMAGEMAGICK7_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
112
IMAGEMAGICK7_IMPLIES=		${IMAGEMAGICK_IMPLIES}
95
IPV6_CONFIGURE_ENABLE=		ipv6
113
IPV6_CONFIGURE_ENABLE=		ipv6
96
JACK_LIB_DEPENDS=		libjack.so:audio/jack
114
JACK_LIB_DEPENDS=		libjack.so:audio/jack
97
JACK_CONFIGURE_WITH=		jack
115
JACK_CONFIGURE_WITH=		jack
Lines 99-115 Link Here
99
LIBBLURAY_CONFIGURE_ENABLE=	bluray
117
LIBBLURAY_CONFIGURE_ENABLE=	bluray
100
NLS_USES=			gettext
118
NLS_USES=			gettext
101
NLS_CONFIGURE_ENABLE=		nls
119
NLS_CONFIGURE_ENABLE=		nls
120
NFS_LIB_DEPENDS=		libnfs.so:net/libnfs
121
NFS_CONFIGURE_ENABLE=		nfs
102
PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
122
PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
103
PIXBUF_IMPLIES=			DMX_IMAGE
123
PIXBUF_IMPLIES=			DMX_IMAGE
104
PIXBUF_USE=			GNOME=gdkpixbuf2,glib20
124
PIXBUF_USE=			GNOME=gdkpixbuf2,glib20
105
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
125
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
106
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
126
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
127
SFTP_LIB_DEPENDS=		libssh2.so:security/libssh2
128
SFTP_CONFIGURE_ENABLE=		sftp
107
SMB_USES=			samba:lib
129
SMB_USES=			samba:lib
108
SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
130
SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
109
				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
131
				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
110
SMB_CONFIGURE_ENABLE=		samba
132
SMB_CONFIGURE_ENABLE=		samba
111
SNDIO_CONFIGURE_ENABLE=		sndio
112
SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
133
SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
134
SNDIO_CONFIGURE_ENABLE=		sndio
135
TLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
136
TLS_CONFIGURE_ENABLE=		tls
113
VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva \
137
VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva \
114
				libva-glx.so:multimedia/libva-glx
138
				libva-glx.so:multimedia/libva-glx
115
VAAPI_CONFIGURE_ENABLE=		vaapi
139
VAAPI_CONFIGURE_ENABLE=		vaapi
Lines 134-149 Link Here
134
BUILD_DEPENDS+=	as:devel/binutils
158
BUILD_DEPENDS+=	as:devel/binutils
135
.endif
159
.endif
136
160
161
.if ${PORT_OPTIONS:MIMAGEMAGICK6} || ${PORT_OPTIONS:MIMAGEMAGICK7}
162
PLIST_SUB+=		IMAGEMAGICK=""
163
.else
164
CONFIGURE_ARGS+=	--without-imagemagick
165
PLIST_SUB+=		IMAGEMAGICK="@comment "
166
.endif
167
137
post-patch:
168
post-patch:
138
.if ${COMPILER_TYPE} == "clang"
169
.if ${COMPILER_TYPE} == "clang"
139
	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
170
	@${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
140
		${WRKSRC}/src/libw32dll/wine/Makefile.in
171
		${WRKSRC}/src/libw32dll/Makefile.in
141
.endif
172
.endif
142
	@${REINPLACE_CMD} -e 's|-ldl||' \
173
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:
174
post-install:
148
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
175
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
149
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so
176
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so
(-)multimedia/libxine/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
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
(-)multimedia/libxine/files/patch-include_config.h (-18 lines)
Lines 1-18 Link Here
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
(-)multimedia/libxine/pkg-plist (-1 / +13 lines)
Lines 28-33 Link Here
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 59-64 Link Here
59
%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
61
%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
60
%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so
62
%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.so
61
%%PLUGINSDIR%%/xineplug_decode_a52.so
63
%%PLUGINSDIR%%/xineplug_decode_a52.so
64
%%DAV1D%%%%PLUGINSDIR%%/xineplug_decode_dav1d.so
62
%%PLUGINSDIR%%/xineplug_decode_dts.so
65
%%PLUGINSDIR%%/xineplug_decode_dts.so
63
%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
66
%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
64
%%PLUGINSDIR%%/xineplug_decode_faad.so
67
%%PLUGINSDIR%%/xineplug_decode_faad.so
Lines 66-72 Link Here
66
%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
69
%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
67
%%PLUGINSDIR%%/xineplug_decode_gsm610.so
70
%%PLUGINSDIR%%/xineplug_decode_gsm610.so
68
%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
71
%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
72
%%AOM%%%%PLUGINSDIR%%/xineplug_decode_libaom.so
69
%%PLUGINSDIR%%/xineplug_decode_libjpeg.so
73
%%PLUGINSDIR%%/xineplug_decode_libjpeg.so
74
%%PLUGINSDIR%%/xineplug_decode_libpng.so
70
%%PLUGINSDIR%%/xineplug_decode_libvpx.so
75
%%PLUGINSDIR%%/xineplug_decode_libvpx.so
71
%%PLUGINSDIR%%/xineplug_decode_lpcm.so
76
%%PLUGINSDIR%%/xineplug_decode_lpcm.so
72
%%PLUGINSDIR%%/xineplug_decode_mad.so
77
%%PLUGINSDIR%%/xineplug_decode_mad.so
Lines 77-82 Link Here
77
%%PLUGINSDIR%%/xineplug_decode_spucmml.so
82
%%PLUGINSDIR%%/xineplug_decode_spucmml.so
78
%%PLUGINSDIR%%/xineplug_decode_spudvb.so
83
%%PLUGINSDIR%%/xineplug_decode_spudvb.so
79
%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
84
%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
85
%%PLUGINSDIR%%/xineplug_decode_to_spdif.so
80
%%PLUGINSDIR%%/xineplug_decode_vdpau.so
86
%%PLUGINSDIR%%/xineplug_decode_vdpau.so
81
%%PLUGINSDIR%%/xineplug_dmx_asf.so
87
%%PLUGINSDIR%%/xineplug_dmx_asf.so
82
%%PLUGINSDIR%%/xineplug_dmx_audio.so
88
%%PLUGINSDIR%%/xineplug_dmx_audio.so
Lines 98-110 Link Here
98
%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
104
%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
99
%%PLUGINSDIR%%/xineplug_inp_mms.so
105
%%PLUGINSDIR%%/xineplug_inp_mms.so
100
%%PLUGINSDIR%%/xineplug_inp_network.so
106
%%PLUGINSDIR%%/xineplug_inp_network.so
107
%%NFS%%%%PLUGINSDIR%%/xineplug_inp_nfs.so
101
%%PLUGINSDIR%%/xineplug_inp_rtp.so
108
%%PLUGINSDIR%%/xineplug_inp_rtp.so
102
%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
109
%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
110
%%SFTP%%%%PLUGINSDIR%%/xineplug_inp_ssh.so
103
%%PLUGINSDIR%%/xineplug_inp_vcd.so
111
%%PLUGINSDIR%%/xineplug_inp_vcd.so
104
%%PLUGINSDIR%%/xineplug_inp_vcdo.so
112
%%PLUGINSDIR%%/xineplug_inp_vcdo.so
105
%%PLUGINSDIR%%/xineplug_nsf.so
113
%%PLUGINSDIR%%/xineplug_nsf.so
106
%%PLUGINSDIR%%/xineplug_sputext.so
114
%%PLUGINSDIR%%/xineplug_sputext.so
115
%%TLS%%%%PLUGINSDIR%%/xineplug_tls_gnutls.so
107
%%PLUGINSDIR%%/xineplug_vdr.so
116
%%PLUGINSDIR%%/xineplug_vdr.so
117
%%PLUGINSDIR%%/xineplug_vo_gl_egl_wl.so
118
%%PLUGINSDIR%%/xineplug_vo_gl_egl_x11.so
119
%%PLUGINSDIR%%/xineplug_vo_gl_glx.so
108
%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
120
%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
109
%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
121
%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
110
%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
122
%%PLUGINSDIR%%/xineplug_vo_out_opengl.so

Return to bug 252338