svn commit: r328372 - head/multimedia/x264

Kubilay Kocak koobs at FreeBSD.org
Thu Sep 26 15:43:37 UTC 2013 

Author: koobs
Date: Thu Sep 26 15:43:36 2013
New Revision: 328372
URL: http://svnweb.freebsd.org/changeset/ports/328372

Log:
  multimedia/x264: Remove PGO as a default OPTION, Big cleanup.
  
  - Remove PGO as a default option, because RESTRICTED DISTFILES is
    causing >500 package builds to be skipped/ignored. I've found a
    number of more liberally licensed test sequences that can be used
    in a future update.
  - Bump PORTREVISION
  
  While I'm here:
  
  - Rename GCC44 option to GCC (4.4 is no longer the default)
  - Split out GCC and ASM options, allowing a user to select to use
    a modern GCC version, and continue to opt-in-or-out of ASM
    optimizations for performance comparisons, benchmarks or the like.
  - Honour WITH_DEBUG from make.conf in DEBUG option
  - Replace USE_GMAKE with USES=gmake
  - pkg-descr: Tab -> space in WWW:
  - Remove LICENSE_FILE for those listed in bsd.licenses.db.mk
  - Remove unused MASTER_SITE_SUBDIR
  - Fix COMMENT conditional assignment since there's no slave port
  - Remove other vestigial SLAVE_PORT items
  - Remove avc2avi related entries (no references in source)
  - Remove TARGET_ARCH from CONFIGURE/MAKE environment (no references)
  - Remove CFLAGS/LDFLAGS from CONFIGURE_ARGS causing duplication
  - Remove pre. and post. mk includes, theyre not needed
  - Remove unecessary MGCC sections related to setting COMPILER_PATH
  - Remove NO_STAGE=yes, since this port is staging compatible aready
  - Whitespace alignment
  
  PR:		ports/171542
  Reported by:	tijl
  Reviewed by:	tijl, bapt

Modified:
  head/multimedia/x264/Makefile
  head/multimedia/x264/pkg-descr   (contents, props changed)

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Thu Sep 26 15:31:53 2013	(r328371)
+++ head/multimedia/x264/Makefile	Thu Sep 26 15:43:36 2013	(r328372)
@@ -3,20 +3,19 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-MASTER_SITE_SUBDIR=	mm/x264
 DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	x264
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	koobs at FreeBSD.org
-COMMENT?=	Library and tool for encoding H.264/AVC video streams
+COMMENT=	Library and tool for encoding H.264/AVC video streams
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
@@ -27,41 +26,39 @@ X264_COMMIT=	37be55213a39db40cf159ada319
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
 X264_SNAPSHOT=	20120721
 
+USES=		gmake
 USE_BZIP2=	yes
-USE_GCC=	any
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	ASM DEBUG PGO GCC44 GPAC X11_OUTPUT
-OPTIONS_DEFAULT=	ASM PGO GPAC
-ASM_DESC=		Assembly optimizations (devel/binutils)
-GCC44_DESC=		Use current GCC (implies WITH_ASM)
+OPTIONS_DEFINE=		ASM DEBUG PGO GCC GPAC X11_OUTPUT
+OPTIONS_DEFAULT=	ASM GPAC
+ASM_DESC=		Enable Assembly Optimizations
+GCC_DESC=		Use current GCC
 GPAC_DESC=		Enable MPEG-4 Output
 X11_OUTPUT_DESC=	Enable X11 Output
 
-CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
-			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \
+CONFIGURE_ARGS+=	--extra-cflags="-I${LOCALBASE}/include" \
+			--extra-ldflags="-L${LOCALBASE}/lib" \
 			--enable-static --enable-shared
 
 PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGCC44}
-USE_GCC?=	yes
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC=	yes
+.elif ${PORT_OPTIONS:MPGO}
+USE_GCC=	any
 .endif
 
-.include <bsd.port.pre.mk>
+.if !${PORT_OPTIONS:MASM}
+CONFIGURE_ARGS+=	--disable-asm
+.endif
 
-.if ${PORT_OPTIONS:MASM} || ${PORT_OPTIONS:MGCC44}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-CONFIGURE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
-.else
-CONFIGURE_ARGS+=		--disable-asm
+.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 # Around the time GCC stack protection (aka Propolice) for userland
@@ -71,16 +68,7 @@ CONFIGURE_ARGS+=		--disable-asm
 LDFLAGS+=	-fstack-protector
 .endif
 
-CONFIGURE_ENV+=	ARCH= \
-		TARGET_ARCH=
-MAKE_ENV+=	ARCH= \
-		TARGET_ARCH=
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO}
 # y4m sample video
 Y4M_VIDEO=example.y4m
 Y4M_VIDEO_DISTFILE=example.y4m.bz2
@@ -102,11 +90,11 @@ CONFIGURE_ARGS+=	--disable-gpac
 
 .if ${PORT_OPTIONS:MX11_OUTPUT}
 CONFIGURE_ARGS+=	--enable-visualize
-USE_XORG=	x11
+USE_XORG=		x11
 .endif
 
 post-extract:
-.if ${PORT_OPTIONS:MPGO} && ${SLAVE_PORT:L}!="yes"
+.if ${PORT_OPTIONS:MPGO}
 	@( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} )
 .endif
 
@@ -120,24 +108,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
-.if ${PORT_OPTIONS:MGCC44}
-	@${REINPLACE_CMD} -e 's|$$(CC) -shared -o|COMPILER_PATH= $$(CC) -shared -o|g' \
-		-e 's|$$(CC) -o|COMPILER_PATH= $$(CC) -o|g' \
-		${WRKSRC}/Makefile
-.endif
-
-.if ${SLAVE_PORT:L}=="no"
-.if 0 # BROKEN
-post-build:
-	cd ${WRKSRC}/tools && ${MAKE} avc2avi
-
-pre-install:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-		${WRKSRC}/x264.pc
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/avc2avi ${PREFIX}/bin
-.endif # BROKEN
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/multimedia/x264/pkg-descr
==============================================================================
--- head/multimedia/x264/pkg-descr	Thu Sep 26 15:31:53 2013	(r328371)
+++ head/multimedia/x264/pkg-descr	Thu Sep 26 15:43:36 2013	(r328372)
@@ -10,4 +10,4 @@ Encoder features
  * Ratecontrol: constant quantizer, constant bitrate, or multipass ABR
  * Scene cut detection
 
-WWW:	http://www.videolan.org/x264.html
+WWW: http://www.videolan.org/x264.html

More information about the svn-ports-head mailing list