Subject: x264-devel upgrade patch
To: None <tech-pkg@netbsd.org>
From: None <adam.hoka@gmail.com>
List: tech-pkg
Date: 12/22/2007 02:29:40
Hello tech-pkg!

I needed a newer version of x264 so here's the patch.
I hope it works ok on dragonfly, but I couldn't test it.
It looks like patch-ab is no longer necessary.

--

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/x264-devel/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2 Dec 2007 13:04:12 -0000	1.3
+++ Makefile	19 Dec 2007 15:29:14 -0000
@@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.3 2007/12/02 13:04:12 wiz Exp $
  #

-SNAPSHOT_DATE=		20060127
+SNAPSHOT_DATE=		20071218

  DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
  PKGNAME=		x264-devel-${SNAPSHOT_DATE}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/x264-devel/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	23 Feb 2006 18:11:27 -0000	1.3
+++ distinfo	19 Dec 2007 15:29:14 -0000
@@ -1,7 +1,6 @@
  $NetBSD: distinfo,v 1.3 2006/02/23 18:11:27 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) = 310f7ffc9f7ab0a0f1160dfebd1d57a13e65fc77
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/x264-devel/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa	23 Feb 2006 18:11:27 -0000	1.2
+++ patches/patch-aa	19 Dec 2007 15:29:14 -0000
@@ -1,24 +1,31 @@
  $NetBSD: patch-aa,v 1.2 2006/02/23 18:11:27 joerg Exp $

---- configure.orig	2006-01-27 21:45:02.000000000 +0000
+--- configure.orig	2007-12-18 21:45:04.000000000 +0000
  +++ configure
-@@ -75,6 +75,10 @@ case "$UNAMES" in
-     SYS="FREEBSD"
+@@ -198,6 +198,10 @@ case $host_os in
+     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
       LDFLAGS="$LDFLAGS -lm"
       ;;
-+  DragonFly)
++  dragonfly)
  +    SYS="DRAGONFLY"
  +    LDFLAGS="$LDFLAGS -lm"
  +    ;;
-   NetBSD)
+   netbsd*)
       SYS="NETBSD"
       LDFLAGS="$LDFLAGS -lm"
-@@ -122,7 +126,7 @@ case "$UNAMEM" in
-       ASFLAGS="-f macho -DPREFIX"
+@@ -245,14 +249,12 @@ case $host_cpu in
+       ASFLAGS="$ASFLAGS -f macho -DPREFIX"
+     elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then
+       ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
+-    elif [ "$SYS" = NETBSD ]; then
+-      ASFLAGS="$ASFLAGS -f aoutb"
+     else
+       ASFLAGS="$ASFLAGS -f elf"
       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