- Update to 20070531 snapshot

- Remove optional GTK2 support for a x264-gtk slave port

5 files changed, 37 insertions, 60 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 40cb8e25b39d..d91743e352f4 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,14 +6,14 @@
 #      $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20070402
-PORTREVISION=	3
+PORTVERSION=	0.0.20070531
+PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
 
 MAINTAINER=	multimedia@FreeBSD.org
-COMMENT=	Multimedia library and tool for encoding H.264/AVC video streams
+COMMENT?=	Multimedia library and tool for encoding H.264/AVC video streams
 
 WANT_GNOME=	yes
 USE_BZIP2=	yes
@@ -25,11 +25,8 @@ ALL_TARGET=	default
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
-OPTIONS=	GPAC "Enable MPEG-4 Output" On \
-		GTK2 "Enable GTK2+ Frontend" On \
-		DEBUG "Enable Debugging" Off \
-		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
-		X11_OUTPUT "Enable X11 Output" Off
+OPTIONS=	DEBUG "Enable Debugging" Off \
+		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -37,13 +34,17 @@ CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_GTK2) || ${HAVE_GNOME:Mgtk20}!=""
+.if defined(WITH_GTK2) && ${SLAVE_PORT:L}=="yes"
+LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
+BUILD_WRKSRC=	${WRKSRC}/gtk
+INSTALL_WRKSRC=	${WRKSRC}/gtk
+ALL_TARGET=	all
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk
-PLIST_SUB+=	GTK=""
 .else
-PLIST_SUB+=	GTK="@comment "
+OPTIONS+=	GPAC "Enable MPEG-4 Output" On \
+		X11_OUTPUT "Enable X11 Output" Off
 .endif
 
 .if ${ARCH}=="i386"
@@ -85,6 +86,7 @@ post-patch:
 		${WRKSRC}/Makefile \
 		${WRKSRC}/*/Makefile
 
+.if ${SLAVE_PORT:L}=="no"
 post-build:
 	cd ${WRKSRC}/tools && ${MAKE} avc2avi
 
@@ -94,5 +96,6 @@ pre-install:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/avc2avi ${PREFIX}/bin
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 10adac7495d6..88afa639dd44 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20070402-2245.tar.bz2) = 359afee8f3bbfeb5a9593c167247d0ac
-SHA256 (x264-snapshot-20070402-2245.tar.bz2) = c10c0c0b8f08dcb4ba97be25b4f3b1522d1e79dbe1c4254102ae082f66afe01c
-SIZE (x264-snapshot-20070402-2245.tar.bz2) = 509770
+MD5 (x264-snapshot-20070531-2245.tar.bz2) = b7788e384e02be091b1348f06fd4f900
+SHA256 (x264-snapshot-20070531-2245.tar.bz2) = cdf1745a8c5a9e54b18d23a18c2450a1c705a1f02ce79c188b89aa4f859e5326
+SIZE (x264-snapshot-20070531-2245.tar.bz2) = 501133
diff --git a/multimedia/x264-devel/files/patch-amd64-sse3 b/multimedia/x264-devel/files/patch-amd64-sse3
deleted file mode 100644
index 8cfedc779669..000000000000
--- a/multimedia/x264-devel/files/patch-amd64-sse3
+++ /dev/null
@@ -1,36 +0,0 @@
---- common/amd64/quant-a.asm.orig	Tue Apr  3 12:50:00 2007
-+++ common/amd64/quant-a.asm	Tue Apr  3 12:50:17 2007
-@@ -45,9 +45,11 @@
- cglobal x264_quant_4x4_core15_mmx
- cglobal x264_quant_8x8_core15_mmx
- 
-+%ifdef HAVE_SSE3
- cglobal x264_quant_4x4_dc_core15_ssse3
- cglobal x264_quant_4x4_core15_ssse3
- cglobal x264_quant_8x8_core15_ssse3
-+%endif
- 
- cglobal x264_quant_2x2_dc_core16_mmxext
- cglobal x264_quant_4x4_dc_core16_mmxext
---- common/amd64/pixel-sse2.asm.orig	Tue Apr  3 12:53:31 2007
-+++ common/amd64/pixel-sse2.asm	Tue Apr  3 12:54:29 2007
-@@ -50,15 +50,19 @@
- cglobal x264_pixel_satd_16x8_sse2
- cglobal x264_pixel_satd_8x16_sse2
- cglobal x264_pixel_satd_16x16_sse2
-+%ifdef HAVE_SSE3
- cglobal x264_pixel_satd_8x4_ssse3
- cglobal x264_pixel_satd_8x8_ssse3
- cglobal x264_pixel_satd_16x8_ssse3
- cglobal x264_pixel_satd_8x16_ssse3
- cglobal x264_pixel_satd_16x16_ssse3
-+%endif
- cglobal x264_pixel_sa8d_8x8_sse2
- cglobal x264_pixel_sa8d_16x16_sse2
-+%ifdef HAVE_SSE3
- cglobal x264_pixel_sa8d_8x8_ssse3
- cglobal x264_pixel_sa8d_16x16_ssse3
-+%endif
- cglobal x264_intra_sa8d_x3_8x8_core_sse2
- cglobal x264_pixel_ssim_4x4x2_core_sse2
- cglobal x264_pixel_ssim_end4_sse2
diff --git a/multimedia/x264-devel/files/patch-gtk_Makefile b/multimedia/x264-devel/files/patch-gtk_Makefile
new file mode 100644
index 000000000000..c03a6c7bef82
--- /dev/null
+++ b/multimedia/x264-devel/files/patch-gtk_Makefile
@@ -0,0 +1,20 @@
+--- gtk/Makefile.orig	Fri Jun  1 08:18:59 2007
++++ gtk/Makefile	Fri Jun  1 08:19:28 2007
+@@ -46,14 +46,14 @@
+ 
+ X264GTK_PC = x264gtk.pc
+ 
+-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
++EXTERNAL_DEPS= ../muxers.o ../matroska.o
+ 
+ 
+ all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
+ 
+ # Already provides iconv/intl
+-CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
+-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
++CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0 x264` -I.. -DX264_DATA_DIR=\"${datadir}\"
++LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
+ 
+ 
+ # gettext rules
diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist
index 6a42a46b07d3..26fb1a836164 100644
--- a/multimedia/x264-devel/pkg-plist
+++ b/multimedia/x264-devel/pkg-plist
@@ -1,17 +1,7 @@
 bin/x264
 bin/avc2avi
-%%GTK%%bin/x264_gtk_encode
 include/x264.h
-%%GTK%%include/x264_gtk.h
-%%GTK%%include/x264_gtk_enum.h
 lib/libx264.a
 lib/libx264.so
 lib/libx264.so.50
-%%GTK%%lib/libx264gtk.a
-%%GTK%%lib/libx264gtk.so
-%%GTK%%lib/libx264gtk.so.50
 libdata/pkgconfig/x264.pc
-%%GTK%%libdata/pkgconfig/x264gtk.pc
-%%GTK%%share/locale/fr/LC_MESSAGES/x264_gtk.mo
-%%GTK%%%%DATADIR%%/x264.png
-%%GTK%%@dirrm %%DATADIR%%