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

(-)multimedia/ffmpeg/Makefile (-15 / +4 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ffmpeg
4
PORTNAME=	ffmpeg
5
PORTVERSION=	3.2.4
5
PORTVERSION=	3.3
6
PORTREVISION=	8
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 19-25 Link Here
19
18
20
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
21
USES=		compiler:c11 cpe gmake localbase:ldflags perl5 \
20
USES=		compiler:c11 cpe gmake localbase:ldflags perl5 \
22
		pkgconfig shebangfix tar:bzip2
21
		pkgconfig shebangfix tar:xz
23
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
24
USE_PERL5=	build
23
USE_PERL5=	build
25
SHEBANG_FILES=	doc/texi2pod.pl
24
SHEBANG_FILES=	doc/texi2pod.pl
Lines 28-40 Link Here
28
PORTSCOUT=	limit:^3\.
27
PORTSCOUT=	limit:^3\.
29
28
30
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 \
31
		DEBUG DOCS EBUR128 FDK_AAC FFSERVER FLITE FONTCONFIG \
30
		DEBUG DOCS FDK_AAC FFSERVER FLITE FONTCONFIG \
32
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
31
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
33
		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
32
		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
34
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
33
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
35
		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \
34
		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \
36
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
35
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
37
		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
36
		VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XCB XVID \
38
		XVIDEO ZIMG ZMQ ZVBI
37
		XVIDEO ZIMG ZMQ ZVBI
39
38
40
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
39
OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \
Lines 59-65 Link Here
59
CDIO_DESC=	Audio CD grabbing with libcdio
58
CDIO_DESC=	Audio CD grabbing with libcdio
60
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
59
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
61
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
60
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
62
EBUR128_DESC=	EBU R128 measurement for loudnorm filter
63
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
61
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
64
FFSERVER_DESC=	Build and install ffserver
62
FFSERVER_DESC=	Build and install ffserver
65
FLITE_DESC=	Voice synthesis support via libflite
63
FLITE_DESC=	Voice synthesis support via libflite
Lines 79-85 Link Here
79
TESSERACT_DESC=	Optical Character Recognition via Tesseract
77
TESSERACT_DESC=	Optical Character Recognition via Tesseract
80
VFP_DESC=	Enable Vector Floating Point instructions
78
VFP_DESC=	Enable Vector Floating Point instructions
81
VIDSTAB_DESC=	Video stabilization filter
79
VIDSTAB_DESC=	Video stabilization filter
82
X11GRAB_DESC=	X11 grabbing (legacy)
83
XCB_DESC=	X11 grabbing using XCB
80
XCB_DESC=	X11 grabbing using XCB
84
ZIMG_DESC=	"z" library video scaling filter
81
ZIMG_DESC=	"z" library video scaling filter
85
ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
82
ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
Lines 139-148 Link Here
139
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
136
DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
140
DOCS_CONFIGURE_ENABLE=	htmlpages
137
DOCS_CONFIGURE_ENABLE=	htmlpages
141
138
142
# ebur128
143
EBUR128_LIB_DEPENDS=	libebur128.so:audio/libebur128
144
EBUR128_CONFIGURE_ENABLE=	libebur128
145
146
# fdk_aac
139
# fdk_aac
147
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
140
FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:audio/fdk-aac
148
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
141
FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
Lines 386-395 Link Here
386
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
379
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
387
WEBP_CONFIGURE_ENABLE=	libwebp
380
WEBP_CONFIGURE_ENABLE=	libwebp
388
381
389
# x11grab
390
X11GRAB_USE=		XORG=x11,xext,xfixes
391
X11GRAB_CONFIGURE_ENABLE=	x11grab
392
393
# x264
382
# x264
394
X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
383
X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
395
X264_CONFIGURE_ENABLE=	libx264
384
X264_CONFIGURE_ENABLE=	libx264
(-)multimedia/ffmpeg/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1486896628
1
TIMESTAMP = 1492174634
2
SHA256 (ffmpeg-3.2.4.tar.bz2) = c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4
2
SHA256 (ffmpeg-3.3.tar.xz) = 599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d
3
SIZE (ffmpeg-3.2.4.tar.bz2) = 9612274
3
SIZE (ffmpeg-3.3.tar.xz) = 8274000
(-)multimedia/ffmpeg/files/patch-configure (-8 / +8 lines)
Lines 1-6 Link Here
1
--- configure.orig	2016-10-27 16:17:39 UTC
1
--- configure.orig	2017-04-13 01:55:54 UTC
2
+++ configure
2
+++ configure
3
@@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s))
3
@@ -3262,12 +3262,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-20 Link Here
14
 cpu="generic"
14
 cpu="generic"
15
 intrinsics="none"
15
 intrinsics="none"
16
 
16
 
17
@@ -6213,6 +6208,9 @@ elif enabled llvm_gcc; then
17
@@ -6295,6 +6290,9 @@ elif enabled llvm_gcc; then
18
 elif enabled clang; then
