Date: Wed, 13 Apr 2016 09:52:35 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413179 - in head/multimedia: libx264 x264 Message-ID: <201604130952.u3D9qZTv084426@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 13 09:52:35 2016 New Revision: 413179 URL: https://svnweb.freebsd.org/changeset/ports/413179 Log: multimedia/{,lib}x264: modernize - Convert to option helpers - Convert to USES=localbase + respect CPPFLAGS - Convert to USES=shebangfix (can be zsh->bash symlink) - Simplify SLAVE_PORT conditionals into ?=, += and !target() - Drop unnecessary `cd` before PGO sample - Drop no longer necessary .include <bsd.port.options.mk> Approved by: koobs (maintainer, via private mail) Differential Revision: https://reviews.freebsd.org/D5862 Modified: head/multimedia/libx264/Makefile (contents, props changed) head/multimedia/x264/Makefile (contents, props changed) Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Wed Apr 13 09:52:04 2016 (r413178) +++ head/multimedia/libx264/Makefile Wed Apr 13 09:52:35 2016 (r413179) @@ -9,23 +9,26 @@ COMMENT= H.264/MPEG-4 AVC Video Encoding MASTERDIR= ${.CURDIR}/../x264 PLIST= ${.CURDIR}/pkg-plist -USES= gmake pathfix tar:bzip2 +LIB_DEPENDS= # -OPTIONS_DEFINE= ASM DEBUG GCC HI10P PGO -OPTIONS_EXCLUDE= GPAC LAV +USES= pathfix -DEBUG_CONFIGURE_OFF= --enable-strip +OPTIONS_DEFINE= HI10P +OPTIONS_EXCLUDE= GPAC LAVF HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 -CONFIGURE_ARGS= ${CONFIGURE_COMMON_ARGS} \ +CONFIGURE_ARGS= \ --enable-static \ --enable-shared \ --disable-cli PATHFIX_MAKEFILEIN= Makefile +PLIST_FILES= # PLIST_SUB+= X264_BUILD=${X264_BUILD} +pre-build: + .include "${MASTERDIR}/Makefile" Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Wed Apr 13 09:52:04 2016 (r413178) +++ head/multimedia/x264/Makefile Wed Apr 13 09:52:35 2016 (r413179) @@ -36,6 +36,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm>=1.2.0:devel/yasm \ bash:shells/bash +LIB_DEPENDS?= libx264.so:multimedia/libx264 X264_BUILD= 144 X264_REV= 2533 @@ -43,12 +44,15 @@ X264_COMMIT= c8a773ebfca148ef04f5a60d42c X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} X264_SNAPSHOT= 20150629 -USES?= gmake pkgconfig tar:bzip2 +USES?= pkgconfig +USES+= gmake localbase shebangfix tar:bzip2 USE_LDCONFIG= yes HAS_CONFIGURE= yes +SHEBANG_FILES= configure +PLIST_FILES?= bin/x264 -OPTIONS_DEFINE?= ASM DEBUG GCC GPAC LAVF PGO -OPTIONS_DEFAULT?= ASM GPAC +OPTIONS_DEFINE+= ASM DEBUG GCC GPAC LAVF PGO +OPTIONS_DEFAULT+= ASM GPAC GPAC_DESC= MPEG-4 output support LAVF_DESC= libav* format input/output support (requires FFmpeg) @@ -58,6 +62,8 @@ ASM_CONFIGURE_OFF= --disable-asm DEBUG_CONFIGURE_ON= --enable-debug DEBUG_CONFIGURE_OFF= --enable-strip +GCC_VARS= USE_GCC=yes + GPAC_CONFIGURE_OFF= --disable-gpac GPAC_LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac @@ -67,50 +73,30 @@ LAVF_LIB_DEPENDS= libavcodec.so:multimed libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg -CONFIGURE_COMMON_ARGS= --prefix=${PREFIX} \ - --extra-cflags="-I${LOCALBASE}/include" \ - --extra-ldflags="-L${LOCALBASE}/lib" \ - --disable-opencl \ - -CONFIGURE_ARGS?= ${CONFIGURE_COMMON_ARGS} \ - --system-libx264 - -CFLAGS_armv6+= -mcpu=arm1136jf-s - -.include <bsd.port.options.mk> - -.if ${SLAVE_PORT} == "no" -PLIST_FILES+= bin/x264 -LIB_DEPENDS+= libx264.so:multimedia/libx264 -.endif - -.if ${PORT_OPTIONS:MGCC} -USE_GCC= yes -.elif ${PORT_OPTIONS:MPGO} -USE_GCC= any -.endif - -.if ${PORT_OPTIONS:MPGO} +PGO_DISTFILES= ${Y4M_VIDEO_DISTFILE}:pgo +PGO_MAKE_ENV= VIDS="${WRKDIR}/${Y4M_VIDEO}" +PGO_ALL_TARGET= fprofiled # y4m sample video Y4M_VIDEO= example.y4m Y4M_VIDEO_DISTFILE= example.y4m.bz2 +PGO_VARS= USE_GCC=any \ + RESTRICTED="${Y4M_VIDEO_DISTFILE} file may not be mirrored" \ + RESTRICTED_FILES="${Y4M_VIDEO_DISTFILE}" + +CONFIGURE_ARGS?= --system-libx264 +CONFIGURE_ARGS+= --prefix="${PREFIX}" \ + --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --disable-opencl \ -DISTFILES+= ${Y4M_VIDEO_DISTFILE}:pgo -ALL_TARGET= fprofiled -MAKE_ENV+= VIDS="${WRKDIR}/${Y4M_VIDEO}" - -RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored -RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE} -.endif +CFLAGS_armv6+= -mcpu=arm1136jf-s -post-extract: -.if ${PORT_OPTIONS:MPGO} - @( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} ) -.endif +post-extract-PGO-on: + @${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} \ + >${WRKDIR}/${Y4M_VIDEO} post-patch: @${REINPLACE_CMD} -e ' \ - s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e ' \ @@ -119,7 +105,7 @@ post-patch: s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ ${WRKSRC}/version.sh -.if ${SLAVE_PORT} == "no" +.if !target(pre-build) pre-build: @(${RM} ${WRKSRC}/x264_config.h) .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604130952.u3D9qZTv084426>