diff options
-rw-r--r-- | multimedia/ffmpeg2/Makefile | 3 | ||||
-rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/ffmpeg2/distinfo | 24 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-Makefile | 6 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-configure | 14 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-libavutil_common.h | 6 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-libavutil_opencl.c | 6 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-libavutil_x86_asm.h | 4 | ||||
-rw-r--r-- | multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c | 4 |
9 files changed, 35 insertions, 36 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 1fd1d091750..e97c418ff00 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2016/01/03 11:35:21 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2016/01/16 17:04:32 leot Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index d080f3b9ac0..d3f529ad13f 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.42 2015/12/28 11:44:46 adam Exp $ +# $NetBSD: Makefile.common,v 1.43 2016/01/16 17:04:32 leot Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile -DISTNAME= ffmpeg-2.8.4 +DISTNAME= ffmpeg-2.8.5 CATEGORIES= multimedia MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.xz diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo index 22e6eea4dc7..93b9e302d1f 100644 --- a/multimedia/ffmpeg2/distinfo +++ b/multimedia/ffmpeg2/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.44 2015/12/28 11:44:46 adam Exp $ +$NetBSD: distinfo,v 1.45 2016/01/16 17:04:32 leot Exp $ -SHA1 (ffmpeg-2.8.4.tar.xz) = 5c1d76f503c76c9a1f497656a8248e1354b2e15a -RMD160 (ffmpeg-2.8.4.tar.xz) = 0757a4a12f4fe2996e8be2c917f25075c879c00e -SHA512 (ffmpeg-2.8.4.tar.xz) = 3167d5758843afc198ecebb9c4c13543a1a224ef63695d9f1cbba1cd7ff043024eb5d844474052f46d9319a7261ec0514a1f139919263b5ef47f4fd54c3bf4cb -Size (ffmpeg-2.8.4.tar.xz) = 7197652 bytes -SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253 -SHA1 (patch-configure) = bc0dcdb5605b5a112de556ecb466265ef8ff5ca9 -SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a -SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e -SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea -SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40 -SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f +SHA1 (ffmpeg-2.8.5.tar.xz) = 5f46c7e1d80f37e41f69f5eadbdd6f97f56eca39 +RMD160 (ffmpeg-2.8.5.tar.xz) = 64433cf03b24568ea58418b4d3f50d3dca08e0ad +SHA512 (ffmpeg-2.8.5.tar.xz) = c1b79f905559b0d134d213c3c06289def162fe5fdda964e7192a1b7bccd539353b7515e9a6dfff1c5a7c64620216f61cd63ca89bd76ec9950b5aac97a44660f8 +Size (ffmpeg-2.8.5.tar.xz) = 7201100 bytes +SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56 +SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1 +SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = 268dc75dfe3b907feb8ad730bcdd1d4556be664a +SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2 +SHA1 (patch-libavutil_opencl.c) = 00ea04f9febe60b9428ac8c3b7e14ae01a955685 +SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548 +SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239 diff --git a/multimedia/ffmpeg2/patches/patch-Makefile b/multimedia/ffmpeg2/patches/patch-Makefile index 408706791ea..b30e24cb2a2 100644 --- a/multimedia/ffmpeg2/patches/patch-Makefile +++ b/multimedia/ffmpeg2/patches/patch-Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile,v 1.1 2013/08/04 10:29:02 adam Exp $ +$NetBSD: patch-Makefile,v 1.2 2016/01/16 17:04:33 leot Exp $ ---- Makefile.orig 2012-09-28 01:37:35.000000000 +0000 +--- Makefile.orig 2016-01-15 16:58:32.000000000 +0000 +++ Makefile -@@ -139,8 +139,8 @@ install-progs: install-progs-yes $(PROGS +@@ -159,8 +159,8 @@ install-progs: install-progs-yes $(AVPRO install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(Q)mkdir -p "$(DATADIR)/examples" diff --git a/multimedia/ffmpeg2/patches/patch-configure b/multimedia/ffmpeg2/patches/patch-configure index a558c6bf514..05dbb05a152 100644 --- a/multimedia/ffmpeg2/patches/patch-configure +++ b/multimedia/ffmpeg2/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $ +$NetBSD: patch-configure,v 1.9 2016/01/16 17:04:33 leot Exp $ ---- configure.orig 2015-06-19 20:47:55.000000000 +0000 +--- configure.orig 2016-01-15 16:59:29.000000000 +0000 +++ configure -@@ -4197,6 +4197,11 @@ case $target_os in +@@ -4300,6 +4300,11 @@ case $target_os in ;; netbsd) disable symver @@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $ oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" enabled gcc || check_ldflags -Wl,-zmuldefs -@@ -4602,10 +4607,13 @@ check_cc <<EOF && enable attribute_may_a +@@ -4718,10 +4723,13 @@ check_cc <<EOF && enable attribute_may_a union { int x; } __attribute__((may_alias)) x; EOF @@ -31,7 +31,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $ if ! enabled ppc64 || enabled bigendian; then disable vsx -@@ -5426,6 +5434,7 @@ enabled xmm_clobber_test && +@@ -5589,6 +5597,7 @@ enabled xmm_clobber_test && -Wl,--wrap,sws_scale || disable xmm_clobber_test @@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $ echo "X{};" > $TMPV if test_ldflags -Wl,--version-script,$TMPV; then append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver' -@@ -5438,6 +5447,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") +@@ -5601,6 +5610,7 @@ __asm__(".symver ff_foo,av_foo@VERSION") void ff_foo(void) {} EOF fi @@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.8 2015/06/29 13:12:27 adam Exp $ if [ -z "$optflags" ]; then if enabled small; then -@@ -6041,7 +6051,7 @@ Version: $version +@@ -6233,7 +6243,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_common.h b/multimedia/ffmpeg2/patches/patch-libavutil_common.h index 90867798bc3..e0932ef56f0 100644 --- a/multimedia/ffmpeg2/patches/patch-libavutil_common.h +++ b/multimedia/ffmpeg2/patches/patch-libavutil_common.h @@ -1,8 +1,8 @@ -$NetBSD: patch-libavutil_common.h,v 1.1 2013/08/04 10:29:02 adam Exp $ +$NetBSD: patch-libavutil_common.h,v 1.2 2016/01/16 17:04:33 leot Exp $ ---- libavutil/common.h.orig 2013-01-06 21:53:29.000000000 +0000 +--- libavutil/common.h.orig 2016-01-15 16:58:36.000000000 +0000 +++ libavutil/common.h -@@ -39,6 +39,22 @@ +@@ -43,6 +43,22 @@ #include "version.h" #include "libavutil/avconfig.h" diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c b/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c index c30be9fa93e..f363f70949b 100644 --- a/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c +++ b/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c @@ -1,10 +1,10 @@ -$NetBSD: patch-libavutil_opencl.c,v 1.2 2015/04/02 22:40:04 wiz Exp $ +$NetBSD: patch-libavutil_opencl.c,v 1.3 2016/01/16 17:04:33 leot Exp $ Fix undeclared identifier error. ---- libavutil/opencl.c.orig 2015-03-16 19:26:04.000000000 +0000 +--- libavutil/opencl.c.orig 2016-01-15 16:58:37.000000000 +0000 +++ libavutil/opencl.c -@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char +@@ -457,7 +457,7 @@ cl_program av_opencl_compile(const char cl_program program = NULL; LOCK_OPENCL; diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_x86_asm.h b/multimedia/ffmpeg2/patches/patch-libavutil_x86_asm.h index 8ffbcef09b2..87d1c71c0e6 100644 --- a/multimedia/ffmpeg2/patches/patch-libavutil_x86_asm.h +++ b/multimedia/ffmpeg2/patches/patch-libavutil_x86_asm.h @@ -1,8 +1,8 @@ -$NetBSD: patch-libavutil_x86_asm.h,v 1.1 2014/08/30 11:22:03 richard Exp $ +$NetBSD: patch-libavutil_x86_asm.h,v 1.2 2016/01/16 17:04:33 leot Exp $ avoid SunOS regset.h definition for REG_SP ---- libavutil/x86/asm.h.orig 2014-08-17 13:33:17.000000000 +0000 +--- libavutil/x86/asm.h.orig 2016-01-15 16:58:37.000000000 +0000 +++ libavutil/x86/asm.h @@ -27,6 +27,11 @@ typedef struct xmm_reg { uint64_t a, b; } xmm_reg; diff --git a/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c b/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c index 536ac06007c..88b16bb9927 100644 --- a/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c +++ b/multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c @@ -1,6 +1,6 @@ -$NetBSD: patch-libavutil_x86_cpu.c,v 1.3 2014/04/01 10:51:49 adam Exp $ +$NetBSD: patch-libavutil_x86_cpu.c,v 1.4 2016/01/16 17:04:33 leot Exp $ ---- libavutil/x86/cpu.c.orig 2014-03-23 22:07:55.000000000 +0000 +--- libavutil/x86/cpu.c.orig 2016-01-15 16:58:37.000000000 +0000 +++ libavutil/x86/cpu.c @@ -116,6 +116,7 @@ int ff_get_cpu_flags_x86(void) #if HAVE_SSE |