multimedia/{lib,}x264: update to 0.152.2854

Changes: https://git.videolan.org/?p=x264.git;a=shortlog;h=e9a5903edf8ca59ef20e6f4894c196f135af735e
svn path=/head/; revision=457488
2017-12-29 02:55:42 +00:00 · 2017-12-29 02:55:42 +00:00 · 32ea2cb7fc · 2021-03-31 03:12:20 +00:00
commit 32ea2cb7fc
parent 7ca593d8b7
22 changed files with 39 additions and 37 deletions
--- a/multimedia/avidemux/Makefile.common
+++ b/multimedia/avidemux/Makefile.common
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION?=	3
+PORTREVISION?=	4
 AVIDEMUX_VERSION=	2.6.11
 MASTER_SITES=	\
 		SF/avidemux/avidemux/${PORTVERSION}
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	ccextractor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.85
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia

 MAINTAINER=	oz@nixil.net
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ffmpeg
 PORTVERSION=	3.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.17
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $

-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia

 COMMENT=	Gstreamer x264 plugin
--- a/multimedia/gstreamer1-plugins-x264/Makefile
+++ b/multimedia/gstreamer1-plugins-x264/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia

 COMMENT=	GStreamer libx264 based H264 plugin
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	handbrake
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 DIST_SUBDIR=	${PORTNAME}

--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libav
 PORTVERSION=	12.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/

--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
-PORTREVISION?=	18
+PORTREVISION?=	19
 CATEGORIES=	multimedia
 MASTER_SITES=	SF

--- a/multimedia/libx264/Makefile
+++ b/multimedia/libx264/Makefile
@ -20,7 +20,7 @@ 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_BUILD_DEPENDS_i386=	nasm>=2.13:devel/nasm
 ASM_CONFIGURE_ENABLE=	asm

 HI10P_DESC=		Enable High 10 Profile 10-bit encoding
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio

 MAINTAINER=	riggs@FreeBSD.org
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	38
+PORTREVISION=	39
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
--- a/multimedia/msx264/Makefile
+++ b/multimedia/msx264/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	msx264
 PORTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/

--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	obs-studio
 PORTVERSION=	20.1.3
+PORTREVISION=	1
 CATEGORIES=	multimedia

 MAINTAINER=	ports@FreeBSD.org
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	31
+PORTREVISION=	32
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/france/transcode-tcforge/downloads/

--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	vlc
 DISTVERSION=	2.2.6
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@ -19,7 +19,7 @@

 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	2 # 0 in libx264
+PORTREVISION?=	0 # 0 in libx264
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@ -37,11 +37,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS?=	libx264.so:multimedia/libx264

-X264_BUILD=	148
-X264_REV=	2795
-X264_COMMIT=	aaa9aa83a111ed6f1db253d5afa91c5fc844583f
+X264_BUILD=	152
+X264_REV=	2854
+X264_COMMIT=	e9a5903edf8ca59ef20e6f4894c196f135af735e
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20170626
+X264_SNAPSHOT=	20171225

 USES?=		pkgconfig
 USES+=		gmake localbase shebangfix tar:bzip2
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1498509905
-SHA256 (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 0fe3e49eb8861b8fc429436070fb2dd525d141904a44487c48d1c2d6ad778eae
-SIZE (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 736446
+TIMESTAMP = 1514238305
+SHA256 (x264/x264-snapshot-20171225-2245-stable.tar.bz2) = 91143276d18414f1c94ecdc472b063c874308833d57d7353f15286372ba4ba68
+SIZE (x264/x264-snapshot-20171225-2245-stable.tar.bz2) = 750690
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2017-06-26 20:45:05 UTC
+--- configure.orig	2017-12-25 21:45:05 UTC
 +++ configure
-@@ -682,12 +682,6 @@ case $host_cpu in
+@@ -692,12 +692,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
-@@ -702,7 +696,7 @@ case $host_cpu in
+@@ -712,7 +706,7 @@ case $host_cpu in
             ASFLAGS="$ASFLAGS -f elf32"
         fi
         ;;
 -    x86_64)
 +    amd64|x86_64)
         ARCH="X86_64"
-         AS="${AS-yasm}"
+         AS="${AS-nasm}"
         AS_EXT=".asm"
-@@ -776,7 +770,7 @@ case $host_cpu in
+@@ -786,7 +780,7 @@ case $host_cpu in
             AS="${AS-${CC}}"
         fi
         ;;
@ -31,16 +31,16 @@
         ARCH="AARCH64"
         stack_alignment=16
         AS="${AS-${CC}}"
-@@ -875,7 +869,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
+@@ -888,7 +882,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
+     if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; 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 \
+@@ -901,9 +895,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
 fi
 
 if [ $asm = auto -a $ARCH = ARM ] ; then
@ -50,7 +50,7 @@
     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
+@@ -914,9 +905,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
         cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
         ASFLAGS="$ASFLAGS -c"
     else
@ -62,7 +62,7 @@
     fi
 fi
 
-@@ -931,9 +921,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
+@@ -943,9 +933,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
     if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
         define HAVE_MSA
     else
@ -74,7 +74,7 @@
     fi
 fi
 
-@@ -1245,10 +1234,6 @@ if cc_check '' -Wshadow ; then
+@@ -1257,10 +1246,6 @@ if cc_check '' -Wshadow ; then
     CFLAGS="-Wshadow $CFLAGS"
 fi
 
@ -85,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
-@@ -1284,6 +1269,9 @@ if [ "$opencl" = "yes" ]; then
+@@ -1296,6 +1281,9 @@ if [ "$opencl" = "yes" ]; then
         opencl="yes"
         define HAVE_OPENCL
         libdl="-ldl"
--- a/multimedia/zoneminder-h264/Makefile
+++ b/multimedia/zoneminder-h264/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	zoneminder-h264
 PORTVERSION=	1.30.20170222
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia

 MAINTAINER=	bsd@abinet.ru
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opal
 PORTVERSION=	3.10.10
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	net
 MASTER_SITES=	GNOME

--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xpra
 PORTVERSION=	2.0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/