Index: head/multimedia/x264/Makefile =================================================================== --- head/multimedia/x264/Makefile (revision 563232) +++ head/multimedia/x264/Makefile (revision 563233) @@ -1,129 +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_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?= 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= 161 -X264_REV= 3020 +X264_REV= 3039 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= d198931a63049db1f2c92d96c34904c69fde8117 +GL_COMMIT= 544c61f082194728d0391fb280a6e138ba320a96 HAS_CONFIGURE= yes SHEBANG_FILES= configure PLIST_FILES?= bin/x264 OPTIONS_DEFINE+= BASH DEBUG FFMS LAVF PGO SWSCALE OPTIONS_RADIO+= MP4 OPTIONS_RADIO_MP4+= GPAC LSMASH OPTIONS_DEFAULT+= BASH FFMS LAVF LSMASH SWSCALE .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif 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 BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion BASH_RUN_DEPENDS= bash-completion>0:shells/bash-completion BASH_CONFIGURE_ENABLE= bashcompletion BASH_PLIST_FILES= share/bash-completion/completions/x264 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 563232) +++ head/multimedia/x264/distinfo (revision 563233) @@ -1,5 +1,5 @@ -TIMESTAMP = 1599931437 +TIMESTAMP = 1611497079 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 SIZE (x264/example.y4m.bz2) = 4910029 -SHA256 (x264/videolan-x264-d198931a63049db1f2c92d96c34904c69fde8117_GL0.tar.gz) = 3474023542414706ed0620a5438ce5c700bdedede323831746384a971f0565fd -SIZE (x264/videolan-x264-d198931a63049db1f2c92d96c34904c69fde8117_GL0.tar.gz) = 934108 +SHA256 (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 076c78b6cb0b744eec46ea5a7aab141e266a84dd6c858ca88227e547027ab82a +SIZE (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 936634 Index: head/multimedia/x264/files/patch-configure =================================================================== --- head/multimedia/x264/files/patch-configure (revision 563232) +++ head/multimedia/x264/files/patch-configure (revision 563233) @@ -1,97 +1,88 @@ --- configure.orig 2020-09-12 17:23:57 UTC +++ configure @@ -743,12 +743,6 @@ case $host_cpu in AS_EXT=".asm" ASFLAGS="$ASFLAGS -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 -msse2" - fi CFLAGS="-m32 $CFLAGS" LDFLAGS="-m32 $LDFLAGS" fi @@ -763,7 +757,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf32" fi ;; - x86_64) + amd64|x86_64) ARCH="X86_64" AS="${AS-nasm}" AS_EXT=".asm" -@@ -839,7 +833,7 @@ case $host_cpu in - AS="${AS-${CC}}" - fi - ;; -- aarch64) -+ aarch64|arm64) - ARCH="AARCH64" - stack_alignment=16 - if [ "$SYS" = MACOSX ] ; then @@ -952,7 +946,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p fi fi -if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then +if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )" echo "Found $VER" @@ -965,9 +959,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ fi if [ $asm = auto -a $ARCH = ARM ] ; then - # set flags so neon is built by default - [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" - cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then define HAVE_ARMV6 @@ -978,9 +969,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON ASFLAGS="$ASFLAGS -c" else - echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 + echo "No usable SIMD found, assuming --disable-asm." + asm="no" fi fi @@ -1012,9 +1002,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then define HAVE_MSA else - echo "You specified a pre-MSA CPU in your CFLAGS." - echo "If you really want to run on such a CPU, configure with --disable-asm." - exit 1 + echo "No usable SIMD found, assuming --disable-asm." + asm="no" fi fi @@ -1343,10 +1332,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi -if cc_check '' -Wmaybe-uninitialized ; then - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" -fi - if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then CFLAGS="$CFLAGS -fvisibility=hidden" fi @@ -1386,6 +1371,9 @@ if [ "$opencl" = "yes" ]; then opencl="yes" define HAVE_OPENCL "(BIT_DEPTH==8)" libdl="-ldl" + else + opencl="yes" + define HAVE_OPENCL "(BIT_DEPTH==8)" fi LDFLAGS="$LDFLAGS $libdl" fi