Index: head/multimedia/libx264/Makefile =================================================================== --- head/multimedia/libx264/Makefile (revision 533938) +++ head/multimedia/libx264/Makefile (revision 533939) @@ -1,44 +1,44 @@ # Created by: Michael Johnson # $FreeBSD$ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 PLIST= ${.CURDIR}/pkg-plist # Clear dependency on libx264 (itself), see x264/Makefile LIB_DEPENDS= # USES= pathfix LDFLAGS_i386= -Wl,-znotext LDFLAGS_armv6= -Wl,-znotext LDFLAGS_armv7= -Wl,-znotext OPTIONS_DEFINE= ASM OPENCL OPTIONS_DEFAULT= ASM OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE ASM_BUILD_DEPENDS= ${ASM_BUILD_DEPENDS_${ARCH}} ASM_BUILD_DEPENDS_amd64=${ASM_BUILD_DEPENDS_i386} ASM_BUILD_DEPENDS_i386= nasm>=2.13:devel/nasm ASM_CONFIGURE_ENABLE= asm OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_CONFIGURE_ENABLE=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 533938) +++ head/multimedia/x264/Makefile (revision 533939) @@ -1,120 +1,120 @@ # 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_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: # fgrep -lr --include='*/Makefile*' :multimedia/libx264 $PORTSDIR | # sed 's,/Makefile.*,,' | xargs $PORTSDIR/Tools/scripts/bump-revision.sh # or # rg -l :multimedia/libx264 $PORTSDIR | xargs -n1 portedit bump-revision -i PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= https://samples.mplayerhq.hu/yuv4mpeg2/:pgo 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= bash:shells/bash LIB_DEPENDS?= libx264.so:multimedia/libx264 X264_BUILD= 159 -X264_REV= 2991 +X264_REV= 2999 X264_GITVER= ${GL_COMMIT:C/^(.{7}).*/\1/} USES?= pkgconfig USES+= compiler:c11 gmake localbase shebangfix USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://code.videolan.org GL_ACCOUNT= videolan -GL_COMMIT= 1771b556ee45207f8711744ccbd5d42a3949b14c +GL_COMMIT= 296494a4011f58f32adc54304a2654627558c59a HAS_CONFIGURE= yes SHEBANG_FILES= configure PLIST_FILES?= bin/x264 OPTIONS_DEFINE+= DEBUG FFMS LAVF PGO SWSCALE OPTIONS_RADIO+= MP4 OPTIONS_RADIO_MP4+= GPAC LSMASH OPTIONS_DEFAULT+= FFMS LAVF LSMASH SWSCALE 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 DEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_OFF= --enable-strip FFMS_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMS_CONFIGURE_ENABLE= ffms FFMS_IMPLIES= SWSCALE GPAC_LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac GPAC_CONFIGURE_ENABLE= gpac LAVF_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg LAVF_CONFIGURE_ENABLE= lavf LAVF_IMPLIES= SWSCALE LSMASH_LIB_DEPENDS= liblsmash.so:multimedia/l-smash LSMASH_CONFIGURE_ENABLE=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_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg SWSCALE_CONFIGURE_ENABLE= swscale CONFIGURE_ARGS?= --system-libx264 CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ --extra-ldflags="${LDFLAGS}" 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/distinfo =================================================================== --- head/multimedia/x264/distinfo (revision 533938) +++ head/multimedia/x264/distinfo (revision 533939) @@ -1,5 +1,3 @@ -TIMESTAMP = 1574812200 -SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 -SIZE (x264/example.y4m.bz2) = 4910029 -SHA256 (x264/videolan-x264-1771b556ee45207f8711744ccbd5d42a3949b14c_GL0.tar.gz) = 84dfaafd8412bc034058da66d29606aa9ec7e1e7405e97709e63cb7e6fe808ad -SIZE (x264/videolan-x264-1771b556ee45207f8711744ccbd5d42a3949b14c_GL0.tar.gz) = 932468 +TIMESTAMP = 1586435782 +SHA256 (x264/videolan-x264-296494a4011f58f32adc54304a2654627558c59a_GL0.tar.gz) = eb57e0be1a27fc70faa2844c5f8e66cde6f5c59c66162ccf988c93c74f42f04d +SIZE (x264/videolan-x264-296494a4011f58f32adc54304a2654627558c59a_GL0.tar.gz) = 932841