- Update to 0.0.20050531

6 files changed, 28 insertions, 24 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 451def929f29..6b2c5447e53d 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20050518
+PORTVERSION=	0.0.20050531
+PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|} \
+		http://people.freebsd.org/~ahze/distfiles/
 #		http://download.videolan.org/pub/videolan/contrib/ \
 #		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
@@ -38,6 +40,7 @@ OPTIONS=	GPAC "Enable MPEG-4 Output" On \
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib"
+#			--enable-pthread
 
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index f70923288e59..1c846e3b5382 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20050518.tar.bz2) = 0e7fd84660dc1eb8590371a87dae6105
-SIZE (x264-20050518.tar.bz2) = 190343
+MD5 (x264-20050531.tar.bz2) = f7abb0de617044df7c897cfbed9bb113
+SIZE (x264-20050531.tar.bz2) = 198722
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure
index 0f8a1266f21f..07e2121c6761 100644
--- a/multimedia/x264-devel/files/patch-configure
+++ b/multimedia/x264-devel/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Wed May 18 22:55:05 2005
-+++ configure	Sat May 21 12:19:02 2005
-@@ -24,8 +24,8 @@
+--- configure.orig	Tue May 31 12:27:55 2005
++++ configure	Tue May 31 12:35:38 2005
+@@ -32,8 +32,8 @@
  vfw="no"
  vis="no"
  
 -CC="gcc"
--CFLAGS="-Wall -I. -O4 -funroll-loops -ffast-math -D__X264__"
+-CFLAGS="-Wall -I. -O4 -ffast-math -D__X264__"
 +#CC="gcc"
-+CFLAGS="-Wall -I. -D__X264__"
++CFLAGS="-Wall -I.  -ffast-math -D__X264__"
  LDFLAGS=""
  
  AS="nasm"
-@@ -77,9 +77,9 @@
+@@ -85,9 +85,9 @@
      ARCH="X86"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      ;;
@@ -24,7 +24,7 @@
      AS="yasm"
      ASFLAGS="-f elf -m amd64"
      ;;
-@@ -92,9 +92,12 @@
+@@ -100,9 +100,12 @@
        CFLAGS="$CFLAGS -maltivec -mabi=altivec"
      fi
      ;;
@@ -38,4 +38,3 @@
 +    CFLAGS="$CFLAGS"
      ;;
  esac
- 
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 451def929f29..6b2c5447e53d 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20050518
+PORTVERSION=	0.0.20050531
+PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|} \
+		http://people.freebsd.org/~ahze/distfiles/
 #		http://download.videolan.org/pub/videolan/contrib/ \
 #		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
@@ -38,6 +40,7 @@ OPTIONS=	GPAC "Enable MPEG-4 Output" On \
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib"
+#			--enable-pthread
 
 .include <bsd.port.pre.mk>
 
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index f70923288e59..1c846e3b5382 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20050518.tar.bz2) = 0e7fd84660dc1eb8590371a87dae6105
-SIZE (x264-20050518.tar.bz2) = 190343
+MD5 (x264-20050531.tar.bz2) = f7abb0de617044df7c897cfbed9bb113
+SIZE (x264-20050531.tar.bz2) = 198722
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 0f8a1266f21f..07e2121c6761 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Wed May 18 22:55:05 2005
-+++ configure	Sat May 21 12:19:02 2005
-@@ -24,8 +24,8 @@
+--- configure.orig	Tue May 31 12:27:55 2005
++++ configure	Tue May 31 12:35:38 2005
+@@ -32,8 +32,8 @@
  vfw="no"
  vis="no"
  
 -CC="gcc"
--CFLAGS="-Wall -I. -O4 -funroll-loops -ffast-math -D__X264__"
+-CFLAGS="-Wall -I. -O4 -ffast-math -D__X264__"
 +#CC="gcc"
-+CFLAGS="-Wall -I. -D__X264__"
++CFLAGS="-Wall -I.  -ffast-math -D__X264__"
  LDFLAGS=""
  
  AS="nasm"
-@@ -77,9 +77,9 @@
+@@ -85,9 +85,9 @@
      ARCH="X86"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      ;;
@@ -24,7 +24,7 @@
      AS="yasm"
      ASFLAGS="-f elf -m amd64"
      ;;
-@@ -92,9 +92,12 @@
+@@ -100,9 +100,12 @@
        CFLAGS="$CFLAGS -maltivec -mabi=altivec"
      fi
      ;;
@@ -38,4 +38,3 @@
 +    CFLAGS="$CFLAGS"
      ;;
  esac
-