svn commit: r446081 - in branches/2017Q3/multimedia: libx264 x264 x264/files
Jan Beich
jbeich at FreeBSD.org
Mon Jul 17 16:08:17 UTC 2017
Author: jbeich
Date: Mon Jul 17 16:08:15 2017
New Revision: 446081
URL: https://svnweb.freebsd.org/changeset/ports/446081
Log:
MFH: r445836 r445837 r445838 r445839 r445840
multimedia/{lib,}x264: update to 0.148.2795
- yasm is only used by libx264, so move ASM option there
- yasm is only used on x86, other archs use GNU as
- enable FFMS, LAVF, SWSCALE by default to make package more useful
Changes: https://git.videolan.org/?p=x264.git;a=shortlog;h=aaa9aa83a111ed6f1db253d5afa91c5fc844583f
ABI: https://abi-laboratory.pro/tracker/timeline/x264/
PR: 220694
Approved by: koobs (maintainer)
Differential Revision: https://reviews.freebsd.org/D11566
Approved by: ports-secteam (junovitch)
Deleted:
branches/2017Q3/multimedia/x264/files/patch-armv6
Modified:
branches/2017Q3/multimedia/libx264/Makefile
branches/2017Q3/multimedia/x264/Makefile
branches/2017Q3/multimedia/x264/distinfo
branches/2017Q3/multimedia/x264/files/patch-configure
Directory Properties:
branches/2017Q3/ (props changed)
Modified: branches/2017Q3/multimedia/libx264/Makefile
==============================================================================
--- branches/2017Q3/multimedia/libx264/Makefile Mon Jul 17 15:36:34 2017 (r446080)
+++ branches/2017Q3/multimedia/libx264/Makefile Mon Jul 17 16:08:15 2017 (r446081)
@@ -3,6 +3,7 @@
#
# Updating notes: see multimedia/x264/Makefile.
+PORTREVISION= 0
PKGNAMEPREFIX= lib
COMMENT= H.264/MPEG-4 AVC Video Encoding (Library)
MASTERDIR= ${.CURDIR}/../x264
@@ -13,9 +14,14 @@ LIB_DEPENDS= #
USES= pathfix
-OPTIONS_DEFINE= HI10P OPENCL
-OPTIONS_DEFAULT= OPENCL
+OPTIONS_DEFINE= ASM HI10P 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= yasm>=1.2.0:devel/yasm
+ASM_CONFIGURE_ENABLE= asm
HI10P_DESC= Enable High 10 Profile 10-bit encoding
HI10P_CONFIGURE_ON= --bit-depth=10
Modified: branches/2017Q3/multimedia/x264/Makefile
==============================================================================
--- branches/2017Q3/multimedia/x264/Makefile Mon Jul 17 15:36:34 2017 (r446080)
+++ branches/2017Q3/multimedia/x264/Makefile Mon Jul 17 16:08:15 2017 (r446081)
@@ -19,7 +19,7 @@
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION?= 0
+PORTREVISION?= 1 # 0 in libx264
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -34,15 +34,14 @@ COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End C
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= yasm>=1.2.0:devel/yasm \
- bash:shells/bash
+BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS?= libx264.so:multimedia/libx264
X264_BUILD= 148
-X264_REV= 2768
-X264_COMMIT= d32d7bf1c6923a42cbd5ac2fd540ecbb009ba681
+X264_REV= 2795
+X264_COMMIT= aaa9aa83a111ed6f1db253d5afa91c5fc844583f
X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT= 20170522
+X264_SNAPSHOT= 20170626
USES?= pkgconfig
USES+= gmake localbase shebangfix tar:bzip2
@@ -51,10 +50,10 @@ HAS_CONFIGURE= yes
SHEBANG_FILES= configure
PLIST_FILES?= bin/x264
-OPTIONS_DEFINE+= ASM DEBUG FFMS GCC LAVF PGO SWSCALE
+OPTIONS_DEFINE+= DEBUG FFMS GCC LAVF PGO SWSCALE
OPTIONS_RADIO+= MP4
OPTIONS_RADIO_MP4+= GPAC LSMASH
-OPTIONS_DEFAULT+= ASM LSMASH
+OPTIONS_DEFAULT+= FFMS LAVF LSMASH SWSCALE
FFMS_DESC= FFmpeg Source input support
GPAC_DESC= GPAC library support
@@ -62,8 +61,6 @@ LAVF_DESC= libav* format input support (requires FFmp
LSMASH_DESC= L-SMASH library support
MP4_DESC= MPEG-4 output
SWSCALE_DESC= Resize video filter
-
-ASM_CONFIGURE_ENABLE= asm
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_CONFIGURE_OFF= --enable-strip
Modified: branches/2017Q3/multimedia/x264/distinfo
==============================================================================
--- branches/2017Q3/multimedia/x264/distinfo Mon Jul 17 15:36:34 2017 (r446080)
+++ branches/2017Q3/multimedia/x264/distinfo Mon Jul 17 16:08:15 2017 (r446081)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1495485905
-SHA256 (x264/x264-snapshot-20170522-2245-stable.tar.bz2) = f73d5006d69024d11ef457e430ea046966deb908670a183b93ba1866d4afcb20
-SIZE (x264/x264-snapshot-20170522-2245-stable.tar.bz2) = 735558
+TIMESTAMP = 1498509905
+SHA256 (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 0fe3e49eb8861b8fc429436070fb2dd525d141904a44487c48d1c2d6ad778eae
+SIZE (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 736446
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
Modified: branches/2017Q3/multimedia/x264/files/patch-configure
==============================================================================
--- branches/2017Q3/multimedia/x264/files/patch-configure Mon Jul 17 15:36:34 2017 (r446080)
+++ branches/2017Q3/multimedia/x264/files/patch-configure Mon Jul 17 16:08:15 2017 (r446081)
@@ -1,6 +1,6 @@
---- configure.orig 2015-06-29 20:45:09 UTC
+--- configure.orig 2017-06-26 20:45:05 UTC
+++ configure
-@@ -677,12 +677,6 @@ case $host_cpu in
+@@ -682,12 +682,6 @@ case $host_cpu in
AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then
@@ -13,16 +13,16 @@
CFLAGS="-m32 $CFLAGS"
LDFLAGS="-m32 $LDFLAGS"
fi
-@@ -697,7 +691,7 @@ case $host_cpu in
+@@ -702,7 +696,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32"
fi
;;
- x86_64)
-+ x86_64|amd64)
++ amd64|x86_64)
ARCH="X86_64"
AS="${AS-yasm}"
AS_EXT=".asm"
-@@ -761,7 +755,7 @@ case $host_cpu in
+@@ -776,7 +770,7 @@ case $host_cpu in
AS="${AS-${CC}}"
fi
;;
@@ -30,32 +30,51 @@
+ aarch64|arm64)
ARCH="AARCH64"
stack_alignment=16
- if [ "$SYS" = MACOSX ] ; then
-@@ -882,9 +876,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+ AS="${AS-${CC}}"
+@@ -875,7 +869,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
+ 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 "vpmovzxwd ymm0, xmm0" ; then
+ VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
+ echo "Found $VER"
+@@ -889,9 +883,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
+@@ -902,9 +893,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, adding --disable-asm."
++ echo "No usable SIMD found, assuming --disable-asm."
+ asm="no"
fi
fi
-@@ -911,9 +904,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+@@ -931,9 +921,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, adding --disable-asm."
++ echo "No usable SIMD found, assuming --disable-asm."
+ asm="no"
fi
fi
-@@ -1225,10 +1217,6 @@ if cc_check '' -Wshadow ; then
+@@ -1245,10 +1234,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@@ -66,7 +85,7 @@
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
+@@ -1284,6 +1269,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes"
define HAVE_OPENCL
libdl="-ldl"
More information about the svn-ports-all
mailing list