18
 elif enabled clang; then
19
     check_cflags -mllvm -stack-alignment=16
19
     check_cflags -mllvm -stack-alignment=16
20
     check_cflags -mstack-alignment=16
20
     check_cflags -mstack-alignment=16
Lines 24-30 Link Here
24
     check_cflags -Qunused-arguments
24
     check_cflags -Qunused-arguments
25
     check_cflags -Werror=implicit-function-declaration
25
     check_cflags -Werror=implicit-function-declaration
26
     check_cflags -Werror=missing-prototypes
26
     check_cflags -Werror=missing-prototypes
27
@@ -6799,7 +6797,7 @@ exec_prefix=\${prefix}
27
@@ -6900,7 +6898,7 @@ exec_prefix=\${prefix}
28
 libdir=$libdir
28
 libdir=$libdir
29
 includedir=$incdir
29
 includedir=$incdir
30
 
30
 
Lines 33-48 Link Here
33
 Description: $comment
33
 Description: $comment
34
 Version: $version
34
 Version: $version
35
 Requires: $(enabled shared || echo $requires)
35
 Requires: $(enabled shared || echo $requires)
36
@@ -6813,10 +6811,10 @@ EOF
36
@@ -6914,10 +6912,10 @@ EOF
37
 mkdir -p doc/examples/pc-uninstalled
37
 mkdir -p doc/examples/pc-uninstalled
38
 includedir=${source_path}
38
 includedir=${source_path}
39
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
39
 [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
40
-    cat <<EOF > doc/examples/pc-uninstalled/$name.pc
40
-    cat <<EOF > doc/examples/pc-uninstalled/${name}-uninstalled.pc
41
+    cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
41
+    cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}-uninstalled.pc
42
 prefix=
42
 prefix=
43
 exec_prefix=
43
 exec_prefix=
44
-libdir=\${pcfiledir}/../../../$name
44
-libdir=\${pcfiledir}/../../../$name
45
+libdir=\${pcfiledir}/../../../${name}${build_suffix}
45
+libdir=\${pcfiledir}/../../../${name}${build_suffix}.pc
46
 includedir=${includedir}
46
 includedir=${includedir}
47
 
47
 
48
 Name: $name
48
 Name: $name
