View | Details | Raw Unified | Return to bug 223057
Collapse All | Expand All

(-)b/multimedia/ffmpeg/Makefile (-29 / +36 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ffmpeg
4
PORTNAME=	ffmpeg
5
PORTVERSION=	3.3.4
5
PORTVERSION=	3.4
6
PORTEPOCH=	1
6
PORTEPOCH=	1
7
CATEGORIES=	multimedia audio ipv6 net
7
CATEGORIES=	multimedia audio ipv6 net
8
MASTER_SITES=	http://ffmpeg.org/releases/
8
MASTER_SITES=	http://ffmpeg.org/releases/
Lines 13-19 COMMENT= Realtime audio/video encoder/converter and streaming server Link Here
13
LICENSE=	GPLv2+ LGPL21+
13
LICENSE=	GPLv2+ LGPL21+
14
LICENSE_COMB=	multi
14
LICENSE_COMB=	multi
15
15
16
BUILD_DEPENDS=	yasm:devel/yasm \
16
BUILD_DEPENDS=	nasm:devel/nasm \
17
		${LOCALBASE}/bin/as:devel/binutils
17
		${LOCALBASE}/bin/as:devel/binutils
18
18
19
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
Lines 27-45 NOPRECIOUSMAKEVARS= yes # ARCH Link Here
27
PORTSCOUT=	limit:^3\.
27
PORTSCOUT=	limit:^3\.
28
28
29
OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
29
OPTIONS_DEFINE=	ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
30
		DEBUG DOCS FDK_AAC FFSERVER FLITE FONTCONFIG \
30
		DEBUG DOCS DRM FDK_AAC FFSERVER FLITE FONTCONFIG \
31
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
31
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
32
		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
32
		LAME LIBBLURAY LIBRSVG2 LIBXML2 MODPLUG MYSOFA OPENAL OPENCL OPENCV OPENGL \
33
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
33
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
34
		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \
34
		RUBBERBAND RTCPU SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \
35
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
35
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
36
		VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XCB XVID \
36
		VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XCB XVID \
37
		XVIDEO ZIMG ZMQ ZVBI
37
		XVIDEO ZIMG ZMQ ZVBI
38
38
39
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
39
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
40
			OPENCV OPTIMIZED_CFLAGS RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \
40
			OPENCV OPTIMIZED_CFLAGS RTCPU THEORA V4L VAAPI VDPAU \
41
			VORBIS VPX X264 X265 XVID
41
			VORBIS VPX X264 X265 XVID
42
42
43
.if !exists(${.CURDIR:H:H}/science/libmysofa)
44
# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/2336c76b2246
45
OPTIONS_EXCLUDE+=	MYSOFA
46
.endif
47
43
OPTIONS_RADIO=	RTMP SSL
48
OPTIONS_RADIO=	RTMP SSL
44
OPTIONS_RADIO_RTMP=	GCRYPT GMP LIBRTMP
49
OPTIONS_RADIO_RTMP=	GCRYPT GMP LIBRTMP
45
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
50
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
Lines 54-62 OPTIONS_DEFAULT_i386= MMX SSE Link Here
54
59
55
ASS_DESC=	Subtitles rendering via libass
60
ASS_DESC=	Subtitles rendering via libass
56
BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
61
BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
57
CDIO_DESC=	Audio CD grabbing with libcdio
58
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
62
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
59
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
63
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
64
DRM_DESC=	KMS grabbing using libdrm
60
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
65
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
61
FFSERVER_DESC=	Build and install ffserver
66
FFSERVER_DESC=	Build and install ffserver
62
FLITE_DESC=	Voice synthesis support via libflite
67
FLITE_DESC=	Voice synthesis support via libflite
Lines 65-72 GPL3_DESC= Allow (L)GPL version 3 code(cs) Link Here
65
ILBC_DESC=	Internet Low Bit Rate codec
70
ILBC_DESC=	Internet Low Bit Rate codec
66
KVAZAAR_DESC=	H.265 video codec support via Kvazaar
71
KVAZAAR_DESC=	H.265 video codec support via Kvazaar
67
LICENSE_DESC=	Licensing options
72
LICENSE_DESC=	Licensing options
68
NEON_DESC=	Enable Media Processing Engine instructions
73
NEON_DESC=	Media Processing Engine instructions
69
NETCDF_DESC=	SOFAlizer binaural filter
74
MYSOFA_DESC=	SOFAlizer binaural filter
70
NONFREE_DESC=	Allow use of nonfree code
75
NONFREE_DESC=	Allow use of nonfree code
71
OPENH264_DESC=	H.264 video codec support via OpenH264
76
OPENH264_DESC=	H.264 video codec support via OpenH264
72
RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
77
RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
Lines 74-80 RTCPU_DESC= Detect CPU capabilities at runtime Link Here
74
RTMP_DESC=	RTMP(T)E protocol support
79
RTMP_DESC=	RTMP(T)E protocol support
75
LIBRTMP_DESC=	${RTMP_DESC} via librtmp
80
LIBRTMP_DESC=	${RTMP_DESC} via librtmp
76
TESSERACT_DESC=	Optical Character Recognition via Tesseract
81
TESSERACT_DESC=	Optical Character Recognition via Tesseract
77
VFP_DESC=	Enable Vector Floating Point instructions
82
VFP_DESC=	Vector Floating Point instructions
78
VIDSTAB_DESC=	Video stabilization filter
83
VIDSTAB_DESC=	Video stabilization filter
79
XCB_DESC=	X11 grabbing using XCB
84
XCB_DESC=	X11 grabbing using XCB
80
ZIMG_DESC=	"z" library video scaling filter
85
ZIMG_DESC=	"z" library video scaling filter
Lines 84-92 ZVBI_DESC= Teletext support via libzvbi Link Here
84
OPTIONS_SUB=	yes
89
OPTIONS_SUB=	yes
85
90
86
# alsa
91
# alsa
87
ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
88
			--disable-outdev=alsa
89
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
92
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
93
ALSA_CONFIGURE_ENABLE=	alsa
90
94
91
# Opencore AMR NB
95
# Opencore AMR NB
92
AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
96
AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
Lines 135-140 DEBUG_CONFIGURE_OFF= --disable-debug Link Here
135
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
139
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
136
DOCS_CONFIGURE_ENABLE=	htmlpages
140
DOCS_CONFIGURE_ENABLE=	htmlpages
137
141
142
# drm
143
DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
144
DRM_CONFIGURE_ENABLE=	libdrm
145
138
# fdk_aac
146
# fdk_aac
139
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
147
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
140
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
148
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
Lines 195-201 ILBC_CONFIGURE_ENABLE= libilbc Link Here
195
203
196
# jack
204
# jack
197
JACK_LIB_DEPENDS=	libjack.so:audio/jack
205
JACK_LIB_DEPENDS=	libjack.so:audio/jack
198
JACK_CONFIGURE_OFF=	--disable-indev=jack
206
JACK_CONFIGURE_ENABLE=	jack
199
207
200
# kvazaar
208
# kvazaar
201
KVAZAAR_LIB_DEPENDS=	libkvazaar.so:multimedia/kvazaar
209
KVAZAAR_LIB_DEPENDS=	libkvazaar.so:multimedia/kvazaar
Lines 214-219 LAME_CONFIGURE_ENABLE= libmp3lame Link Here
214
LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
222
LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
215
LIBBLURAY_CONFIGURE_ENABLE=	libbluray
223
LIBBLURAY_CONFIGURE_ENABLE=	libbluray
216
224
225
# librsvg
226
LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
227
LIBRSVG2_CONFIGURE_ENABLE=	librsvg
228
229
# libxml
230
LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
231
LIBXML2_CONFIGURE_ENABLE=	libxml2
232
217
# libv4l
233
# libv4l
218
V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
234
V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
219
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
235
V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
Lines 228-241 MMX_CONFIGURE_ENABLE= mmx Link Here
228
MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
244
MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
229
MODPLUG_CONFIGURE_ENABLE=	libmodplug
245
MODPLUG_CONFIGURE_ENABLE=	libmodplug
230
246
231
# netcdf
247
# mysofa
232
NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
248
MYSOFA_LIB_DEPENDS=	libmysofa.so:science/libmysofa
233
NETCDF_CONFIGURE_ENABLE=	netcdf
249
MYSOFA_CONFIGURE_ENABLE=	libmysofa
234
250
235
# OpenAL
251
# OpenAL
236
OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
252
OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
237
OPENAL_CONFIGURE_ENABLE=	openal
253
OPENAL_CONFIGURE_ENABLE=	openal
238
OPENAL_CONFIGURE_OFF=		--disable-indev=openal
239
254
240
# opencl
255
# opencl
241
OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
256
OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
Lines 273-280 OPUS_CONFIGURE_ENABLE= libopus Link Here
273
# pulseaudio
288
# pulseaudio
274
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
289
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
275
PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
290
PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
276
PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
277
				--disable-outdev=pulse
278
291
279
# rubberband
292
# rubberband
280
RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
293
RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
Lines 287-300 RTCPU_CONFIGURE_ENABLE= runtime-cpudetect Link Here
287
LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
300
LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
288
LIBRTMP_CONFIGURE_ENABLE=	librtmp
301
LIBRTMP_CONFIGURE_ENABLE=	librtmp
289
302
290
# schroedinger
291
SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
292
SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
293
294
# sdl
303
# sdl
295
SDL_USE=		SDL=sdl2
304
SDL_USE=		SDL=sdl2
296
SDL_CONFIGURE_ENABLE=	ffplay
305
SDL_CONFIGURE_ENABLE=	sdl2
297
SDL_CONFIGURE_OFF=	--disable-outdev=sdl --disable-sdl2
298
306
299
# smbclient
307
# smbclient
300
SMB_USES=		samba:lib
308
SMB_USES=		samba:lib
Lines 306-314 SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy Link Here
306
SNAPPY_CONFIGURE_ENABLE=	libsnappy
314
SNAPPY_CONFIGURE_ENABLE=	libsnappy
307
315
308
# sndio
316
# sndio
309
SNDIO_CONFIGURE_OFF=	--disable-indev=sndio \
310
			--disable-outdev=sndio
311
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
317
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
318
SNDIO_CONFIGURE_ENABLE=	sndio
312
319
313
# soxr
320
# soxr
314
SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
321
SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
Lines 421-427 NONFREE_CONFIGURE_ENABLE=nonfree Link Here
421
NONFREE_VARS=		RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
428
NONFREE_VARS=		RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
422
429
423
INSTALL_TARGET=	install-progs install-doc install-data \
430
INSTALL_TARGET=	install-progs install-doc install-data \
424
		install-libs install-headers
431
		install-libs install-headers install-examples
425
432
426
DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
433
DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
427
434
Lines 461-467 CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} Link Here
461
post-patch:
468
post-patch:
462
# {C,LD}FLAGS safeness
469
# {C,LD}FLAGS safeness
463
	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
