o Add PGO option to enable Profile-Guided Optimization build support.

o Add DIST_SUBDIR since a y4m video sample fetched when WITH_PGO
  has a name that is too generic.
o Add RESTRICTED specifically for the same y4m video sample when
  WITH_PGO. This sample cannot be mirrored even though the port may
  still be both packaged and redistributed.
o Be pedantic when declaring port variables to insure slave port
  safety
o No PORTREVISION bump since there was neither functionality nor
  PLIST change

4 files changed, 62 insertions, 10 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index c70cf287850f..41c68d495dfd 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -9,8 +9,12 @@ PORTNAME=	x264
 PORTVERSION=	0.0.20080409
 PORTREVISION?=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
+MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
+		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
+DISTFILES=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
+DIST_SUBDIR=	x264
+EXTRACT_ONLY=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Multimedia library and tool for encoding H.264/AVC video streams
@@ -27,7 +31,8 @@ USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
 OPTIONS=	DEBUG "Enable Debugging" Off \
-		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
+		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
+		PGO "Enable Profile-Guided Optimization" Off
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
@@ -58,6 +63,19 @@ MAKE_ENV+=	ARCH=${ARCH}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+# y4m sample video
+Y4M_VIDEO=example.y4m
+Y4M_VIDEO_DISTFILE=example.y4m.bz2
+
+DISTFILES+=	${Y4M_VIDEO_DISTFILE}
+ALL_TARGET=	fprofiled
+MAKE_ENV+=	VIDS="${WRKDIR}/${Y4M_VIDEO}"
+
+RESTRICTED=	${Y4M_VIDEO}.bz2 file may not be mirrored
+RESTRICTED_FILES=	${Y4M_VIDEO_DISTFILE}
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -funroll-loops -ffast-math
 .endif
@@ -73,6 +91,11 @@ CONFIGURE_ARGS+=	--enable-visualize
 USE_XORG=	x11
 .endif
 
+post-extract:
+.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
 		s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index c6d1f508efb4..eaf9b3e3cb02 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,6 @@
-MD5 (x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
-SHA256 (x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
-SIZE (x264-snapshot-20080409-2245.tar.bz2) = 1919929
+MD5 (x264/x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
+SHA256 (x264/x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
+SIZE (x264/x264-snapshot-20080409-2245.tar.bz2) = 1919929
+MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
+SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
+SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index c70cf287850f..41c68d495dfd 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -9,8 +9,12 @@ PORTNAME=	x264
 PORTVERSION=	0.0.20080409
 PORTREVISION?=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/
+MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
+		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
+DISTFILES=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
+DIST_SUBDIR=	x264
+EXTRACT_ONLY=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Multimedia library and tool for encoding H.264/AVC video streams
@@ -27,7 +31,8 @@ USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
 OPTIONS=	DEBUG "Enable Debugging" Off \
-		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
+		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
+		PGO "Enable Profile-Guided Optimization" Off
 
 CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
@@ -58,6 +63,19 @@ MAKE_ENV+=	ARCH=${ARCH}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+# y4m sample video
+Y4M_VIDEO=example.y4m
+Y4M_VIDEO_DISTFILE=example.y4m.bz2
+
+DISTFILES+=	${Y4M_VIDEO_DISTFILE}
+ALL_TARGET=	fprofiled
+MAKE_ENV+=	VIDS="${WRKDIR}/${Y4M_VIDEO}"
+
+RESTRICTED=	${Y4M_VIDEO}.bz2 file may not be mirrored
+RESTRICTED_FILES=	${Y4M_VIDEO_DISTFILE}
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -funroll-loops -ffast-math
 .endif
@@ -73,6 +91,11 @@ CONFIGURE_ARGS+=	--enable-visualize
 USE_XORG=	x11
 .endif
 
+post-extract:
+.if defined(WITH_PGO) && ${SLAVE_PORT:L}!="yes"
+	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
 		s|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index c6d1f508efb4..eaf9b3e3cb02 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,3 +1,6 @@
-MD5 (x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
-SHA256 (x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
-SIZE (x264-snapshot-20080409-2245.tar.bz2) = 1919929
+MD5 (x264/x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
+SHA256 (x264/x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
+SIZE (x264/x264-snapshot-20080409-2245.tar.bz2) = 1919929
+MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
+SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
+SIZE (x264/example.y4m.bz2) = 4910029