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

Collapse All | Expand All

(-)b/head/multimedia/ffmpeg/Makefile (-42 / +57 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ffmpeg
4
PORTNAME=	ffmpeg
5
PORTVERSION=	2.8.8
5
PORTVERSION=	3.2.1
6
PORTREVISION=	9
7
PORTEPOCH=	1
6
PORTEPOCH=	1
8
CATEGORIES=	multimedia audio ipv6 net
7
CATEGORIES=	multimedia audio ipv6 net
9
MASTER_SITES=	http://ffmpeg.org/releases/
8
MASTER_SITES=	http://ffmpeg.org/releases/
Lines 18-39 Link Here
18
		${LOCALBASE}/bin/as:devel/binutils
17
		${LOCALBASE}/bin/as:devel/binutils
19
18
20
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
21
USES=		compiler:c11 cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
20
USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
22
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
23
USE_PERL5=	build
22
USE_PERL5=	build
24
SHEBANG_FILES=	doc/texi2pod.pl
23
SHEBANG_FILES=	doc/texi2pod.pl
25
24
26
PORTSCOUT=	limit:^2\.
25
PORTSCOUT=	limit:^3\.
27
26
28
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
27
OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
29
		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
28
		DEBUG DOCS FDK_AAC FFSERVER FLITE FONTCONFIG \
30
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
29
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
31
		LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \
30
		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
32
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
31
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
33
		RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SNDIO SPEEX SSH \
32
		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SPEEX SSH \
34
		THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
33
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
35
		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
34
		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
36
		XVIDEO ZMQ ZVBI
35
		XVIDEO ZIMG ZMQ ZVBI
37
36
38
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
37
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
39
			OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \
38
			OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \
Lines 54-59 Link Here
54
ASS_DESC=	Subtitles rendering via libass
53
ASS_DESC=	Subtitles rendering via libass
55
BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
54
BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
56
CDIO_DESC=	Audio CD grabbing with libcdio
55
CDIO_DESC=	Audio CD grabbing with libcdio
56
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
57
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
57
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
58
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
58
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
59
FFSERVER_DESC=	Build and install ffserver
59
FFSERVER_DESC=	Build and install ffserver
Lines 64-87 Link Here
64
KVAZAAR_DESC=	H.265 video codec support via Kvazaar
64
KVAZAAR_DESC=	H.265 video codec support via Kvazaar
65
LICENSE_DESC=	Licensing options
65
LICENSE_DESC=	Licensing options
66
NEON_DESC=	Enable Media Processing Engine instructions
66
NEON_DESC=	Enable Media Processing Engine instructions
67
NETCDF_DESC=	SOFAlizer binaural filter
67
NONFREE_DESC=	Allow use of nonfree code
68
NONFREE_DESC=	Allow use of nonfree code
68
OPENH264_DESC=	H.264 video codec support via OpenH264
69
OPENH264_DESC=	H.264 video codec support via OpenH264
69
QUVI_DESC=	Flash media stream URLs
70
RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
70
RTCPU_DESC=	Detect CPU capabilities at runtime
71
RTCPU_DESC=	Detect CPU capabilities at runtime
72
LIBRTMP_DESC=	RTMP protocol support via librtmp
73
TESSERACT_DESC=	Optical Character Recognition via Tesseract
71
VFP_DESC=	Enable Vector Floating Point instructions
74
VFP_DESC=	Enable Vector Floating Point instructions
72
VIDSTAB_DESC=	Video stabilization filter
75
VIDSTAB_DESC=	Video stabilization filter
73
X11GRAB_DESC=	X11 grabbing (legacy)
76
X11GRAB_DESC=	X11 grabbing (legacy)
74
XCB_DESC=	X11 grabbing using XCB
77
XCB_DESC=	X11 grabbing using XCB
78
ZIMG_DESC=	"z" library video scaling filter
75
ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
79
ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
76
ZVBI_DESC=	Teletext support via libzvbi
80
ZVBI_DESC=	Teletext support via libzvbi
77
81
78
OPTIONS_SUB=	yes
82
OPTIONS_SUB=	yes
79
83
80
# aacplus
81
AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus
82
AACPLUS_CONFIGURE_ENABLE=	libaacplus
83
AACPLUS_IMPLIES=	NONFREE
84
85
# alsa
84
# alsa
86
ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
85
ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
87
			--disable-outdev=alsa
86
			--disable-outdev=alsa
Lines 117-122 Link Here
117
CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
116
CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
118
CELT_CONFIGURE_ENABLE=	libcelt
117
CELT_CONFIGURE_ENABLE=	libcelt
119
118
119
# chromaprint
120
CHROMAPRINT_BROKEN=		Dependency loop
121
CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
122
CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint
123
120
# dc1394
124
# dc1394
121
DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
125
DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
122
DC1394_CONFIGURE_ENABLE=	libdc1394
126
DC1394_CONFIGURE_ENABLE=	libdc1394
Lines 129-139 Link Here
129
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
133
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
130
DOCS_CONFIGURE_ENABLE=	htmlpages
134
DOCS_CONFIGURE_ENABLE=	htmlpages
131
135
132
# faac
133
FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
134
FAAC_CONFIGURE_ENABLE=	libfaac
135
FAAC_IMPLIES=		NONFREE
136
137
# fdk_aac
136
# fdk_aac
138
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
137
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
139
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
138
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
Lines 163-168 Link Here
163
FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
162
FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
164
FRIBIDI_CONFIGURE_ENABLE=	libfribidi
163
FRIBIDI_CONFIGURE_ENABLE=	libfribidi
165
164
165
# gcrypt
166
GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
167
GCRYPT_CONFIGURE_ENABLE=	gcrypt
168
166
# gnutls
169
# gnutls
167
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
170
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
168
GNUTLS_CONFIGURE_ENABLE=	gnutls
171
GNUTLS_CONFIGURE_ENABLE=	gnutls
Lines 171-176 Link Here
171
GME_LIB_DEPENDS=	libgme.so:audio/libgme
174
GME_LIB_DEPENDS=	libgme.so:audio/libgme
172
GME_CONFIGURE_ENABLE=	libgme
175
GME_CONFIGURE_ENABLE=	libgme
173
176
177
# gmp
178
GMP_LIB_DEPENDS=	libgmp.so:math/gmp
179
GMP_CONFIGURE_ENABLE=	gmp
180
GMP_IMPLIES=		GPL3
181
174
# gsm
182
# gsm
175
GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
183
GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
176
GSM_CONFIGURE_ENABLE=	libgsm
184
GSM_CONFIGURE_ENABLE=	libgsm
Lines 218-223 Link Here
218
MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
226
MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
219
MODPLUG_CONFIGURE_ENABLE=	libmodplug
227
MODPLUG_CONFIGURE_ENABLE=	libmodplug
220
228
229
# netcdf
230
NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
231
NETCDF_CONFIGURE_ENABLE=	netcdf
232
221
# OpenAL
233
# OpenAL
222
OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
234
OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
223
OPENAL_CONFIGURE_ENABLE=	openal
235
OPENAL_CONFIGURE_ENABLE=	openal
Lines 241-248 Link Here
241
OPENH264_CONFIGURE_ENABLE=	libopenh264
253
OPENH264_CONFIGURE_ENABLE=	libopenh264
242
254
243
# openjpeg
255
# openjpeg
244
OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
256
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
245
OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
257
OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
258
#OPENJPEG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-openjpeg2_linkfix
246
259
247
# openssl
260
# openssl
248
OPENSSL_USE=		OPENSSL=yes
261
OPENSSL_USE=		OPENSSL=yes
Lines 262-277 Link Here
262
PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
275
PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
263
				--disable-outdev=pulse
276
				--disable-outdev=pulse
264
277
265
# quvi
278
# rubberband
266
QUVI_LIB_DEPENDS=	libquvi.so:multimedia/libquvi
279
RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
267
QUVI_CONFIGURE_ENABLE=	libquvi
280
RUBBERBAND_CONFIGURE_ENABLE=	librubberband
268
281
269
# rtcpu
282
# rtcpu
270
RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
283
RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
271
284
272
# rtmp
285
# rtmp
273
RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
286
LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
274
RTMP_CONFIGURE_ENABLE=	librtmp
287
LIBRTMP_CONFIGURE_ENABLE=	librtmp
275
288
276
# schroedinger
289
# schroedinger
277
SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
290
SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
Lines 278-286 Link Here
278
SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
291
SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
279
292
280
# sdl
293
# sdl
281
SDL_USE=		SDL=sdl
294
SDL_USE=		SDL=sdl2
282
SDL_CONFIGURE_ENABLE=	ffplay
295
SDL_CONFIGURE_ENABLE=	ffplay
283
SDL_CONFIGURE_OFF=	--disable-outdev=sdl
296
SDL_CONFIGURE_OFF=	--disable-outdev=sdl --disable-sdl2
284
297
285
# smbclient
298
# smbclient
286
SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
299
SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
Lines 308-313 Link Here
308
SSH_LIB_DEPENDS=	libssh.so:security/libssh
321
SSH_LIB_DEPENDS=	libssh.so:security/libssh
309
SSH_CONFIGURE_ENABLE=	libssh
322
SSH_CONFIGURE_ENABLE=	libssh
310
323
324
# tesseract
325
TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
326
TESSERACT_CONFIGURE_ENABLE=	libtesseract
327
311
# theora
328
# theora
312
THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
329
THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
313
THEORA_CONFIGURE_ENABLE=	libtheora
330
THEORA_CONFIGURE_ENABLE=	libtheora
Lines 329-339 Link Here
329
NEON_CONFIGURE_ENABLE=	neon
346
NEON_CONFIGURE_ENABLE=	neon
330
NEON_CONFIGURE_ON=	--cpu=armv7-a
347
NEON_CONFIGURE_ON=	--cpu=armv7-a
331
348
332
# vo-aacenc
333
VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:audio/vo-aacenc
334
VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
335
VO_AACENC_IMPLIES=	GPL3
336
337
# vo-amrwbenc
349
# vo-amrwbenc
338
VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
350
VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
339
VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
351
VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
Lines 384-389 Link Here
384
XVIDEO_USE=		XORG=xv
396
XVIDEO_USE=		XORG=xv
385
XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
397
XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv
386
398
399
# zimg
400
ZIMG_LIB_DEPENDS=	libzimg.so:graphics/sekrit-twc-zimg
401
ZIMG_CONFIGURE_ENABLE=	libzimg
402
387
# zmq
403
# zmq
388
ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
404
ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
389
ZMQ_CONFIGURE_ENABLE=	libzmq
405
ZMQ_CONFIGURE_ENABLE=	libzmq
Lines 422-429 Link Here
422
		--enable-avfilter \
438
		--enable-avfilter \
423
		--enable-avresample \
439
		--enable-avresample \
424
		--enable-pthreads \
440
		--enable-pthreads \
425
		--disable-libstagefright-h264 \
426
		--disable-libutvideo \
427
		--disable-libsoxr \
441
		--disable-libsoxr \
428
		--cc="${CC}" \
442
		--cc="${CC}" \
429
		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
443
		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
Lines 455-462 Link Here
455
		s|gsm/gsm.h|gsm.h|g" \
469
		s|gsm/gsm.h|gsm.h|g" \
456
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
470
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
457
	@${REINPLACE_CMD} -e 's|-ldl||' \
471
	@${REINPLACE_CMD} -e 's|-ldl||' \
458
		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
472
		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
459
		-e 's|freetype/freetype.h|freetype.h|g' \
460
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
473
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
461
474
462
post-patch-SDL-on:
475
post-patch-SDL-on:
Lines 463-471 Link Here
463
	@${REINPLACE_CMD} -E \
476
	@${REINPLACE_CMD} -E \
464
		-e 's|sdl-config|${SDL_CONFIG}|g' \
477
		-e 's|sdl-config|${SDL_CONFIG}|g' \
465
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
478
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
466
	@${FIND} ${WRKSRC} -type f | \
479
	@${REINPLACE_CMD} -E \
467
		${XARGS} -n 10 ${REINPLACE_CMD} -E \
480
		-e 's|#include <SDL|#include <SDL2/SDL|' \
468
		-e 's|#include <SDL|#include <SDL/SDL|'
481
		${WRKSRC}/ffplay.c \
482
		${WRKSRC}/libavdevice/opengl_enc.c \
483
		${WRKSRC}/libavdevice/sdl2.c
469
484
470
post-configure-THEORA-off:
485
post-configure-THEORA-off:
471
	@${REINPLACE_CMD} -E \
486
	@${REINPLACE_CMD} -E \
(-)b/head/multimedia/ffmpeg/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1474303802
1
TIMESTAMP = 1480150693
2
SHA256 (ffmpeg-2.8.8.tar.bz2) = b70848958feadca180315d17b1131a1b519527971590e6ee8363a4c568ed06a6
2
SHA256 (ffmpeg-3.2.1.tar.bz2) = 72abc55bea5ff5397ac82320fa5c4843a05f527d0d7912d66784c92fdfbd12fb
3
SIZE (ffmpeg-2.8.8.tar.bz2) = 8583641
3
SIZE (ffmpeg-3.2.1.tar.bz2) = 9613356
(-)b/head/multimedia/ffmpeg/files/patch-configure (-11 / +8 lines)
Lines 1-6 Link Here
1
--- configure.orig	2015-06-19 20:47:55 UTC
1
--- configure.orig	2016-10-27 16:17:39 UTC
2
+++ configure
2
+++ configure
3
@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
3
@@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s))
4
 host_os=$target_os_default
