Attachment 158140 Details for Bug 201181 – Patch to multimedia/ffmpeg to update to 2.7.1

Patch to multimedia/ffmpeg to update to 2.7.1

ffmpeg.diff.txt (text/plain), 14.37 KB, created by Thomas Zander on 2015-06-28 19:14:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2015-06-28 19:14:44 UTC

Size: 14.37 KB

patch

obsolete

>diff -ruN ffmpeg.old/Makefile ffmpeg/Makefile
>--- ffmpeg.old/Makefile	2015-06-28 20:59:12.442068000 +0200
>+++ ffmpeg/Makefile	2015-06-28 20:19:53.851230391 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/multimedia/ffmpeg/Makefile 390325 2015-06-22 20:20:10Z riggs $
> 
> PORTNAME=	ffmpeg
>-PORTVERSION=	2.3.6
>-PORTREVISION=	5
>+PORTVERSION=	2.7.1
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>@@ -256,6 +255,7 @@
> CONFIGURE_ARGS+=--prefix="${PREFIX}" \
> 		--mandir="${PREFIX}/man" \
> 		--datadir="${DATADIR}" \
>+		--pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
> 		--enable-shared \
> 		--enable-gpl \
> 		--enable-postproc \
>@@ -353,8 +353,6 @@
> 
> post-patch:
> # {C,LD}FLAGS safeness
>-	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
>-		${WRKSRC}/library.mak
> 	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
> 		${WRKSRC}/ffserver.c
> 	@${REINPLACE_CMD} -E \
>diff -ruN ffmpeg.old/distinfo ffmpeg/distinfo
>--- ffmpeg.old/distinfo	2015-06-28 20:59:12.443068000 +0200
>+++ ffmpeg/distinfo	2015-06-28 16:20:21.237220834 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (ffmpeg-2.3.6.tar.bz2) = cf1be1c5c3973b8db16b6b6e8e63a042d414fb5d47d3801a196cbba21a0a624a
>-SIZE (ffmpeg-2.3.6.tar.bz2) = 7440172
>+SHA256 (ffmpeg-2.7.1.tar.bz2) = 7e07b97d2415feeae9c9b5595e35e7b7aab33207e81bf9f8c0d1eece43f7f720
>+SIZE (ffmpeg-2.7.1.tar.bz2) = 8152634
>diff -ruN ffmpeg.old/files/patch-Makefile ffmpeg/files/patch-Makefile
>--- ffmpeg.old/files/patch-Makefile	2015-06-28 20:59:12.446068000 +0200
>+++ ffmpeg/files/patch-Makefile	2015-06-28 16:27:17.031192144 +0200
>@@ -1,11 +1,11 @@
>---- Makefile.orig	2012-05-04 12:24:34.447846798 +0200
>-+++ Makefile	2012-05-04 12:24:42.471850113 +0200
>-@@ -79,7 +79,7 @@
>+--- Makefile.orig	2015-06-19 20:44:35 UTC
>++++ Makefile
>+@@ -92,7 +92,7 @@ define DOSUBDIR
>  $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
>  SUBDIR := $(1)/
>  include $(SRC_PATH)/$(1)/Makefile
> --include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
> +-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
>+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
>  include $(SRC_PATH)/library.mak
>  endef
>- 
>diff -ruN ffmpeg.old/files/patch-configure ffmpeg/files/patch-configure
>--- ffmpeg.old/files/patch-configure	2015-06-28 20:59:12.449067000 +0200
>+++ ffmpeg/files/patch-configure	2015-06-28 16:27:17.040191825 +0200
>@@ -1,6 +1,6 @@
>---- configure.orig	2014-08-17 15:33:04.000000000 +0200
>-+++ configure	2014-09-12 15:07:50.647439045 +0200
>-@@ -2649,12 +2649,7 @@
>+--- configure.orig	2015-06-19 20:47:55 UTC
>++++ configure
>+@@ -2814,12 +2814,7 @@ target_os_default=$(tolower $(uname -s))
>  host_os=$target_os_default
>  
>  # machine
>@@ -12,18 +12,18 @@
> -fi
> +arch_default=$(uname -p)
>  cpu="generic"
>+ intrinsics="none"
>  
>- # configurable options
>-@@ -5381,7 +5376,7 @@
>+@@ -5823,7 +5818,7 @@ ifndef MAIN_MAKEFILE
>  SRC_PATH:=\$(SRC_PATH:.%=..%)
>  endif
>  CC_IDENT=$cc_ident
> -ARCH=$arch
> +FFMPEG_ARCH=$arch
>+ INTRINSICS=$intrinsics
>  CC=$cc
>  CXX=$cxx
>- AS=$as
>-@@ -5590,7 +5585,7 @@
>+@@ -6035,7 +6030,7 @@ exec_prefix=\${prefix}
>  libdir=$libdir
>  includedir=$incdir
>  
>@@ -32,7 +32,7 @@
>  Description: $comment
>  Version: $version
>  Requires: $(enabled shared || echo $requires)
>-@@ -5604,10 +5599,10 @@
>+@@ -6049,10 +6044,10 @@ EOF
>  mkdir -p doc/examples/pc-uninstalled
>  includedir=${source_path}
>  [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
>diff -ruN ffmpeg.old/files/patch-doc-Makefile ffmpeg/files/patch-doc-Makefile
>--- ffmpeg.old/files/patch-doc-Makefile	2015-06-28 20:59:12.449067000 +0200
>+++ ffmpeg/files/patch-doc-Makefile	2015-06-28 16:27:17.048192145 +0200
>@@ -1,7 +1,7 @@
>---- doc/Makefile.orig	2012-09-28 03:37:35.000000000 +0200
>-+++ doc/Makefile	2012-10-12 21:36:56.461440175 +0200
>-@@ -57,7 +57,7 @@
>- install-man:
>+--- doc/Makefile.orig	2015-06-19 20:44:35 UTC
>++++ doc/Makefile
>+@@ -145,7 +145,7 @@ install-html: $(HTMLPAGES)
>+ endif
>  
>  ifdef CONFIG_MANPAGES
> -install-progs-$(CONFIG_DOC): install-man
>diff -ruN ffmpeg.old/files/patch-libavcodec-Makefile ffmpeg/files/patch-libavcodec-Makefile
>--- ffmpeg.old/files/patch-libavcodec-Makefile	2015-06-28 20:59:12.452067000 +0200
>+++ ffmpeg/files/patch-libavcodec-Makefile	2015-06-28 16:27:17.057192011 +0200
>@@ -1,11 +1,11 @@
>---- libavcodec/Makefile.orig	2012-08-06 10:06:26.000000000 +0200
>-+++ libavcodec/Makefile	2012-08-06 10:36:33.478505808 +0200
>-@@ -793,7 +793,7 @@
>-                                           codec_names.h                 \
>-                                           fft-internal.h                \
>+--- libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
>++++ libavcodec/Makefile
>+@@ -877,7 +877,7 @@ SKIPHEADERS                            +
>+                                           old_codec_ids.h               \
>                                            tableprint.h                  \
>+                                           tableprint_vlc.h              \
> -                                          $(ARCH)/vp56_arith.h          \
>-+                                          $(FFMPEG_ARCH)/vp56_arith.h   \
>++                                          $(FFMPEG_ARCH)/vp56_arith.h          \
>  
>+ SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
>  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
>- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
>diff -ruN ffmpeg.old/files/patch-libavdevice-bktr.c ffmpeg/files/patch-libavdevice-bktr.c
>--- ffmpeg.old/files/patch-libavdevice-bktr.c	2015-06-28 20:59:12.447068000 +0200
>+++ ffmpeg/files/patch-libavdevice-bktr.c	2015-06-28 16:27:17.066191825 +0200
>@@ -1,5 +1,5 @@
>---- libavdevice/bktr.c.orig	2012-01-22 14:41:15.000000000 +0100
>-+++ libavdevice/bktr.c	2012-01-22 16:07:07.873280412 +0100
>+--- libavdevice/bktr.c.orig	2015-06-19 20:44:50 UTC
>++++ libavdevice/bktr.c
> @@ -24,6 +24,11 @@
>   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>   */
>@@ -10,5 +10,5 @@
> +typedef unsigned long u_long;
> +
>  #include "libavformat/internal.h"
>+ #include "libavutil/internal.h"
>  #include "libavutil/log.h"
>- #include "libavutil/opt.h"
>diff -ruN ffmpeg.old/files/patch-libavdevice-oss.c ffmpeg/files/patch-libavdevice-oss.c
>--- ffmpeg.old/files/patch-libavdevice-oss.c	1970-01-01 01:00:00.000000000 +0100
>+++ ffmpeg/files/patch-libavdevice-oss.c	2015-06-28 16:27:17.074192361 +0200
>@@ -0,0 +1,14 @@
>+--- libavdevice/oss.c.orig	2015-06-19 20:44:50 UTC
>++++ libavdevice/oss.c
>+@@ -19,6 +19,11 @@
>+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>+  */
>+ 
>++typedef unsigned char	u_char;
>++typedef unsigned short	u_short;
>++typedef unsigned int	u_int;
>++typedef unsigned long	u_long;
>++
>+ #include "config.h"
>+ 
>+ #include <string.h>
>diff -ruN ffmpeg.old/files/patch-libavdevice-oss_audio.c ffmpeg/files/patch-libavdevice-oss_audio.c
>--- ffmpeg.old/files/patch-libavdevice-oss_audio.c	2015-06-28 20:59:12.450068000 +0200
>+++ ffmpeg/files/patch-libavdevice-oss_audio.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- libavdevice/oss_audio.c.orig	2009-05-15 17:38:35.000000000 +0200
>-+++ libavdevice/oss_audio.c	2009-05-15 17:41:27.000000000 +0200
>-@@ -19,6 +19,11 @@
>-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>-  */
>- 
>-+typedef unsigned char	u_char;
>-+typedef unsigned short	u_short;
>-+typedef unsigned int	u_int;
>-+typedef unsigned long	u_long;
>-+
>- #include "config.h"
>- #include <stdlib.h>
>- #include <stdio.h>
>diff -ruN ffmpeg.old/files/patch-libavfilter-vf_libopencv.c ffmpeg/files/patch-libavfilter-vf_libopencv.c
>--- ffmpeg.old/files/patch-libavfilter-vf_libopencv.c	2015-06-28 20:59:12.448068000 +0200
>+++ ffmpeg/files/patch-libavfilter-vf_libopencv.c	2015-06-28 16:27:17.082192093 +0200
>@@ -1,12 +1,12 @@
>---- libavfilter/vf_libopencv.c.orig	2012-08-05 14:09:37.882506740 +0200
>-+++ libavfilter/vf_libopencv.c	2012-08-05 14:10:24.508510133 +0200
>-@@ -25,8 +25,7 @@
>- 
>- /* #define DEBUG */
>+--- 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"
>- #include "avfilter.h"
>diff -ruN ffmpeg.old/files/patch-libavformat-udp.c ffmpeg/files/patch-libavformat-udp.c
>--- ffmpeg.old/files/patch-libavformat-udp.c	2015-06-28 20:59:12.447068000 +0200
>+++ ffmpeg/files/patch-libavformat-udp.c	2015-06-28 16:27:17.091192324 +0200
>@@ -1,11 +1,11 @@
>---- libavformat/udp.c.orig	2009-05-15 17:24:45.000000000 +0200
>-+++ libavformat/udp.c	2009-05-15 17:27:17.000000000 +0200
>-@@ -45,6 +45,8 @@
>- #define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
>- #endif
>+--- libavformat/udp.c.orig	2015-06-19 20:44:53 UTC
>++++ libavformat/udp.c
>+@@ -71,6 +71,8 @@
>+ #define UDP_MAX_PKT_SIZE 65536
>+ #define UDP_HEADER_SIZE 8
>  
> +#define IPPROTO_IPV6 41
> +
>- typedef struct {
>+ typedef struct UDPContext {
>+     const AVClass *class;
>      int udp_fd;
>-     int ttl;
>diff -ruN ffmpeg.old/files/patch-libavutil-common.h ffmpeg/files/patch-libavutil-common.h
>--- ffmpeg.old/files/patch-libavutil-common.h	2015-06-28 20:59:12.445068000 +0200
>+++ ffmpeg/files/patch-libavutil-common.h	2015-06-28 16:27:17.100192110 +0200
>@@ -1,8 +1,8 @@
>---- libavutil/common.h.orig	2010-07-07 19:27:45.000000000 +0200
>-+++ libavutil/common.h	2010-08-01 22:27:42.964629491 +0200
>-@@ -36,6 +36,10 @@
>- #include <string.h>
>- #include "attributes.h"
>+--- libavutil/common.h.orig	2015-06-19 20:44:53 UTC
>++++ libavutil/common.h
>+@@ -49,6 +49,10 @@
>+ #   define AV_NE(be, le) (le)
>+ #endif
>  
> +#ifndef	UINT64_C
> +#define	UINT64_C(c)	(c ## UL)
>diff -ruN ffmpeg.old/files/patch-libavutil-x86-asm.h ffmpeg/files/patch-libavutil-x86-asm.h
>--- ffmpeg.old/files/patch-libavutil-x86-asm.h	2015-06-28 20:59:12.451068000 +0200
>+++ ffmpeg/files/patch-libavutil-x86-asm.h	2015-06-28 16:27:17.109192472 +0200
>@@ -1,6 +1,6 @@
>---- ./libavutil/x86/asm.h.orig	2013-11-01 13:02:26.000000000 -0400
>-+++ ./libavutil/x86/asm.h	2013-11-01 13:03:00.000000000 -0400
>-@@ -70,7 +70,7 @@
>+--- libavutil/x86/asm.h.orig	2015-06-19 20:44:54 UTC
>++++ libavutil/x86/asm.h
>+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
>  typedef int x86_reg;
>  #endif
>  
>diff -ruN ffmpeg.old/pkg-descr ffmpeg/pkg-descr
>--- ffmpeg.old/pkg-descr	2015-06-28 20:59:12.444067000 +0200
>+++ ffmpeg/pkg-descr	2015-06-28 16:20:21.253221067 +0200
>@@ -2,6 +2,4 @@
> audio and video. It includes libavcodec - the leading audio/video codec
> library.
> 
>-This version is from the 2.0 release branch.
>-
> WWW: http://ffmpeg.org/
>diff -ruN ffmpeg.old/pkg-plist ffmpeg/pkg-plist
>--- ffmpeg.old/pkg-plist	2015-06-28 20:59:12.441068000 +0200
>+++ ffmpeg/pkg-plist	2015-06-28 16:20:21.255221697 +0200
>@@ -5,13 +5,16 @@
> %%FFSERVER%%@sample etc/ffserver.conf.sample
> include/libavcodec/avcodec.h
> include/libavcodec/avfft.h
>+include/libavcodec/d3d11va.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
> include/libavcodec/vdpau.h
> include/libavcodec/version.h
>+include/libavcodec/vorbis_parser.h
> include/libavcodec/xvmc.h
> include/libavdevice/avdevice.h
> include/libavdevice/version.h
>@@ -41,6 +44,8 @@
> include/libavutil/bprint.h
> include/libavutil/bswap.h
> include/libavutil/buffer.h
>+include/libavutil/camellia.h
>+include/libavutil/cast5.h
> include/libavutil/channel_layout.h
> include/libavutil/common.h
> include/libavutil/cpu.h
>@@ -58,7 +63,6 @@
> include/libavutil/hmac.h
> include/libavutil/imgutils.h
> include/libavutil/intfloat.h
>-include/libavutil/intfloat_readwrite.h
> include/libavutil/intreadwrite.h
> include/libavutil/lfg.h
> include/libavutil/log.h
>@@ -67,11 +71,13 @@
> 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
> include/libavutil/opt.h
> include/libavutil/parseutils.h
> include/libavutil/pixdesc.h
>+include/libavutil/pixelutils.h
> include/libavutil/pixfmt.h
> include/libavutil/random_seed.h
> include/libavutil/rational.h
>@@ -81,10 +87,11 @@
> include/libavutil/sha.h
> include/libavutil/sha512.h
> include/libavutil/stereo3d.h
>+include/libavutil/threadmessage.h
> include/libavutil/time.h
> include/libavutil/timecode.h
> include/libavutil/timestamp.h
>-include/libavutil/threadmessage.h
>+include/libavutil/twofish.h
> include/libavutil/version.h
> include/libavutil/xtea.h
> include/libpostproc/postprocess.h
>@@ -95,40 +102,40 @@
> include/libswscale/version.h
> lib/libavcodec.a
> lib/libavcodec.so
>-lib/libavcodec.so.55
>-lib/libavcodec.so.55.69.100
>+lib/libavcodec.so.56
>+lib/libavcodec.so.56.41.100
> lib/libavdevice.a
> lib/libavdevice.so
>-lib/libavdevice.so.55
>-lib/libavdevice.so.55.13.102
>+lib/libavdevice.so.56
>+lib/libavdevice.so.56.4.100
> lib/libavfilter.a
> lib/libavfilter.so
>-lib/libavfilter.so.4
>-lib/libavfilter.so.4.11.100
>+lib/libavfilter.so.5
>+lib/libavfilter.so.5.16.101
> lib/libavformat.a
> lib/libavformat.so
>-lib/libavformat.so.55
>-lib/libavformat.so.55.48.100
>+lib/libavformat.so.56
>+lib/libavformat.so.56.36.100
> lib/libavresample.a
> lib/libavresample.so
>-lib/libavresample.so.1
>-lib/libavresample.so.1.3.0
>+lib/libavresample.so.2
>+lib/libavresample.so.2.1.0
> lib/libavutil.a
> lib/libavutil.so
>-lib/libavutil.so.52
>-lib/libavutil.so.52.92.100
>+lib/libavutil.so.54
>+lib/libavutil.so.54.27.100
> lib/libpostproc.a
> lib/libpostproc.so
>-lib/libpostproc.so.52
>-lib/libpostproc.so.52.3.100
>+lib/libpostproc.so.53
>+lib/libpostproc.so.53.3.100
> lib/libswresample.a
> lib/libswresample.so
>-lib/libswresample.so.0
>-lib/libswresample.so.0.19.100
>+lib/libswresample.so.1
>+lib/libswresample.so.1.2.100
> lib/libswscale.a
> lib/libswscale.so
>-lib/libswscale.so.2
>-lib/libswscale.so.2.6.100
>+lib/libswscale.so.3
>+lib/libswscale.so.3.1.101
> libdata/pkgconfig/libavcodec.pc
> libdata/pkgconfig/libavdevice.pc
> libdata/pkgconfig/libavfilter.pc
>@@ -144,14 +151,17 @@
> %%FFSERVER%%man/man1/ffserver.1.gz
> %%DATADIR%%/examples/Makefile
> %%DATADIR%%/examples/README
>+%%DATADIR%%/examples/avio_list_dir.c
> %%DATADIR%%/examples/avio_reading.c
> %%DATADIR%%/examples/decoding_encoding.c
> %%DATADIR%%/examples/demuxing_decoding.c
>+%%DATADIR%%/examples/extract_mvs.c
> %%DATADIR%%/examples/filter_audio.c
> %%DATADIR%%/examples/filtering_audio.c
> %%DATADIR%%/examples/filtering_video.c
> %%DATADIR%%/examples/metadata.c
> %%DATADIR%%/examples/muxing.c
>+%%DATADIR%%/examples/qsvdec.c
> %%DATADIR%%/examples/remuxing.c
> %%DATADIR%%/examples/resampling_audio.c
> %%DATADIR%%/examples/scaling_video.c

Actions: View

Attachments on bug 201181: 158140