Attachment 167489 Details for Bug 207547 – svn diff to ffmpeg 3.0

svn diff to ffmpeg 3.0

ffmpeg30.diff.txt (text/plain), 9.55 KB, created by Thomas Zander on 2016-02-27 19:56:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2016-02-27 19:56:38 UTC

Size: 9.55 KB

patch

obsolete

>Index: Makefile
>===================================================================
>diff --git a/head/multimedia/ffmpeg/Makefile b/head/multimedia/ffmpeg/Makefile
>--- a/head/multimedia/ffmpeg/Makefile	(revision 409653)
>+++ b/head/multimedia/ffmpeg/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ffmpeg
>-PORTVERSION=	2.8.6
>+PORTVERSION=	3.0
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>@@ -22,13 +22,13 @@
> USE_PERL5=	build
> SHEBANG_FILES=	doc/texi2pod.pl
> 
>-OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
>+OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
> 		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
> 		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK LADSPA \
> 		LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \
>-		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \
>+		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
> 		RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
>-		THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \
>+		THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
> 		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
> 		XVIDEO ZMQ ZVBI
> 
>@@ -62,7 +62,6 @@
> NONFREE_DESC=	Allow use of nonfree code
> OPENCL_DESC=	Heterogeneous computing via OpenCL
> OPENH264_DESC=	H.264 video codec support via OpenH264
>-QUVI_DESC=	Flash media stream URLs
> RTCPU_DESC=	Detect CPU capabilities at runtime
> VFP_DESC=	Enable Vector Floating Point instructions
> VIDSTAB_DESC=	Video stabilization filter
>@@ -73,11 +72,6 @@
> 
> OPTIONS_SUB=	yes
> 
>-# aacplus
>-AACPLUS_LIB_DEPENDS=	libaacplus.so:${PORTSDIR}/audio/libaacplus
>-AACPLUS_CONFIGURE_ENABLE=	libaacplus
>-AACPLUS_IMPLIES=	NONFREE
>-
> # alsa
> ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
> 			--disable-outdev=alsa
>@@ -254,10 +248,6 @@
> PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
> 				--disable-outdev=pulse
> 
>-# quvi
>-QUVI_LIB_DEPENDS=	libquvi.so:${PORTSDIR}/multimedia/libquvi
>-QUVI_CONFIGURE_ENABLE=	libquvi
>-
> # rtcpu
> RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect
> 
>@@ -317,11 +307,6 @@
> NEON_CONFIGURE_ENABLE=	neon
> NEON_CONFIGURE_ON=	--cpu=armv7-a
> 
>-# vo-aacenc
>-VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
>-VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
>-VO_AACENC_IMPLIES=	GPL3
>-
> # vo-amrwbenc
> VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
> VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
>@@ -410,7 +395,6 @@
> 		--enable-avfilter \
> 		--enable-avresample \
> 		--enable-pthreads \
>-		--disable-libstagefright-h264 \
> 		--disable-libutvideo \
> 		--disable-libsoxr \
> 		--cc="${CC}" \
>@@ -443,8 +427,7 @@
> 		s|gsm/gsm.h|gsm.h|g" \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|-ldl||' \
>-		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
>-		-e 's|freetype/freetype.h|freetype.h|g' \
>+		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 
> post-patch-SDL-on:
>Index: distinfo
>===================================================================
>diff --git a/head/multimedia/ffmpeg/distinfo b/head/multimedia/ffmpeg/distinfo
>--- a/head/multimedia/ffmpeg/distinfo	(revision 409653)
>+++ b/head/multimedia/ffmpeg/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ffmpeg-2.8.6.tar.bz2) = 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62
>-SIZE (ffmpeg-2.8.6.tar.bz2) = 8582420
>+SHA256 (ffmpeg-3.0.tar.bz2) = f19ff77a2f7f736a41dd1499eef4784bf3cb7461f07c13a268164823590113c0
>+SIZE (ffmpeg-3.0.tar.bz2) = 8879514
>Index: files/patch-libavcodec-Makefile
>===================================================================
>diff --git a/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile
>--- a/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile	(revision 409653)
>+++ b/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile	(working copy)
>@@ -1,9 +1,9 @@
>---- libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
>+--- libavcodec/Makefile.orig	2016-02-15 02:29:38 UTC
> +++ libavcodec/Makefile
>-@@ -877,7 +877,7 @@ SKIPHEADERS                            +
>-                                           old_codec_ids.h               \
>-                                           tableprint.h                  \
>-                                           tableprint_vlc.h              \
>+@@ -935,7 +935,7 @@ SKIPHEADERS                            +
>+                                           aaccoder_trellis.h            \
>+                                           aacenc_quantization.h         \
>+                                           aacenc_quantization_misc.h    \
> -                                          $(ARCH)/vp56_arith.h          \
> +                                          $(FFMPEG_ARCH)/vp56_arith.h          \
>  
>Index: files/patch-libavfilter-vf_libopencv.c
>===================================================================
>diff --git a/head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c b/head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
>deleted file mode 10644
>--- a/head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c	(revision 409653)
>+++ /dev/null	(nonexistent)
>@@ -1,12 +0,0 @@
>---- libavfilter/vf_libopencv.c.orig	2015-06-19 20:44:50 UTC
>-+++ libavfilter/vf_libopencv.c
>-@@ -23,8 +23,7 @@
>-  * libopencv wrapper functions
>-  */
>- 
>--#include <opencv/cv.h>
>--#include <opencv/cxcore.h>
>-+#include <opencv2/imgproc/imgproc_c.h>
>- #include "libavutil/avstring.h"
>- #include "libavutil/common.h"
>- #include "libavutil/file.h"
>
>Property changes on: head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>diff --git a/head/multimedia/ffmpeg/pkg-plist b/head/multimedia/ffmpeg/pkg-plist
>--- a/head/multimedia/ffmpeg/pkg-plist	(revision 409653)
>+++ b/head/multimedia/ffmpeg/pkg-plist	(working copy)
>@@ -4,11 +4,12 @@
> %%FFSERVER%%bin/ffserver
> %%FFSERVER%%@sample etc/ffserver.conf.sample
> include/libavcodec/avcodec.h
>+include/libavcodec/avdct.h
> include/libavcodec/avfft.h
> include/libavcodec/d3d11va.h
>+include/libavcodec/dirac.h
> include/libavcodec/dv_profile.h
> include/libavcodec/dxva2.h
>-include/libavcodec/old_codec_ids.h
> include/libavcodec/qsv.h
> include/libavcodec/vaapi.h
> include/libavcodec/vda.h
>@@ -19,8 +20,6 @@
> include/libavcodec/xvmc.h
> include/libavdevice/avdevice.h
> include/libavdevice/version.h
>-include/libavfilter/asrc_abuffer.h
>-include/libavfilter/avcodec.h
> include/libavfilter/avfilter.h
> include/libavfilter/avfiltergraph.h
> include/libavfilter/buffersink.h
>@@ -33,9 +32,9 @@
> include/libavresample/version.h
> include/libavutil/adler32.h
> include/libavutil/aes.h
>+include/libavutil/aes_ctr.h
> include/libavutil/attributes.h
> include/libavutil/audio_fifo.h
>-include/libavutil/audioconvert.h
> include/libavutil/avassert.h
> include/libavutil/avconfig.h
> include/libavutil/avstring.h
>@@ -51,6 +50,7 @@
> include/libavutil/common.h
> include/libavutil/cpu.h
> include/libavutil/crc.h
>+include/libavutil/des.h
> include/libavutil/dict.h
> include/libavutil/display.h
> include/libavutil/downmix_info.h
>@@ -69,12 +69,12 @@
> include/libavutil/log.h
> include/libavutil/lzo.h
> include/libavutil/macros.h
>+include/libavutil/mastering_display_metadata.h
> include/libavutil/mathematics.h
> include/libavutil/md5.h
> include/libavutil/mem.h
> include/libavutil/motion_vector.h
> include/libavutil/murmur3.h
>-include/libavutil/old_pix_fmts.h
> %%OPENCL%%include/libavutil/opencl.h
> include/libavutil/opt.h
> include/libavutil/parseutils.h
>@@ -83,6 +83,7 @@
> include/libavutil/pixfmt.h
> include/libavutil/random_seed.h
> include/libavutil/rational.h
>+include/libavutil/rc4.h
> include/libavutil/replaygain.h
> include/libavutil/ripemd.h
> include/libavutil/samplefmt.h
>@@ -94,6 +95,7 @@
> include/libavutil/time.h
> include/libavutil/timecode.h
> include/libavutil/timestamp.h
>+include/libavutil/tree.h
> include/libavutil/twofish.h
> include/libavutil/version.h
> include/libavutil/xtea.h
>@@ -105,40 +107,40 @@
> include/libswscale/version.h
> lib/libavcodec.a
> lib/libavcodec.so
>-lib/libavcodec.so.56
>-lib/libavcodec.so.56.60.100
>+lib/libavcodec.so.57
>+lib/libavcodec.so.57.24.102
> lib/libavdevice.a
> lib/libavdevice.so
>-lib/libavdevice.so.56
>-lib/libavdevice.so.56.4.100
>+lib/libavdevice.so.57
>+lib/libavdevice.so.57.0.101
> lib/libavfilter.a
> lib/libavfilter.so
>-lib/libavfilter.so.5
>-lib/libavfilter.so.5.40.101
>+lib/libavfilter.so.6
>+lib/libavfilter.so.6.31.100
> lib/libavformat.a
> lib/libavformat.so
>-lib/libavformat.so.56
>-lib/libavformat.so.56.40.101
>+lib/libavformat.so.57
>+lib/libavformat.so.57.25.100
> lib/libavresample.a
> lib/libavresample.so
>-lib/libavresample.so.2
>-lib/libavresample.so.2.1.0
>+lib/libavresample.so.3
>+lib/libavresample.so.3.0.0
> lib/libavutil.a
> lib/libavutil.so
>-lib/libavutil.so.54
>-lib/libavutil.so.54.31.100
>+lib/libavutil.so.55
>+lib/libavutil.so.55.17.103
> lib/libpostproc.a
> lib/libpostproc.so
>-lib/libpostproc.so.53
>-lib/libpostproc.so.53.3.100
>+lib/libpostproc.so.54
>+lib/libpostproc.so.54.0.100
> lib/libswresample.a
> lib/libswresample.so
>-lib/libswresample.so.1
>-lib/libswresample.so.1.2.101
>+lib/libswresample.so.2
>+lib/libswresample.so.2.0.101
> lib/libswscale.a
> lib/libswscale.so
>-lib/libswscale.so.3
>-lib/libswscale.so.3.1.101
>+lib/libswscale.so.4
>+lib/libswscale.so.4.0.100
> libdata/pkgconfig/libavcodec.pc
> libdata/pkgconfig/libavdevice.pc
> libdata/pkgconfig/libavfilter.pc

Actions: View

Attachments on bug 207547: 167489 | 170132 | 175364 | 176314 | 177408 | 177434 | 177637 | 177651