4
 host_os=$target_os_default
5
 
5
 
6
 # machine
6
 # machine
Lines 14-33 Link Here
14
 cpu="generic"
14
 cpu="generic"
15
 intrinsics="none"
15
 intrinsics="none"
16
 
16
 
17
@@ -5682,7 +5677,11 @@ elif enabled gcc; then
17
@@ -6213,6 +6208,9 @@ elif enabled llvm_gcc; then
18
 elif enabled llvm_gcc; then
18
 elif enabled clang; then
19
     check_cflags -mllvm -stack-alignment=16
19
     check_cflags -mllvm -stack-alignment=16
20
 elif enabled clang; then
20
     check_cflags -mstack-alignment=16
21
-    check_cflags -mllvm -stack-alignment=16
22
+    if enabled x86_32; then
21
+    if enabled x86_32; then
23
+        check_cflags -mllvm -stack-alignment=16
24
+        check_cflags -mstack-alignment=16
25
+        check_cflags -mstackrealign
22
+        check_cflags -mstackrealign
26
+    fi
23
+    fi
27
     check_cflags -Qunused-arguments
24
     check_cflags -Qunused-arguments
28
     check_cflags -Werror=implicit-function-declaration
25
     check_cflags -Werror=implicit-function-declaration
29
     check_cflags -Werror=missing-prototypes
