 @@ -1,17 +1,16 @@
-# $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)
 CONFIGURE_ARGS+=	--enable-avfilter
 #CONFIGURE_ARGS+=	--enable-avfilter-lavf
 CONFIGURE_ARGS+=	--enable-postproc
 CONFIGURE_ARGS+=	--disable-ffplay
 INSTALLATION_DIRS=	lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2
 CONF_FILES+=	${PREFIX}/share/examples/ffmpeg2/ffserver.conf \
 		${PKG_SYSCONFDIR}/ffserver.conf

 @@ -1,18 +1,18 @@
-# $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
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 PREV_PKGPATH=	multimedia/ffmpeg-devel
 PATCHDIR=	${.CURDIR}/../../multimedia/ffmpeg2/patches
 USE_LANGUAGES=		c99
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake texi2html pod2man
 HAS_CONFIGURE=		yes

 @@ -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
+SHA1 (ffmpeg-2.8.5.tar.xz) = 5f46c7e1d80f37e41f69f5eadbdd6f97f56eca39
-RMD160 (ffmpeg-2.8.4.tar.xz) = 0757a4a12f4fe2996e8be2c917f25075c879c00e
+RMD160 (ffmpeg-2.8.5.tar.xz) = 64433cf03b24568ea58418b4d3f50d3dca08e0ad
-SHA512 (ffmpeg-2.8.4.tar.xz) = 3167d5758843afc198ecebb9c4c13543a1a224ef63695d9f1cbba1cd7ff043024eb5d844474052f46d9319a7261ec0514a1f139919263b5ef47f4fd54c3bf4cb
+SHA512 (ffmpeg-2.8.5.tar.xz) = c1b79f905559b0d134d213c3c06289def162fe5fdda964e7192a1b7bccd539353b7515e9a6dfff1c5a7c64620216f61cd63ca89bd76ec9950b5aac97a44660f8
-Size (ffmpeg-2.8.4.tar.xz) = 7197652 bytes
+Size (ffmpeg-2.8.5.tar.xz) = 7201100 bytes
-SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
+SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
-SHA1 (patch-configure) = bc0dcdb5605b5a112de556ecb466265ef8ff5ca9
+SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1
-SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
+SHA1 (patch-libavcodec_x86_ac3dsp__init.c) = 268dc75dfe3b907feb8ad730bcdd1d4556be664a
-SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
+SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
-SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
+SHA1 (patch-libavutil_opencl.c) = 00ea04f9febe60b9428ac8c3b7e14ae01a955685
-SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
+SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
-SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
+SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239

 @@ -1,15 +1,15 @@
-$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"
 -	$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 -	$(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
 +	$(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
 +	$(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
  uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data

 @@ -1,18 +1,18 @@
-$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"
 +#if defined(__cplusplus)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__)
 +#undef _STDINT_H_
 +#undef _SYS_STDINT_H_
 +#undef _STDINT_H
 +#undef _GCC_WRAP_STDINT_H
 +#ifndef __STDC_CONSTANT_MACROS
 +#define __STDC_CONSTANT_MACROS
 +#endif
 +#include <stdint.h>

 @@ -1,18 +1,18 @@
-$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;
  typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg;
 +/* avoid SunOS regset.h definition for REG_SP */
 +#if defined (__sun) && defined (REG_SP)
 +#undef REG_SP
 +#endif
++
  #if ARCH_X86_64
  #    define OPSIZE "q"
  #    define REG_a "rax"

 @@ -1,58 +1,58 @@
-$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
 +        # NetBSD/macppc *really* needs PIC enabled.  ffmpeg has repeatedly
 +        # broken time and time again because PIC support has been removed
 +        # from architectures that need it.  So, if you touch this, please
 +        # be careful and make sure that your changes work.
 +        test "${subarch}" != "x86_32" && enable pic
          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
 -check_cc <<EOF || die "endian test failed"
 -unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
 +check_exec <<EOF || enable bigendian
 +int main()
 +{
 + long one = 1;
 + return !(*((char *)(&one)));
 +}
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  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
 +if false; then
  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
 +fi
  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:
 -Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
 +Libs: -L\${libdir} -Wl,-R\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF

 @@ -1,15 +1,15 @@
-$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;
 -    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
 +    for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
          // identify a program using a unique name within the kernel source
          ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
          if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {

 @@ -1,16 +1,16 @@
-$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
          if (std_caps & (1 << 25))
              rval |= AV_CPU_FLAG_SSE;
 +#if !defined(__GNUC__) || (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
          if (std_caps & (1 << 26))
              rval |= AV_CPU_FLAG_SSE2;
          if (ecx & 1)
 @@ -138,6 +139,7 @@ int ff_get_cpu_flags_x86(void)
+             }
+         }
  #endif /* HAVE_AVX */