Index: head/multimedia/libx264/Makefile =================================================================== --- head/multimedia/libx264/Makefile (revision 422670) +++ head/multimedia/libx264/Makefile (revision 422671) @@ -1,34 +1,39 @@ # Created by: Michael Johnson # $FreeBSD$ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 PLIST= ${.CURDIR}/pkg-plist LIB_DEPENDS= # USES= pathfix -OPTIONS_DEFINE= HI10P +OPTIONS_DEFINE= HI10P OPENCL +OPTIONS_DEFAULT= OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 + +OPENCL_DESC= Heterogeneous computing via OpenCL +OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl +OPENCL_CONFIGURE_OFF= --disable-opencl CONFIGURE_ARGS= \ --enable-static \ --enable-shared \ --disable-cli PATHFIX_MAKEFILEIN= Makefile PLIST_FILES= # PLIST_SUB+= X264_BUILD=${X264_BUILD} pre-build: .include "${MASTERDIR}/Makefile" Index: head/multimedia/x264/Makefile =================================================================== --- head/multimedia/x264/Makefile (revision 422670) +++ head/multimedia/x264/Makefile (revision 422671) @@ -1,130 +1,129 @@ # Created by: Michael Johnson # $FreeBSD$ # # NOTES FOR UPDATING PORT: # # We use tarballs from the *stable* branch of the upstream git repository. # # X264_BUILD is the "core" number, and can be found in x264.h. # # X264_COMMIT is the commit number, and can be found here: # http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable # # X264_REV requires a checkout the git revision for the version the port # is being updated to. Then run version.sh against it. # # Bumping PORTREVISION for dependent ports? This is useful: # cd $PORTSDIR; for x in $(find . -name "Makefile*" -print); # do str=$(grep -i x264.so $x); if [[ -n $str ]] { echo "$x" }; done PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} PORTREVISION?= 4 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo DISTNAME= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= x264 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= koobs@FreeBSD.org COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) LICENSE= GPLv2 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 X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6 X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} X264_SNAPSHOT= 20150629 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 FFMS GCC LAVF PGO SWSCALE OPTIONS_RADIO+= MP4 OPTIONS_RADIO_MP4+= GPAC LSMASH OPTIONS_DEFAULT+= ASM LSMASH FFMS_DESC= FFmpeg Source input support GPAC_DESC= GPAC library support LAVF_DESC= libav* format input support (requires FFmpeg) LSMASH_DESC= L-SMASH library support MP4_DESC= MPEG-4 output SWSCALE_DESC= Resize video filter ASM_CONFIGURE_OFF= --disable-asm DEBUG_CONFIGURE_ON= --enable-debug DEBUG_CONFIGURE_OFF= --enable-strip FFMS_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMS_CONFIGURE_OFF= --disable-ffms FFMS_IMPLIES= SWSCALE GCC_VARS= USE_GCC=yes GPAC_CONFIGURE_OFF= --disable-gpac GPAC_LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac LAVF_CONFIGURE_OFF= --disable-lavf LAVF_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg LAVF_IMPLIES= SWSCALE LSMASH_LIB_DEPENDS= liblsmash.so:multimedia/l-smash LSMASH_CONFIGURE_OFF= --disable-lsmash 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}" SWSCALE_CONFIGURE_OFF= --disable-swscale SWSCALE_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg CONFIGURE_ARGS?= --system-libx264 CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --disable-opencl \ + --extra-ldflags="${LDFLAGS}" CFLAGS_armv6+= -mcpu=arm1136jf-s post-extract-PGO-on: @${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} \ >${WRKDIR}/${Y4M_VIDEO} post-patch: @${REINPLACE_CMD} -e ' \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e ' \ s|bash|sh|; \ s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \ s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ ${WRKSRC}/version.sh .if !target(pre-build) pre-build: @(${RM} ${WRKSRC}/x264_config.h) .endif .include Index: head/multimedia/x264/files/patch-configure =================================================================== --- head/multimedia/x264/files/patch-configure (revision 422670) +++ head/multimedia/x264/files/patch-configure (revision 422671) @@ -1,53 +1,63 @@ --- configure.orig 2015-06-29 20:45:09 UTC +++ configure @@ -604,12 +604,6 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" if [ $compiler = GNU ]; then - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then - CFLAGS="$CFLAGS -march=i686" - fi - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then - CFLAGS="$CFLAGS -mfpmath=sse -msse" - fi CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" elif [ $compiler = ICC ]; then @@ -639,7 +639,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi ;; - x86_64) + x86_64|amd64) ARCH="X86_64" AS="yasm" AS_EXT=".asm" @@ -678,7 +678,7 @@ case $host_cpu in sparc) ARCH="SPARC" ;; - mips|mipsel|mips64|mips64el) + mips|mipsel|mips64|mips64el|mipsn32) ARCH="MIPS" ;; arm*) @@ -695,7 +695,7 @@ case $host_cpu in AS="${AS-${CC}}" fi ;; - aarch64) + aarch64|arm64) ARCH="AARCH64" if [ "$SYS" = MACOSX ] ; then AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" @@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi -if cc_check '' -Wmaybe-uninitialized ; then - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" -fi - if [ $compiler = ICC -o $compiler = ICL ] ; then if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then define HAVE_INTEL_DISPATCHER +@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then + opencl="yes" + define HAVE_OPENCL + libdl="-ldl" ++ else ++ opencl="yes" ++ define HAVE_OPENCL + fi + LDFLAGS="$LDFLAGS $libdl" + fi