4 files changed, 50 insertions, 27 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index b9a598596aca..facc242e47ee 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#      $Id: Makefile 12 2006-09-30 06:25:13Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20060808
+PORTVERSION=	0.0.20060926
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
@@ -14,6 +15,7 @@ DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Multimedia library and tool for encoding H.264/AVC video streams
 
+WANT_GNOME=	yes
 USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
 USE_GETOPT_LONG=yes
@@ -23,14 +25,8 @@ ALL_TARGET=	default
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
-PLIST_FILES=	bin/x264 \
-		include/x264.h \
-		lib/libx264.a \
-		lib/libx264.so \
-		lib/libx264.so.49 \
-		libdata/pkgconfig/x264.pc
-
 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
@@ -41,6 +37,15 @@ CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_GTK2) || ${HAVE_GNOME:Mgtk20}!=""
+USE_GETTEXT=	yes
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=	--enable-gtk
+PLIST_SUB+=	GTK=""
+.else
+PLIST_SUB+=	GTK="@comment "
+.endif
+
 .if ${OSVERSION} < 500000
 WITHOUT_GPAC=	yes
 .endif
@@ -80,8 +85,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
 		s|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
+		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile \
+		${WRKSRC}/*/Makefile
 
 pre-install:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 355df74c17c5..62200e130962 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20060808-2245.tar.bz2) = b4a117177c9545c458a050aac30d3524
-SHA256 (x264-snapshot-20060808-2245.tar.bz2) = 997e74fbf781148b8346346407f9147e525dd72b6606332671baccf7f1475925
-SIZE (x264-snapshot-20060808-2245.tar.bz2) = 517871
+MD5 (x264-snapshot-20060926-2245.tar.bz2) = a749f76475fc0f2771dd240fe3554efb
+SHA256 (x264-snapshot-20060926-2245.tar.bz2) = b5cf514afe3db2532d3ddf8081b23273f730bd26283b73af420784407456fc1f
+SIZE (x264-snapshot-20060926-2245.tar.bz2) = 545969
diff --git a/multimedia/x264-devel/files/patch-configure b/multimedia/x264-devel/files/patch-configure
index 12a6481ad461..72c5e712fc31 100644
--- a/multimedia/x264-devel/files/patch-configure
+++ b/multimedia/x264-devel/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Sun May 21 16:45:02 2006
-+++ configure	Sun May 28 18:27:03 2006
-@@ -129,7 +129,7 @@
+--- configure.orig	Tue Sep 26 16:45:03 2006
++++ configure	Wed Sep 27 07:56:11 2006
+@@ -115,8 +115,6 @@
+     HAVE_GETOPT_LONG=0
+     ;;
+   *)
+-    echo "Unknown system $MACHINE, edit the configure"
+-    exit 1
+     ;;
+ esac
+ 
+@@ -136,7 +134,7 @@
        ASFLAGS="$ASFLAGS -f elf"
      fi
      ;;
@@ -9,16 +18,7 @@
      ARCH="X86_64"
      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
      AS="yasm"
-@@ -176,8 +176,6 @@
-     ARCH="PARISC"
-     ;;
-   *)
--    echo "Unknown platform $UNAMEM, edit the configure"
--    exit 1
-     ;;
- esac
- 
-@@ -290,7 +288,7 @@
+@@ -293,7 +291,7 @@
      esac
  fi
  
diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist
new file mode 100644
index 000000000000..8485966a9280
--- /dev/null
+++ b/multimedia/x264-devel/pkg-plist
@@ -0,0 +1,16 @@
+bin/x264
+%%GTK%%bin/x264_gtk_encode
+include/x264.h
+%%GTK%%binclude/x264_gtk.h
+%%GTK%%binclude/x264_gtk_enum.h
+lib/libx264.a
+lib/libx264.so
+lib/libx264.so.50
+%%GTK%%blib/libx264gtk.a
+%%GTK%%blib/libx264gtk.so
+%%GTK%%blib/libx264gtk.so.50
+libdata/pkgconfig/x264.pc
+%%GTK%%blibdata/pkgconfig/x264gtk.pc
+%%GTK%%bshare/locale/fr/LC_MESSAGES/x264_gtk.mo
+%%GTK%%b%%DATADIR%%/x264.png
+%%GTK%%b@dirrm %%DATADIR%%