Update to 2008-04-09 snapshot

Requested by:	Roman Divacky <rdivacky@freebsd.org>

5 files changed, 29 insertions, 29 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 601d8b88d2a4..8bcb93b87d75 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,7 +6,7 @@
 #      $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20070913
+PORTVERSION=	0.0.20080409
 PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
@@ -86,6 +86,7 @@ post-patch:
 		${WRKSRC}/*/Makefile
 
 .if ${SLAVE_PORT:L}=="no"
+.if 0 # BROKEN
 post-build:
 	cd ${WRKSRC}/tools && ${MAKE} avc2avi
 
@@ -95,6 +96,7 @@ pre-install:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/avc2avi ${PREFIX}/bin
+.endif # BROKEN
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 9e6101f3ab91..c6d1f508efb4 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20070913-2245.tar.bz2) = 2d0139c1aa72ff1c252fd2efc1a6ce97
-SHA256 (x264-snapshot-20070913-2245.tar.bz2) = d2479ca0734fb8cf00576af84f24194c93dcae740181cbcdcf30d47b29249201
-SIZE (x264-snapshot-20070913-2245.tar.bz2) = 535901
+MD5 (x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
+SHA256 (x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
+SIZE (x264-snapshot-20080409-2245.tar.bz2) = 1919929
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 6e29cc11c6ac..3bbfaefda8da 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,20 +1,20 @@
---- Makefile.orig	2007-07-09 10:11:24.000000000 -0400
-+++ Makefile	2007-07-09 10:11:49.000000000 -0400
-@@ -18,7 +18,7 @@
- endif
+--- Makefile.orig	2008-04-09 16:45:06.000000000 -0400
++++ Makefile	2008-04-09 20:47:32.490510083 -0400
+@@ -26,7 +26,7 @@
+           cpu-32.asm dct-32.asm
+ X86SRC = $(X86SRC0:%=common/x86/%)
  
- # MMX/SSE optims
 -ifeq ($(ARCH),X86)
 +ifeq ($(ARCH),i386)
- ifneq ($(AS),)
- SRCS   += common/i386/mc-c.c common/i386/predict-c.c
- ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
-@@ -32,7 +32,7 @@
+ SRCS   += common/x86/mc-c.c common/x86/predict-c.c
+ ASMSRC  = $(X86SRC) common/x86/pixel-32.asm
+ OBJASM  = $(ASMSRC:%.asm=%.o)
+@@ -35,7 +35,7 @@
+ checkasm: tools/checkasm-32.o
  endif
  
- # MMX/SSE optims
 -ifeq ($(ARCH),X86_64)
 +ifeq ($(ARCH),amd64)
- ifneq ($(AS),)
- SRCS   += common/i386/mc-c.c common/i386/predict-c.c
- ASMSRC  = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
+ SRCS   += common/x86/mc-c.c common/x86/predict-c.c
+ ASMSRC  = $(X86SRC:-32.asm=-64.asm)
+ OBJASM  = $(ASMSRC:%.asm=%.o)
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure
index b3dd7ddf0f2a..052d3036cd26 100644
--- a/multimedia/x264-devel/files/patch-configure
+++ b/multimedia/x264-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-13 16:45:04.000000000 -0400
-+++ configure	2007-09-14 10:39:22.000000000 -0400
-@@ -252,7 +252,7 @@
+--- configure.orig	2008-04-09 16:45:06.000000000 -0400
++++ configure	2008-04-09 20:48:37.722733173 -0400
+@@ -248,7 +248,7 @@
      fi
      as_check || AS="nasm"
      ;;
@@ -8,23 +8,22 @@
 +  x86_64 | amd64)
      ARCH="X86_64"
      AS="yasm"
-     ASFLAGS="-f elf -m amd64"
-@@ -361,7 +361,7 @@
+     if [ "$SYS" = MACOSX ];then
+@@ -372,7 +372,7 @@
      LDFLAGS="$LDFLAGS $libpthread"
  fi
  
 -MP4_LDFLAGS="-lgpac_static"
 +MP4_LDFLAGS="-lgpac"
- if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
+ if [ $SYS = MINGW ]; then
      MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
  fi
-@@ -443,7 +443,8 @@
+@@ -458,7 +458,7 @@
  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
+     if [ "$SYS" = "MINGW" ]; then
+         echo "SONAME=libx264-$API.dll" >> config.mak
+         echo 'IMPLIBNAME=libx264.dll.a' >> config.mak
diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist
index 26fb1a836164..e6eb6cdcd9eb 100644
--- a/multimedia/x264-devel/pkg-plist
+++ b/multimedia/x264-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/x264
-bin/avc2avi
 include/x264.h
 lib/libx264.a
 lib/libx264.so