From 93f244580e5bbd3d1722703eca9de9daf0214f02 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Fri, 24 Oct 2014 10:20:43 +0000
Subject: Changes 20141023: * Update to the current lavf API and fix memory
 leak when using --seek * x86inc: Make INIT_CPUFLAGS support an arbitrary
 number of cpuflags * x86: Minor pixel_ssim_end4 improvements * x86: Faster
 quant_4x4x4 * configure: improve cc_check for clang and ICL to not ignore
 unknown options * checkasm: Only call x264_cpu_detect() once

---
 multimedia/x264-devel/Makefile         |  4 ++--
 multimedia/x264-devel/distinfo         | 10 +++++-----
 multimedia/x264-devel/patches/patch-aa | 23 ++++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 1cb7f0a2cbf..8c89841e775 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2014/08/10 15:39:15 adam Exp $
+# $NetBSD: Makefile,v 1.50 2014/10/24 10:20:43 adam Exp $
 
-SNAPSHOT_DATE=	20140809
+SNAPSHOT_DATE=	20141023
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 184d0c3dbbf..0107550583b 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2014/08/10 15:39:15 adam Exp $
+$NetBSD: distinfo,v 1.34 2014/10/24 10:20:43 adam Exp $
 
-SHA1 (x264-snapshot-20140809-2245.tar.bz2) = 368988a447a209d127458d70e35a5af495bf9346
-RMD160 (x264-snapshot-20140809-2245.tar.bz2) = 8eb5c54e96e12b9989891ea540b511bdd2c2b7aa
-Size (x264-snapshot-20140809-2245.tar.bz2) = 628028 bytes
-SHA1 (patch-aa) = 8aee03e966c5aeceaa643b7c23a26f2e40711bc5
+SHA1 (x264-snapshot-20141023-2245.tar.bz2) = 42512d0b4210fba6610640befa75aa21f03034d3
+RMD160 (x264-snapshot-20141023-2245.tar.bz2) = 58be4fc4d8fe94b86407f3036fbf64652cb316fc
+Size (x264-snapshot-20141023-2245.tar.bz2) = 650863 bytes
+SHA1 (patch-aa) = 816592309007dbd1d7be002613503733dff133d2
 SHA1 (patch-ab) = f7b4dbe3b19f976182806619515b89cbabe51212
 SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index b1b411bb35e..c55169bfb4d 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2014/08/10 15:39:15 adam Exp $
+$NetBSD: patch-aa,v 1.19 2014/10/24 10:20:44 adam Exp $
 
---- configure.orig	2014-08-09 20:45:04.000000000 +0000
+--- configure.orig	2014-10-23 20:45:04.000000000 +0000
 +++ configure
-@@ -501,6 +501,10 @@ case $host_os in
+@@ -516,6 +516,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.18 2014/08/10 15:39:15 adam Exp $
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -623,7 +627,7 @@ case $host_cpu in
+@@ -639,7 +643,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf"
          fi
          ;;
@@ -21,24 +21,25 @@ $NetBSD: patch-aa,v 1.18 2014/08/10 15:39:15 adam Exp $
 +    x86_64|amd64)
          ARCH="X86_64"
          AS="yasm"
-         ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
-@@ -645,13 +649,14 @@ case $host_cpu in
+         AS_EXT=".asm"
+@@ -662,14 +666,15 @@ case $host_cpu in
          fi
          ;;
      powerpc|powerpc64)
 -        ARCH="PPC"
          if [ $asm = auto ] ; then
              define HAVE_ALTIVEC
-             AS="${AS-${cross_prefix}gcc}"
+             AS="${AS-${CC}}"
+             AS_EXT=".c"
              if [ $SYS = MACOSX ] ; then
-+	        ARCH="POWERPC"
++                ARCH="POWERPC"
                  CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
              else
-+	        ARCH="PPC"
++                ARCH="PPC"
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -785,7 +790,7 @@ fi
+@@ -830,7 +835,7 @@ fi
  # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
  [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
  
@@ -47,7 +48,7 @@ $NetBSD: patch-aa,v 1.18 2014/08/10 15:39:15 adam Exp $
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -999,10 +1004,11 @@ fi
+@@ -1044,10 +1049,11 @@ fi
  cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
  
  if [ "$pic" = "yes" ] ; then
-- 
cgit v1.2.3