26
     check_cflags -Werror=missing-prototypes
30
@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
27
@@ -6562,7 +6560,7 @@ ifndef MAIN_MAKEFILE
31
 SRC_PATH:=\$(SRC_PATH:.%=..%)
28
 SRC_PATH:=\$(SRC_PATH:.%=..%)
32
 endif
29
 endif
33
 CC_IDENT=$cc_ident
30
 CC_IDENT=$cc_ident
Lines 36-42 Link Here
36
 INTRINSICS=$intrinsics
33
 INTRINSICS=$intrinsics
37
 CC=$cc
34
 CC=$cc
38
 CXX=$cxx
35
 CXX=$cxx
39
@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
36
@@ -6799,7 +6797,7 @@ exec_prefix=\${prefix}
40
 libdir=$libdir
37
 libdir=$libdir
41
 includedir=$incdir
38
 includedir=$incdir
42
 
39
 
Lines 45-51 Link Here
45
 Description: $comment
42
 Description: $comment
46
 Version: $version
43
 Version: $version
47
 Requires: $(enabled shared || echo $requires)
44
 Requires: $(enabled shared || echo $requires)
48
@@ -6049,10 +6044,10 @@ EOF
45
@@ -6813,10 +6811,10 @@ EOF
49
 mkdir -p doc/examples/pc-uninstalled