470
	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
464
		${WRKSRC}/ffserver.c
471
		${WRKSRC}/fftools/ffserver.c
465
	@${REINPLACE_CMD} -E \
472
	@${REINPLACE_CMD} -E \
466
		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
473
		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
467
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
474
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
(-)b/multimedia/ffmpeg/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1505177492
1
TIMESTAMP = 1508083176
2
SHA256 (ffmpeg-3.3.4.tar.xz) = 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
2
SHA256 (ffmpeg-3.4.tar.xz) = aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef
3
SIZE (ffmpeg-3.3.4.tar.xz) = 8282960
3
SIZE (ffmpeg-3.4.tar.xz) = 8478860
(-)b/multimedia/ffmpeg/files/patch-configure (-45 / +3 lines)
Lines 1-15 Link Here
1
--- configure.orig	2017-09-12 00:51:31 UTC
1
--- configure.orig	2017-10-15 15:59:36 UTC
2
+++ configure
2
+++ configure
3
@@ -1875,6 +1875,8 @@ HEADERS_LIST="
3
@@ -3371,12 +3371,7 @@ target_os_default=$(tolower $(uname -s))
4
     machine_ioctl_meteor_h
5
     malloc_h
6
     opencv2_core_core_c_h
7
+    openjpeg_2_3_openjpeg_h
8
+    openjpeg_2_2_openjpeg_h
9
     openjpeg_2_1_openjpeg_h
