- Update to 0.0.20061030

6 files changed, 40 insertions, 22 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 4665f4e..5fdcdf4 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#      $Id: Makefile 12 2006-09-30 06:25:13Z buhnux $
+#      $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20060926
-PORTREVISION=	2
+PORTVERSION=	0.0.20061030
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 62200e1..445baca 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20060926-2245.tar.bz2) = a749f76475fc0f2771dd240fe3554efb
-SHA256 (x264-snapshot-20060926-2245.tar.bz2) = b5cf514afe3db2532d3ddf8081b23273f730bd26283b73af420784407456fc1f
-SIZE (x264-snapshot-20060926-2245.tar.bz2) = 545969
+MD5 (x264-snapshot-20061030-2245.tar.bz2) = 07db2ffd2ec4d2bc60b12baa379dc088
+SHA256 (x264-snapshot-20061030-2245.tar.bz2) = 51bb52e0082f32885b4d0d9a076ccd3ccd6834d4bd22c711eff3af2b77fbe2fc
+SIZE (x264-snapshot-20061030-2245.tar.bz2) = 478678
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure
index 72c5e71..02d0e76 100644
--- a/multimedia/x264-devel/files/patch-configure
+++ b/multimedia/x264-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep 26 16:45:03 2006
-+++ configure	Wed Sep 27 07:56:11 2006
-@@ -115,8 +115,6 @@
+--- configure.orig	Tue Oct 24 16:45:02 2006
++++ configure	Wed Oct 25 08:21:32 2006
+@@ -113,8 +113,6 @@
      HAVE_GETOPT_LONG=0
      ;;
    *)
@@ -9,7 +9,7 @@
      ;;
  esac
  
-@@ -136,7 +134,7 @@
+@@ -134,7 +132,7 @@
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -18,7 +18,7 @@
      ARCH="X86_64"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      AS="yasm"
-@@ -293,7 +291,7 @@
+@@ -283,7 +281,7 @@
      esac
  fi
  
@@ -27,3 +27,13 @@
  if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
      MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
  fi
+@@ -363,7 +361,8 @@
+ cp config.mak gtk/config.mak
+ 
+ if [ "$shared" = "yes" ]; then
+-    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
++#    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
++    API=50
+     echo "SONAME=libx264.so.$API" >> config.mak
+     echo 'default: $(SONAME)' >> config.mak
+     if [ "$gtk" = "yes" ]; then
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 4665f4e..5fdcdf4 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -3,11 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#      $Id: Makefile 12 2006-09-30 06:25:13Z buhnux $
+#      $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20060926
-PORTREVISION=	2
+PORTVERSION=	0.0.20061030
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 62200e1..445baca 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20060926-2245.tar.bz2) = a749f76475fc0f2771dd240fe3554efb
-SHA256 (x264-snapshot-20060926-2245.tar.bz2) = b5cf514afe3db2532d3ddf8081b23273f730bd26283b73af420784407456fc1f
-SIZE (x264-snapshot-20060926-2245.tar.bz2) = 545969
+MD5 (x264-snapshot-20061030-2245.tar.bz2) = 07db2ffd2ec4d2bc60b12baa379dc088
+SHA256 (x264-snapshot-20061030-2245.tar.bz2) = 51bb52e0082f32885b4d0d9a076ccd3ccd6834d4bd22c711eff3af2b77fbe2fc
+SIZE (x264-snapshot-20061030-2245.tar.bz2) = 478678
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 72c5e71..02d0e76 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep 26 16:45:03 2006
-+++ configure	Wed Sep 27 07:56:11 2006
-@@ -115,8 +115,6 @@
+--- configure.orig	Tue Oct 24 16:45:02 2006
++++ configure	Wed Oct 25 08:21:32 2006
+@@ -113,8 +113,6 @@
      HAVE_GETOPT_LONG=0
      ;;
    *)
@@ -9,7 +9,7 @@
      ;;
  esac
  
-@@ -136,7 +134,7 @@
+@@ -134,7 +132,7 @@
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -18,7 +18,7 @@
      ARCH="X86_64"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      AS="yasm"
-@@ -293,7 +291,7 @@
+@@ -283,7 +281,7 @@
      esac
  fi
  
@@ -27,3 +27,13 @@
  if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
      MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
  fi
+@@ -363,7 +361,8 @@
+ cp config.mak gtk/config.mak
+ 
+ if [ "$shared" = "yes" ]; then
+-    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
++#    API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
++    API=50
+     echo "SONAME=libx264.so.$API" >> config.mak
+     echo 'default: $(SONAME)' >> config.mak
+     if [ "$gtk" = "yes" ]; then