(-)multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c (-6 / +6 lines)
Lines 1-4 Link Here
1
--- libavformat/tls_openssl.c.orig	2016-10-27 16:17:40 UTC
1
--- libavformat/tls_openssl.c.orig	2017-04-13 01:55:55 UTC
2
+++ libavformat/tls_openssl.c
2
+++ libavformat/tls_openssl.c
3
@@ -43,7 +43,7 @@ typedef struct TLSContext {
3
@@ -43,7 +43,7 @@ typedef struct TLSContext {
4
     TLSShared tls_shared;
4
     TLSShared tls_shared;
Lines 24-33 Link Here
24
 
24
 
25
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
25
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
26
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
26
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
27
 #define GET_BIO_DATA(x) BIO_get_data(x);
27
 #define GET_BIO_DATA(x) BIO_get_data(x)
28
 #else
28
 #else
29
 #define GET_BIO_DATA(x) (x)->ptr;
29
 #define GET_BIO_DATA(x) (x)->ptr
30
@@ -133,7 +133,7 @@ static int url_bio_bputs(BIO *b, const c
30
@@ -129,7 +129,7 @@ static int url_bio_bputs(BIO *b, const c
31
     return url_bio_bwrite(b, str, strlen(str));
31
     return url_bio_bwrite(b, str, strlen(str));
32
 }
32
 }
33
 
33
 
Lines 36-42 Link Here
36
 static BIO_METHOD url_bio_method = {
36
 static BIO_METHOD url_bio_method = {
37
     .type = BIO_TYPE_SOURCE_SINK,
37
     .type = BIO_TYPE_SOURCE_SINK,
38
     .name = "urlprotocol bio",
38
     .name = "urlprotocol bio",
39
@@ -212,7 +212,7 @@ static int tls_close(URLContext *h)
39
@@ -208,7 +208,7 @@ static int tls_close(URLContext *h)
40
         SSL_CTX_free(c->ctx);
40
         SSL_CTX_free(c->ctx);
41
     if (c->tls_shared.tcp)
41
     if (c->tls_shared.tcp)
42
         ffurl_close(c->tls_shared.tcp);
42
         ffurl_close(c->tls_shared.tcp);
Lines 45-51 Link Here
45
     if (c->url_bio_method)
45
     if (c->url_bio_method)
46
         BIO_meth_free(c->url_bio_method);
46
         BIO_meth_free(c->url_bio_method);
47
 #endif
47
 #endif
48
@@ -265,7 +265,7 @@ static int tls_open(URLContext *h, const
48
@@ -266,7 +266,7 @@ static int tls_open(URLContext *h, const
49
         ret = AVERROR(EIO);
49
         ret = AVERROR(EIO);
50
         goto fail;
50
         goto fail;
51
     }
51
     }
(-)multimedia/ffmpeg/pkg-plist (-10 / +14 lines)
Lines 97-102 Link Here
97
include/libavutil/samplefmt.h
97
include/libavutil/samplefmt.h
98
include/libavutil/sha.h
98
include/libavutil/sha.h
99
include/libavutil/sha512.h
99
include/libavutil/sha512.h
100
include/libavutil/spherical.h
100
include/libavutil/stereo3d.h
101
include/libavutil/stereo3d.h
101
include/libavutil/tea.h
102
include/libavutil/tea.h
102
include/libavutil/threadmessage.h
103
include/libavutil/threadmessage.h
Lines 116-154 Link Here
116
lib/libavcodec.a
117
lib/libavcodec.a
117
lib/libavcodec.so
118
lib/libavcodec.so
118
lib/libavcodec.so.57
119
lib/libavcodec.so.57
119
lib/libavcodec.so.57.64.101
120
lib/libavcodec.so.57.89.100
120
lib/libavdevice.a
121
lib/libavdevice.a
121
lib/libavdevice.so
122
lib/libavdevice.so
122
lib/libavdevice.so.57
123
lib/libavdevice.so.57
123
lib/libavdevice.so.57.1.100
124
lib/libavdevice.so.57.6.100
124
lib/libavfilter.a
125
lib/libavfilter.a
125
lib/libavfilter.so
126
lib/libavfilter.so
126
lib/libavfilter.so.6
127
lib/libavfilter.so.6
127
lib/libavfilter.so.6.65.100
128
lib/libavfilter.so.6.82.100
128
lib/libavformat.a
129
lib/libavformat.a
129
lib/libavformat.so
130
lib/libavformat.so
130
lib/libavformat.so.57
131
lib/libavformat.so.57
131
lib/libavformat.so.57.56.101
132
lib/libavformat.so.57.71.100
132
lib/libavresample.a
133
lib/libavresample.a
133
lib/libavresample.so
134
lib/libavresample.so
134
lib/libavresample.so.3
135
lib/libavresample.so.3
135
lib/libavresample.so.3.1.0
136
lib/libavresample.so.3.5.0
136
lib/libavutil.a
137
lib/libavutil.a
137
lib/libavutil.so
138
lib/libavutil.so
138
lib/libavutil.so.55
139
lib/libavutil.so.55
139
lib/libavutil.so.55.34.101
140
lib/libavutil.so.55.58.100
140
lib/libpostproc.a
141
lib/libpostproc.a
141
lib/libpostproc.so
142
lib/libpostproc.so
142
lib/libpostproc.so.54
143
lib/libpostproc.so.54
143
lib/libpostproc.so.54.1.100
144
lib/libpostproc.so.54.5.100
144
lib/libswresample.a
145
lib/libswresample.a
145
lib/libswresample.so
146
lib/libswresample.so
146
lib/libswresample.so.2
147
lib/libswresample.so.2
147
lib/libswresample.so.2.3.100
148
lib/libswresample.so.2.7.100
148
lib/libswscale.a
149
lib/libswscale.a
149
lib/libswscale.so
150
lib/libswscale.so
150
lib/libswscale.so.4
151
lib/libswscale.so.4
151
lib/libswscale.so.4.2.100
152
lib/libswscale.so.4.6.100
152
libdata/pkgconfig/libavcodec.pc
153
libdata/pkgconfig/libavcodec.pc
153
libdata/pkgconfig/libavdevice.pc
154
libdata/pkgconfig/libavdevice.pc
154
libdata/pkgconfig/libavfilter.pc
155
libdata/pkgconfig/libavfilter.pc
Lines 186-193 Link Here
186
%%DATADIR%%/examples/README
187
%%DATADIR%%/examples/README
187
%%DATADIR%%/examples/avio_dir_cmd.c
188
%%DATADIR%%/examples/avio_dir_cmd.c
188
%%DATADIR%%/examples/avio_reading.c
189
%%DATADIR%%/examples/avio_reading.c
189
%%DATADIR%%/examples/decoding_encoding.c
190
%%DATADIR%%/examples/decode_audio.c
191
%%DATADIR%%/examples/decode_video.c
190
%%DATADIR%%/examples/demuxing_decoding.c
192
%%DATADIR%%/examples/demuxing_decoding.c
193
%%DATADIR%%/examples/encode_audio.c
194
%%DATADIR%%/examples/encode_video.c
191
%%DATADIR%%/examples/extract_mvs.c
195
%%DATADIR%%/examples/extract_mvs.c
192
%%DATADIR%%/examples/filter_audio.c
196
%%DATADIR%%/examples/filter_audio.c
193
%%DATADIR%%/examples/filtering_audio.c
197
%%DATADIR%%/examples/filtering_audio.c

Return to bug 218658