10
     openjpeg_2_0_openjpeg_h
11
     openjpeg_1_5_openjpeg_h
12
@@ -3262,12 +3264,7 @@ target_os_default=$(tolower $(uname -s))
13
 host_os=$target_os_default
4
 host_os=$target_os_default
14
 
5
 
15
 # machine
6
 # machine
Lines 23-40 Link Here
23
 cpu="generic"
14
 cpu="generic"
24
 intrinsics="none"
15
 intrinsics="none"
25
 
16
 
26
@@ -5807,6 +5804,10 @@ enabled libopencv         && { check_header opencv2/co
17
@@ -6491,6 +6486,9 @@ elif enabled llvm_gcc; then
27
 enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
28
 enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
29
                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
30
+			       { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
31
+                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
32
+			       { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
33
+                               check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
34
                                { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
35
                                { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
36
                                { check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
37
@@ -6295,6 +6296,9 @@ elif enabled llvm_gcc; then
38
 elif enabled clang; then
18
 elif enabled clang; then
39
     check_cflags -mllvm -stack-alignment=16
19
     check_cflags -mllvm -stack-alignment=16
40
     check_cflags -mstack-alignment=16
20
     check_cflags -mstack-alignment=16
Lines 44-68 Link Here
44
     check_cflags -Qunused-arguments
24
     check_cflags -Qunused-arguments
45
     check_cflags -Werror=implicit-function-declaration
25
     check_cflags -Werror=implicit-function-declaration
46
     check_cflags -Werror=missing-prototypes
26
     check_cflags -Werror=missing-prototypes
47
@@ -6900,7 +6904,7 @@ exec_prefix=\${prefix}
48
 libdir=$libdir
49
 includedir=$incdir
50
 
51
-Name: $name
52
+Name: ${name}${build_suffix}
53
 Description: $comment
54
 Version: $version
55
 Requires: $(enabled shared || echo $requires)
56
@@ -6914,10 +6918,10 @@ EOF
57
 mkdir -p doc/examples/pc-uninstalled
58
 includedir=${source_path}
59
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
60
-    cat <<EOF > doc/examples/pc-uninstalled/${name}-uninstalled.pc
61
+    cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}-uninstalled.pc
62
 prefix=
63
 exec_prefix=
64
-libdir=\${pcfiledir}/../../../$name
65
+libdir=\${pcfiledir}/../../../${name}${build_suffix}.pc
66
 includedir=${includedir}
67
 
68
 Name: $name
(-)a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegdec.c (-33 lines)
Removed Link Here
1
--- libavcodec/libopenjpegdec.c.orig	2017-09-12 00:51:33 UTC
2
+++ libavcodec/libopenjpegdec.c
3
@@ -34,7 +34,11 @@
4
 #include "internal.h"
5
 #include "thread.h"
6
 
7
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
8
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
9
+#  include <openjpeg-2.3/openjpeg.h>
10
+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
11
+#  include <openjpeg-2.2/openjpeg.h>
12
+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
13
 #  include <openjpeg-2.1/openjpeg.h>
14
 #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
15
 #  include <openjpeg-2.0/openjpeg.h>
16
@@ -44,7 +48,7 @@
17
 #  include <openjpeg.h>
18
 #endif
19
 
20
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
21
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
22
 #  define OPENJPEG_MAJOR_VERSION 2
23
 #  define OPJ(x) OPJ_##x
24
 #else
25
@@ -429,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCo
26
     opj_stream_set_read_function(stream, stream_read);
27
     opj_stream_set_skip_function(stream, stream_skip);
28
     opj_stream_set_seek_function(stream, stream_seek);
29
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
30
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
31
     opj_stream_set_user_data(stream, &reader, NULL);
32
 #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
33
     opj_stream_set_user_data(stream, &reader);
(-)a/multimedia/ffmpeg/files/patch-libavcodec_libopenjpegenc.c (-42 lines)
Removed Link Here
1
--- libavcodec/libopenjpegenc.c.orig	2017-09-12 00:51:33 UTC
2
+++ libavcodec/libopenjpegenc.c
3
@@ -32,7 +32,11 @@
4
 #include "avcodec.h"
5
 #include "internal.h"
6
 
7
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
8
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
9
+#  include <openjpeg-2.3/openjpeg.h>
10
+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
11
+#  include <openjpeg-2.2/openjpeg.h>
12
+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
13
 #  include <openjpeg-2.1/openjpeg.h>
14
 #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
15
 #  include <openjpeg-2.0/openjpeg.h>
16
@@ -42,7 +46,7 @@
17
 #  include <openjpeg.h>
18
 #endif
19
 
20
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
21
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
22
 #  define OPENJPEG_MAJOR_VERSION 2
23
 #  define OPJ(x) OPJ_##x
24
 #else
25
@@ -305,7 +309,7 @@ static av_cold int libopenjpeg_encode_in
26
 
27
     opj_set_default_encoder_parameters(&ctx->enc_params);
28
 
29
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
30
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
31
     switch (ctx->cinema_mode) {
32
     case OPJ_CINEMA2K_24:
33
         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
34
@@ -769,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
35
     opj_stream_set_write_function(stream, stream_write);
36
     opj_stream_set_skip_function(stream, stream_skip);
37
     opj_stream_set_seek_function(stream, stream_seek);
38
-#if HAVE_OPENJPEG_2_1_OPENJPEG_H
39
+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
40
     opj_stream_set_user_data(stream, &writer, NULL);
41
 #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
42
     opj_stream_set_user_data(stream, &writer);
(-)b/multimedia/ffmpeg/pkg-plist (-9 / +13 lines)
Lines 66-75 include/libavutil/hash.h Link Here
66
include/libavutil/hmac.h
66
include/libavutil/hmac.h
67
include/libavutil/hwcontext.h
67
include/libavutil/hwcontext.h
68
include/libavutil/hwcontext_cuda.h
68
include/libavutil/hwcontext_cuda.h
69
include/libavutil/hwcontext_d3d11va.h
70
include/libavutil/hwcontext_drm.h
69
include/libavutil/hwcontext_dxva2.h
71
include/libavutil/hwcontext_dxva2.h
70
include/libavutil/hwcontext_qsv.h
72
include/libavutil/hwcontext_qsv.h
71
include/libavutil/hwcontext_vaapi.h
73
include/libavutil/hwcontext_vaapi.h
72
include/libavutil/hwcontext_vdpau.h
74
include/libavutil/hwcontext_vdpau.h
75
include/libavutil/hwcontext_videotoolbox.h
73
include/libavutil/imgutils.h
76
include/libavutil/imgutils.h
74
include/libavutil/intfloat.h
77
include/libavutil/intfloat.h
75
include/libavutil/intreadwrite.h
78
include/libavutil/intreadwrite.h
Lines 117-155 include/libswscale/version.h Link Here
117
lib/libavcodec.a
120
lib/libavcodec.a
118
lib/libavcodec.so
121
lib/libavcodec.so
119
lib/libavcodec.so.57
122
lib/libavcodec.so.57
120
lib/libavcodec.so.57.89.100
123
lib/libavcodec.so.57.107.100
121
lib/libavdevice.a
124
lib/libavdevice.a
122
lib/libavdevice.so
125
lib/libavdevice.so
123
lib/libavdevice.so.57
126
lib/libavdevice.so.57
124
lib/libavdevice.so.57.6.100
127
lib/libavdevice.so.57.10.100
125
lib/libavfilter.a
128
lib/libavfilter.a
126
lib/libavfilter.so
129
lib/libavfilter.so
127
lib/libavfilter.so.6
130
lib/libavfilter.so.6
128
lib/libavfilter.so.6.82.100
131
lib/libavfilter.so.6.107.100
129
lib/libavformat.a
132
lib/libavformat.a
130
lib/libavformat.so
133
lib/libavformat.so
131
lib/libavformat.so.57
134
lib/libavformat.so.57
132
lib/libavformat.so.57.71.100
135
lib/libavformat.so.57.83.100
133
lib/libavresample.a
136
lib/libavresample.a
134
lib/libavresample.so
137
lib/libavresample.so
135
lib/libavresample.so.3
138
lib/libavresample.so.3
136
lib/libavresample.so.3.5.0
139
lib/libavresample.so.3.7.0
137
lib/libavutil.a
140
lib/libavutil.a
138
lib/libavutil.so
141
lib/libavutil.so
139
lib/libavutil.so.55
142
lib/libavutil.so.55
140
lib/libavutil.so.55.58.100
143
lib/libavutil.so.55.78.100
141
lib/libpostproc.a
144
lib/libpostproc.a
142
lib/libpostproc.so
145
lib/libpostproc.so
143
lib/libpostproc.so.54
146
lib/libpostproc.so.54
144
lib/libpostproc.so.54.5.100
147
lib/libpostproc.so.54.7.100
145
lib/libswresample.a
148
lib/libswresample.a
146
lib/libswresample.so
149
lib/libswresample.so
147
lib/libswresample.so.2
150
lib/libswresample.so.2
148
lib/libswresample.so.2.7.100
151
lib/libswresample.so.2.9.100
149
lib/libswscale.a
152
lib/libswscale.a
150
lib/libswscale.so
153
lib/libswscale.so
151
lib/libswscale.so.4
154
lib/libswscale.so.4
152
lib/libswscale.so.4.6.100
155
lib/libswscale.so.4.8.100
153
libdata/pkgconfig/libavcodec.pc
156
libdata/pkgconfig/libavcodec.pc
154
libdata/pkgconfig/libavdevice.pc
157
libdata/pkgconfig/libavdevice.pc
155
libdata/pkgconfig/libavfilter.pc
158
libdata/pkgconfig/libavfilter.pc
Lines 197-202 man/man3/libswscale.3.gz Link Here
197
%%DATADIR%%/examples/filtering_audio.c
200
%%DATADIR%%/examples/filtering_audio.c
198
%%DATADIR%%/examples/filtering_video.c
201
%%DATADIR%%/examples/filtering_video.c
199
%%DATADIR%%/examples/http_multiclient.c
202
%%DATADIR%%/examples/http_multiclient.c
203
%%DATADIR%%/examples/hw_decode.c
200
%%DATADIR%%/examples/metadata.c
204
%%DATADIR%%/examples/metadata.c
201
%%DATADIR%%/examples/muxing.c
205
%%DATADIR%%/examples/muxing.c
202
%%DATADIR%%/examples/qsvdec.c
206
%%DATADIR%%/examples/qsvdec.c

Return to bug 223057