46
 mkdir -p doc/examples/pc-uninstalled
50
 includedir=${source_path}
47
 includedir=${source_path}
51
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
48
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
(-)a/head/multimedia/ffmpeg/files/patch-kvazaar-0.7 (-73 lines)
Removed Link Here
1
From b3777b2c2eb5d04386992c0388985914d5bbebba Mon Sep 17 00:00:00 2001
2
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
3
Date: Mon, 28 Sep 2015 10:55:14 +0300
4
Subject: libkvazaar: Update to work with the latest version
5
MIME-Version: 1.0
6
Content-Type: text/plain; charset=UTF-8
7
Content-Transfer-Encoding: 8bit
8
9
Function encoder_encode in Kvazaar API was changed to have new output
10
parameters: source picture and frame info. Frame info is used to set the
11
keyframe flag and source picture is ignored.
12
13
Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
14
---
15
 libavcodec/libkvazaar.c | 16 +++++++++++++++-
16
 1 file changed, 15 insertions(+), 1 deletion(-)
17
18
diff --git configure configure
19
index 4cc45ad..af3fbf4 100755
20
--- configure
21
+++ configure
22
@@ -5237,7 +5237,7 @@
23
                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
24
                                done || die "ERROR: libgsm not found"; }
25
 enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
26
-enabled libkvazaar        && require_pkg_config "kvazaar < 0.7.0" kvazaar.h kvz_api_get
27
+enabled libkvazaar        && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get
28
 enabled libmfx            && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
