FreeBSD Bugzilla – Attachment 181809 Details for
Bug 218658
multimedia/ffmpeg: update to 3.3 upstream branch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch after r438490
ffmpeg.diff.txt (text/plain), 8.64 KB, created by
Thomas Zander
on 2017-04-15 14:17:20 UTC
(
hide
)
Description:
Updated patch after r438490
Filename:
MIME Type:
Creator:
Thomas Zander
Created:
2017-04-15 14:17:20 UTC
Size:
8.64 KB
patch
obsolete
>Index: multimedia/ffmpeg/Makefile >=================================================================== >--- multimedia/ffmpeg/Makefile (revision 438582) >+++ multimedia/ffmpeg/Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= ffmpeg >-PORTVERSION= 3.2.4 >-PORTREVISION= 8 >+PORTVERSION= 3.3 > PORTEPOCH= 1 > CATEGORIES= multimedia audio ipv6 net > MASTER_SITES= http://ffmpeg.org/releases/ >@@ -19,7 +18,7 @@ > > HAS_CONFIGURE= yes > USES= compiler:c11 cpe gmake localbase:ldflags perl5 \ >- pkgconfig shebangfix tar:bzip2 >+ pkgconfig shebangfix tar:xz > USE_LDCONFIG= yes > USE_PERL5= build > SHEBANG_FILES= doc/texi2pod.pl >@@ -28,13 +27,13 @@ > PORTSCOUT= limit:^3\. > > OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \ >- DEBUG DOCS EBUR128 FDK_AAC FFSERVER FLITE FONTCONFIG \ >+ DEBUG DOCS FDK_AAC FFSERVER FLITE FONTCONFIG \ > FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \ > LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \ > OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \ > RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SNDIO SOXR SPEEX SSH \ > TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \ >- VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \ >+ VO_AMRWBENC VPX WAVPACK WEBP X264 X265 XCB XVID \ > XVIDEO ZIMG ZMQ ZVBI > > OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ >@@ -59,7 +58,6 @@ > CDIO_DESC= Audio CD grabbing with libcdio > CHROMAPRINT_DESC= Audio fingerprinting with chromaprint > DC1394_DESC= IIDC-1394 grabbing using libdc1394 >-EBUR128_DESC= EBU R128 measurement for loudnorm filter > FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK > FFSERVER_DESC= Build and install ffserver > FLITE_DESC= Voice synthesis support via libflite >@@ -79,7 +77,6 @@ > TESSERACT_DESC= Optical Character Recognition via Tesseract > VFP_DESC= Enable Vector Floating Point instructions > VIDSTAB_DESC= Video stabilization filter >-X11GRAB_DESC= X11 grabbing (legacy) > XCB_DESC= X11 grabbing using XCB > ZIMG_DESC= "z" library video scaling filter > ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION} >@@ -139,10 +136,6 @@ > DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html > DOCS_CONFIGURE_ENABLE= htmlpages > >-# ebur128 >-EBUR128_LIB_DEPENDS= libebur128.so:audio/libebur128 >-EBUR128_CONFIGURE_ENABLE= libebur128 >- > # fdk_aac > FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac > FDK_AAC_CONFIGURE_ENABLE= libfdk-aac >@@ -386,10 +379,6 @@ > WEBP_LIB_DEPENDS= libwebp.so:graphics/webp > WEBP_CONFIGURE_ENABLE= libwebp > >-# x11grab >-X11GRAB_USE= XORG=x11,xext,xfixes >-X11GRAB_CONFIGURE_ENABLE= x11grab >- > # x264 > X264_LIB_DEPENDS= libx264.so:multimedia/libx264 > X264_CONFIGURE_ENABLE= libx264 >Index: multimedia/ffmpeg/distinfo >=================================================================== >--- multimedia/ffmpeg/distinfo (revision 438582) >+++ multimedia/ffmpeg/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1486896628 >-SHA256 (ffmpeg-3.2.4.tar.bz2) = c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4 >-SIZE (ffmpeg-3.2.4.tar.bz2) = 9612274 >+TIMESTAMP = 1492174634 >+SHA256 (ffmpeg-3.3.tar.xz) = 599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d >+SIZE (ffmpeg-3.3.tar.xz) = 8274000 >Index: multimedia/ffmpeg/files/patch-configure >=================================================================== >--- multimedia/ffmpeg/files/patch-configure (revision 438582) >+++ multimedia/ffmpeg/files/patch-configure (working copy) >@@ -1,6 +1,6 @@ >---- configure.orig 2016-10-27 16:17:39 UTC >+--- configure.orig 2017-04-13 01:55:54 UTC > +++ configure >-@@ -3189,12 +3189,7 @@ target_os_default=$(tolower $(uname -s)) >+@@ -3262,12 +3262,7 @@ target_os_default=$(tolower $(uname -s)) > host_os=$target_os_default > > # machine >@@ -14,7 +14,7 @@ > cpu="generic" > intrinsics="none" > >-@@ -6213,6 +6208,9 @@ elif enabled llvm_gcc; then >+@@ -6295,6 +6290,9 @@ elif enabled llvm_gcc; then > elif enabled clang; then > check_cflags -mllvm -stack-alignment=16 > check_cflags -mstack-alignment=16 >@@ -24,7 +24,7 @@ > check_cflags -Qunused-arguments > check_cflags -Werror=implicit-function-declaration > check_cflags -Werror=missing-prototypes >-@@ -6799,7 +6797,7 @@ exec_prefix=\${prefix} >+@@ -6900,7 +6898,7 @@ exec_prefix=\${prefix} > libdir=$libdir > includedir=$incdir > >@@ -33,16 +33,16 @@ > Description: $comment > Version: $version > Requires: $(enabled shared || echo $requires) >-@@ -6813,10 +6811,10 @@ EOF >+@@ -6914,10 +6912,10 @@ EOF > mkdir -p doc/examples/pc-uninstalled > includedir=${source_path} > [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." >-- cat <<EOF > doc/examples/pc-uninstalled/$name.pc >-+ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc >+- cat <<EOF > doc/examples/pc-uninstalled/${name}-uninstalled.pc >++ cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}-uninstalled.pc > prefix= > exec_prefix= > -libdir=\${pcfiledir}/../../../$name >-+libdir=\${pcfiledir}/../../../${name}${build_suffix} >++libdir=\${pcfiledir}/../../../${name}${build_suffix}.pc > includedir=${includedir} > > Name: $name >Index: multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c >=================================================================== >--- multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c (revision 438582) >+++ multimedia/ffmpeg/files/patch-libavformat_tls__openssl.c (working copy) >@@ -1,4 +1,4 @@ >---- libavformat/tls_openssl.c.orig 2016-10-27 16:17:40 UTC >+--- libavformat/tls_openssl.c.orig 2017-04-13 01:55:55 UTC > +++ libavformat/tls_openssl.c > @@ -43,7 +43,7 @@ typedef struct TLSContext { > TLSShared tls_shared; >@@ -24,10 +24,10 @@ > > -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL > +#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) >- #define GET_BIO_DATA(x) BIO_get_data(x); >+ #define GET_BIO_DATA(x) BIO_get_data(x) > #else >- #define GET_BIO_DATA(x) (x)->ptr; >-@@ -133,7 +133,7 @@ static int url_bio_bputs(BIO *b, const c >+ #define GET_BIO_DATA(x) (x)->ptr >+@@ -129,7 +129,7 @@ static int url_bio_bputs(BIO *b, const c > return url_bio_bwrite(b, str, strlen(str)); > } > >@@ -36,7 +36,7 @@ > static BIO_METHOD url_bio_method = { > .type = BIO_TYPE_SOURCE_SINK, > .name = "urlprotocol bio", >-@@ -212,7 +212,7 @@ static int tls_close(URLContext *h) >+@@ -208,7 +208,7 @@ static int tls_close(URLContext *h) > SSL_CTX_free(c->ctx); > if (c->tls_shared.tcp) > ffurl_close(c->tls_shared.tcp); >@@ -45,7 +45,7 @@ > if (c->url_bio_method) > BIO_meth_free(c->url_bio_method); > #endif >-@@ -265,7 +265,7 @@ static int tls_open(URLContext *h, const >+@@ -266,7 +266,7 @@ static int tls_open(URLContext *h, const > ret = AVERROR(EIO); > goto fail; > } >Index: multimedia/ffmpeg/pkg-plist >=================================================================== >--- multimedia/ffmpeg/pkg-plist (revision 438582) >+++ multimedia/ffmpeg/pkg-plist (working copy) >@@ -97,6 +97,7 @@ > include/libavutil/samplefmt.h > include/libavutil/sha.h > include/libavutil/sha512.h >+include/libavutil/spherical.h > include/libavutil/stereo3d.h > include/libavutil/tea.h > include/libavutil/threadmessage.h >@@ -116,39 +117,39 @@ > lib/libavcodec.a > lib/libavcodec.so > lib/libavcodec.so.57 >-lib/libavcodec.so.57.64.101 >+lib/libavcodec.so.57.89.100 > lib/libavdevice.a > lib/libavdevice.so > lib/libavdevice.so.57 >-lib/libavdevice.so.57.1.100 >+lib/libavdevice.so.57.6.100 > lib/libavfilter.a > lib/libavfilter.so > lib/libavfilter.so.6 >-lib/libavfilter.so.6.65.100 >+lib/libavfilter.so.6.82.100 > lib/libavformat.a > lib/libavformat.so > lib/libavformat.so.57 >-lib/libavformat.so.57.56.101 >+lib/libavformat.so.57.71.100 > lib/libavresample.a > lib/libavresample.so > lib/libavresample.so.3 >-lib/libavresample.so.3.1.0 >+lib/libavresample.so.3.5.0 > lib/libavutil.a > lib/libavutil.so > lib/libavutil.so.55 >-lib/libavutil.so.55.34.101 >+lib/libavutil.so.55.58.100 > lib/libpostproc.a > lib/libpostproc.so > lib/libpostproc.so.54 >-lib/libpostproc.so.54.1.100 >+lib/libpostproc.so.54.5.100 > lib/libswresample.a > lib/libswresample.so > lib/libswresample.so.2 >-lib/libswresample.so.2.3.100 >+lib/libswresample.so.2.7.100 > lib/libswscale.a > lib/libswscale.so > lib/libswscale.so.4 >-lib/libswscale.so.4.2.100 >+lib/libswscale.so.4.6.100 > libdata/pkgconfig/libavcodec.pc > libdata/pkgconfig/libavdevice.pc > libdata/pkgconfig/libavfilter.pc >@@ -186,8 +187,11 @@ > %%DATADIR%%/examples/README > %%DATADIR%%/examples/avio_dir_cmd.c > %%DATADIR%%/examples/avio_reading.c >-%%DATADIR%%/examples/decoding_encoding.c >+%%DATADIR%%/examples/decode_audio.c >+%%DATADIR%%/examples/decode_video.c > %%DATADIR%%/examples/demuxing_decoding.c >+%%DATADIR%%/examples/encode_audio.c >+%%DATADIR%%/examples/encode_video.c > %%DATADIR%%/examples/extract_mvs.c > %%DATADIR%%/examples/filter_audio.c > %%DATADIR%%/examples/filtering_audio.c
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 218658
:
181785
| 181809