Update to x264-20071218. No changelog, patch is from Adam Hoka.

4 files changed, 17 insertions, 31 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index b7a7403eeca..e3e990e1a8d 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/12/27 22:33:51 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/04 18:41:54 joerg Exp $
 #
 
-SNAPSHOT_DATE=		20060127
+SNAPSHOT_DATE=		20071218
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 9c1cc9886ec..e383dc165dc 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/02/23 18:11:27 joerg Exp $
+$NetBSD: distinfo,v 1.4 2008/01/04 18:41:54 joerg Exp $
 
-SHA1 (x264-snapshot-20060127-2245.tar.bz2) = 43339986eff487c55b95ddb13110cc552f3b1638
-RMD160 (x264-snapshot-20060127-2245.tar.bz2) = 3123af75e0181fcbe5feb9a2a8c4a22b41b81092
-Size (x264-snapshot-20060127-2245.tar.bz2) = 375470 bytes
-SHA1 (patch-aa) = 1be5548df5cb67052ff738b3436b1f4a78c46f4c
-SHA1 (patch-ab) = 95dd6697d842b29fae7b5809865ed5bfca4d9138
+SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a
+RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347
+Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes
+SHA1 (patch-aa) = 8c652d45621d2a3faed3d80a5eddb85fc1c96507
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 10557378204..070936c59dc 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2006/02/23 18:11:27 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/01/04 18:41:54 joerg Exp $
 
---- configure.orig	2006-01-27 21:45:02.000000000 +0000
+--- configure.orig	2007-12-18 22:45:04.000000000 +0100
 +++ configure
-@@ -75,6 +75,10 @@ case "$UNAMES" in
+@@ -193,6 +193,10 @@ case $host_os in
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
-+  DragonFly)
++  dragonfly*)
 +    SYS="DRAGONFLY"
 +    LDFLAGS="$LDFLAGS -lm"
 +    ;;
-   NetBSD)
-     SYS="NETBSD"
-     LDFLAGS="$LDFLAGS -lm"
-@@ -122,7 +126,7 @@ case "$UNAMEM" in
-       ASFLAGS="-f macho -DPREFIX"
+   kfreebsd*-gnu)
+     SYS="FREEBSD"
+     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+@@ -252,7 +256,7 @@ case $host_cpu in
      fi
+     as_check || AS="nasm"
      ;;
 -  x86_64)
 +  x86_64|amd64)
      ARCH="X86_64"
-     CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      AS="yasm"
+     if [ "$SYS" = MACOSX ];then
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
deleted file mode 100644
index 776e6f51c21..00000000000
--- a/multimedia/x264-devel/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/23 18:11:27 joerg Exp $
-
---- encoder/ratecontrol.c.orig	2006-02-23 18:05:04.000000000 +0000
-+++ encoder/ratecontrol.c
-@@ -35,7 +35,7 @@
- #include "common/cpu.h"
- #include "ratecontrol.h"
- 
--#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD)
-+#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) || defined(SYS_DRAGONFLY)
- #define exp2f(x) powf( 2, (x) )
- #endif
- #if defined(_MSC_VER) || defined(SYS_SunOS)