29
 enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
30
 enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
31
diff --git libavcodec/libkvazaar.c libavcodec/libkvazaar.c
32
index 9fb5be7..7430e0a 100644
33
--- libavcodec/libkvazaar.c
34
+++ libavcodec/libkvazaar.c
35
@@ -137,8 +137,11 @@ static int libkvazaar_encode(AVCodecContext *avctx,
36
 {
37
     int retval = 0;
38
     kvz_picture *img_in = NULL;
39
+
40
     kvz_data_chunk *data_out = NULL;
41
     uint32_t len_out = 0;
42
+    kvz_frame_info frame_info;
43
+
44
     LibkvazaarContext *ctx = avctx->priv_data;
45
 
46
     *got_packet_ptr = 0;
47
@@ -173,7 +176,10 @@ static int libkvazaar_encode(AVCodecContext *avctx,
48
         }
49
     }
50
 
51
-    if (!ctx->api->encoder_encode(ctx->encoder, img_in, &data_out, &len_out, NULL)) {
52
+    if (!ctx->api->encoder_encode(ctx->encoder, img_in,
53
+                                  &data_out, &len_out,
54
+                                  NULL, NULL,
55
+                                  &frame_info)) {
56
         av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
57
         retval = AVERROR_EXTERNAL;
58
         goto done;
59
@@ -198,6 +204,14 @@ static int libkvazaar_encode(AVCodecContext *avctx,
60
 
61
         ctx->api->chunk_free(data_out);
62
         data_out = NULL;
63
+
64
+        avpkt->flags = 0;
65
+        // IRAP VCL NAL unit types span the range
66
+        // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
67
+        if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP &&
68
+                frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
69
+            avpkt->flags |= AV_PKT_FLAG_KEY;
70
+        }
71
     }
72
 
73
 done:
(-)b/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile (-5 / +5 lines)
Lines 1-9 Link Here
1
--- libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
1
--- libavcodec/Makefile.orig	2016-02-15 02:29:38 UTC
2
+++ libavcodec/Makefile
2
+++ libavcodec/Makefile
3
@@ -877,7 +877,7 @@ SKIPHEADERS                            +
3
@@ -935,7 +935,7 @@ SKIPHEADERS                            +
4
                                           old_codec_ids.h               \
4
                                           aaccoder_trellis.h            \
5
                                           tableprint.h                  \
5
                                           aacenc_quantization.h         \
6
                                           tableprint_vlc.h              \
6
                                           aacenc_quantization_misc.h    \
7
-                                          $(ARCH)/vp56_arith.h          \
7
-                                          $(ARCH)/vp56_arith.h          \
8
+                                          $(FFMPEG_ARCH)/vp56_arith.h          \
8
+                                          $(FFMPEG_ARCH)/vp56_arith.h          \
9
 
9
 
(-)a/head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c (-12 lines)
Removed Link Here
1
--- libavfilter/vf_libopencv.c.orig	2015-06-19 20:44:50 UTC
2
+++ libavfilter/vf_libopencv.c
3
@@ -23,8 +23,7 @@
4
  * libopencv wrapper functions
5
  */
6
 
7
-#include <opencv/cv.h>
8
-#include <opencv/cxcore.h>
9
+#include <opencv2/imgproc/imgproc_c.h>
10
 #include "libavutil/avstring.h"
11
 #include "libavutil/common.h"
12
 #include "libavutil/file.h"
(-)b/head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c (-10 / +9 lines)
Lines 1-6 Link Here
1
--- libavformat/rtsp.c.orig	2016-11-26 17:12:14 UTC
1
--- libavformat/rtsp.c.orig	2016-10-27 16:17:40 UTC
2
+++ libavformat/rtsp.c
2
+++ libavformat/rtsp.c
3
@@ -1598,7 +1598,12 @@ int ff_rtsp_make_setup_request(AVFormatC
3
@@ -1614,7 +1614,12 @@ int ff_rtsp_make_setup_request(AVFormatC
4
             }
4
             }
5
             if (ttl > 0)
5
             if (ttl > 0)
6
                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
6
                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
Lines 14-20 Link Here
14
                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
14
                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
15
             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
15
             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
16
                         port, "%s", optbuf);
16
                         port, "%s", optbuf);
17
@@ -1806,8 +1811,13 @@ redirect:
17
@@ -1830,8 +1835,13 @@ redirect:
18
         goto fail;
18
         goto fail;
19
     }
19
     }
20
     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
20
     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
Lines 30-46 Link Here
30
     }
30
     }
31
 
31
 
32
     /* request options supported by the server; this also detects server
32
     /* request options supported by the server; this also detects server
33
@@ -2283,7 +2293,12 @@ static int sdp_read_header(AVFormatConte
33
@@ -2310,7 +2320,11 @@ static int sdp_read_header(AVFormatConte
34
         if (!(rt->rtsp_flags & RTSP_FLAG_CUSTOM_IO)) {
35
             AVDictionary *opts = map_to_opts(rt);
34
             AVDictionary *opts = map_to_opts(rt);
36
 
35
 
37
-            getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, sizeof(rtsp_st->sdp_ip),
36
             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
38
+            getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
37
-                              sizeof(rtsp_st->sdp_ip),
39
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
38
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
40
+                        ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
39
+                        ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
41
+#else
40
+#else
42
+                        sizeof(rtsp_st->sdp_ip),
41
+                        sizeof(rtsp_st->sdp_ip),
43
+#endif
42
+#endif
44
                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
43
                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
45
             ff_url_join(url, sizeof(url), "rtp", NULL,
44
             if (err) {
46
                         namebuf, rtsp_st->sdp_port,
45
                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
(-)b/head/multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c (+56 lines)
Added Link Here
1
--- libavformat/tls_openssl.c.orig	2016-10-27 16:17:40 UTC
2
+++ libavformat/tls_openssl.c
3
@@ -43,7 +43,7 @@ typedef struct TLSContext {
4
     TLSShared tls_shared;
5
     SSL_CTX *ctx;
6
     SSL *ssl;
7
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
8
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
9
     BIO_METHOD* url_bio_method;
10
 #endif
11
 } TLSContext;
12
@@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(v
13
 
14
 static int url_bio_create(BIO *b)
15
 {
16
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
17
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
18
     BIO_set_init(b, 1);
19
     BIO_set_data(b, NULL);
20
     BIO_set_flags(b, 0);
21
@@ -85,7 +85,7 @@ static int url_bio_destroy(BIO *b)
22
     return 1;
23
 }
24
 
25
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
26
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
27
 #define GET_BIO_DATA(x) BIO_get_data(x);
28
 #else
29
 #define GET_BIO_DATA(x) (x)->ptr;
30
@@ -133,7 +133,7 @@ static int url_bio_bputs(BIO *b, const c
31
     return url_bio_bwrite(b, str, strlen(str));
32
 }
33
 
34
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
35
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
36
 static BIO_METHOD url_bio_method = {
37
     .type = BIO_TYPE_SOURCE_SINK,
38
     .name = "urlprotocol bio",
39
@@ -212,7 +212,7 @@ static int tls_close(URLContext *h)
40
         SSL_CTX_free(c->ctx);
41
     if (c->tls_shared.tcp)
42
         ffurl_close(c->tls_shared.tcp);
43
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
44
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
45
     if (c->url_bio_method)
46
         BIO_meth_free(c->url_bio_method);
47
 #endif
48
@@ -265,7 +265,7 @@ static int tls_open(URLContext *h, const
49
         ret = AVERROR(EIO);
50
         goto fail;
51
     }
52
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
53
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
54
     p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
55
     BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
56
     BIO_meth_set_read(p->url_bio_method, url_bio_bread);
(-)b/head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile (+11 lines)
Added Link Here
1
--- tests/checkasm/Makefile.orig	2016-10-01 01:12:42 UTC
2
+++ tests/checkasm/Makefile
3
@@ -24,7 +24,7 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER)
4
 CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
5
 
6
 
7
--include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
8
+-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile
9
 
10
 CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
11
 CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
(-)b/head/multimedia/ffmpeg/pkg-plist (-24 / +34 lines)
Lines 3-14 Link Here
3
bin/ffprobe
3
bin/ffprobe
4
%%FFSERVER%%bin/ffserver
4
%%FFSERVER%%bin/ffserver
5
%%FFSERVER%%@sample etc/ffserver.conf.sample
5
%%FFSERVER%%@sample etc/ffserver.conf.sample
6
%%OPENCL%%include/libavutil/opencl.h
6
include/libavcodec/avcodec.h
7
include/libavcodec/avcodec.h
8
include/libavcodec/avdct.h
7
include/libavcodec/avfft.h
9
include/libavcodec/avfft.h
8
include/libavcodec/d3d11va.h
10
include/libavcodec/d3d11va.h
11
include/libavcodec/dirac.h
9
include/libavcodec/dv_profile.h
12
include/libavcodec/dv_profile.h
10
include/libavcodec/dxva2.h
13
include/libavcodec/dxva2.h
11
include/libavcodec/old_codec_ids.h
14
include/libavcodec/jni.h
15
include/libavcodec/mediacodec.h
12
include/libavcodec/qsv.h
16
include/libavcodec/qsv.h
13
include/libavcodec/vaapi.h
17
include/libavcodec/vaapi.h
14
include/libavcodec/vda.h
18
include/libavcodec/vda.h
Lines 19-26 Link Here
19
include/libavcodec/xvmc.h
23
include/libavcodec/xvmc.h
20
include/libavdevice/avdevice.h
24
include/libavdevice/avdevice.h
21
include/libavdevice/version.h
25
include/libavdevice/version.h
22
include/libavfilter/asrc_abuffer.h
23
include/libavfilter/avcodec.h
24
include/libavfilter/avfilter.h
26
include/libavfilter/avfilter.h
25
include/libavfilter/avfiltergraph.h
27
include/libavfilter/avfiltergraph.h
26
include/libavfilter/buffersink.h
28
include/libavfilter/buffersink.h
Lines 33-41 Link Here
33
include/libavresample/version.h
35
include/libavresample/version.h
34
include/libavutil/adler32.h
36
include/libavutil/adler32.h
35
include/libavutil/aes.h
37
include/libavutil/aes.h
38
include/libavutil/aes_ctr.h
36
include/libavutil/attributes.h
39
include/libavutil/attributes.h
37
include/libavutil/audio_fifo.h
40
include/libavutil/audio_fifo.h
38
include/libavutil/audioconvert.h
39
include/libavutil/avassert.h
41
include/libavutil/avassert.h
40
include/libavutil/avconfig.h
42
include/libavutil/avconfig.h
41
include/libavutil/avstring.h
43
include/libavutil/avstring.h
Lines 51-56 Link Here
51
include/libavutil/common.h
53
include/libavutil/common.h
52
include/libavutil/cpu.h
54
include/libavutil/cpu.h
53
include/libavutil/crc.h
55
include/libavutil/crc.h
56
include/libavutil/des.h
54
include/libavutil/dict.h
57
include/libavutil/dict.h
55
include/libavutil/display.h
58
include/libavutil/display.h
56
include/libavutil/downmix_info.h
59
include/libavutil/downmix_info.h
Lines 62-67 Link Here
62
include/libavutil/frame.h
65
include/libavutil/frame.h
63
include/libavutil/hash.h
66
include/libavutil/hash.h
64
include/libavutil/hmac.h
67
include/libavutil/hmac.h
68
include/libavutil/hwcontext.h
69
include/libavutil/hwcontext_cuda.h
70
include/libavutil/hwcontext_dxva2.h
71
include/libavutil/hwcontext_qsv.h
72
include/libavutil/hwcontext_vaapi.h
73
include/libavutil/hwcontext_vdpau.h
65
include/libavutil/imgutils.h
74
include/libavutil/imgutils.h
66
include/libavutil/intfloat.h
75
include/libavutil/intfloat.h
67
include/libavutil/intreadwrite.h
76
include/libavutil/intreadwrite.h
Lines 69-81 Link Here
69
include/libavutil/log.h
78
include/libavutil/log.h
70
include/libavutil/lzo.h
79
include/libavutil/lzo.h
71
include/libavutil/macros.h
80
include/libavutil/macros.h
81
include/libavutil/mastering_display_metadata.h
72
include/libavutil/mathematics.h
82
include/libavutil/mathematics.h
73
include/libavutil/md5.h
83
include/libavutil/md5.h
74
include/libavutil/mem.h
84
include/libavutil/mem.h
75
include/libavutil/motion_vector.h
85
include/libavutil/motion_vector.h
76
include/libavutil/murmur3.h
86
include/libavutil/murmur3.h
77
include/libavutil/old_pix_fmts.h
78
%%OPENCL%%include/libavutil/opencl.h
79
include/libavutil/opt.h
87
include/libavutil/opt.h
80
include/libavutil/parseutils.h
88
include/libavutil/parseutils.h
81
include/libavutil/pixdesc.h
89
include/libavutil/pixdesc.h
Lines 83-88 Link Here
83
include/libavutil/pixfmt.h
91
include/libavutil/pixfmt.h
84
include/libavutil/random_seed.h
92
include/libavutil/random_seed.h
85
include/libavutil/rational.h
93
include/libavutil/rational.h
94
include/libavutil/rc4.h
86
include/libavutil/replaygain.h
95
include/libavutil/replaygain.h
87
include/libavutil/ripemd.h
96
include/libavutil/ripemd.h
88
include/libavutil/samplefmt.h
97
include/libavutil/samplefmt.h
Lines 94-99 Link Here
94
include/libavutil/time.h
103
include/libavutil/time.h
95
include/libavutil/timecode.h
104
include/libavutil/timecode.h
96
include/libavutil/timestamp.h
105
include/libavutil/timestamp.h
106
include/libavutil/tree.h
97
include/libavutil/twofish.h
107
include/libavutil/twofish.h
98
include/libavutil/version.h
108
include/libavutil/version.h
99
include/libavutil/xtea.h
109
include/libavutil/xtea.h
Lines 105-144 Link Here
105
include/libswscale/version.h
115
include/libswscale/version.h
106
lib/libavcodec.a
116
lib/libavcodec.a
107
lib/libavcodec.so
117
lib/libavcodec.so
108
lib/libavcodec.so.56
118
lib/libavcodec.so.57
109
lib/libavcodec.so.56.60.100
119
lib/libavcodec.so.57.64.101
110
lib/libavdevice.a
120
lib/libavdevice.a
111
lib/libavdevice.so
121
lib/libavdevice.so
112
lib/libavdevice.so.56
122
lib/libavdevice.so.57
113
lib/libavdevice.so.56.4.100
123
lib/libavdevice.so.57.1.100
114
lib/libavfilter.a
124
lib/libavfilter.a
115
lib/libavfilter.so
125
lib/libavfilter.so
116
lib/libavfilter.so.5
126
lib/libavfilter.so.6
117
lib/libavfilter.so.5.40.101
127
lib/libavfilter.so.6.65.100
118
lib/libavformat.a
128
lib/libavformat.a
119
lib/libavformat.so
129
lib/libavformat.so
120
lib/libavformat.so.56
130
lib/libavformat.so.57
121
lib/libavformat.so.56.40.101
131
lib/libavformat.so.57.56.100
122
lib/libavresample.a
132
lib/libavresample.a
123
lib/libavresample.so
133
lib/libavresample.so
124
lib/libavresample.so.2
134
lib/libavresample.so.3
125
lib/libavresample.so.2.1.0
135
lib/libavresample.so.3.1.0
126
lib/libavutil.a
136
lib/libavutil.a
127
lib/libavutil.so
137
lib/libavutil.so
128
lib/libavutil.so.54
138
lib/libavutil.so.55
129
lib/libavutil.so.54.31.100
139
lib/libavutil.so.55.34.100
130
lib/libpostproc.a
140
lib/libpostproc.a
131
lib/libpostproc.so
141
lib/libpostproc.so
132
lib/libpostproc.so.53
142
lib/libpostproc.so.54
133
lib/libpostproc.so.53.3.100
143
lib/libpostproc.so.54.1.100
134
lib/libswresample.a
144
lib/libswresample.a
135
lib/libswresample.so
145
lib/libswresample.so
136
lib/libswresample.so.1
146
lib/libswresample.so.2
137
lib/libswresample.so.1.2.101
147
lib/libswresample.so.2.3.100
138
lib/libswscale.a
148
lib/libswscale.a
139
lib/libswscale.so
149
lib/libswscale.so
140
lib/libswscale.so.3
150
lib/libswscale.so.4
141
lib/libswscale.so.3.1.101
151
lib/libswscale.so.4.2.100
142
libdata/pkgconfig/libavcodec.pc
152
libdata/pkgconfig/libavcodec.pc
143
libdata/pkgconfig/libavdevice.pc
153
libdata/pkgconfig/libavdevice.pc
144
libdata/pkgconfig/libavfilter.pc
154
libdata/pkgconfig/libavfilter.pc

Return to bug 207547