svn commit: r422672 - in head: multimedia/avidemux multimedia/ffmpeg multimedia/ffmpeg0 multimedia/gstreamer-plugins-x264 multimedia/gstreamer1-plugins-x264 multimedia/handbrake multimedia/libav mu...

Fri Sep 23 13:14:32 UTC 2016

Author: jbeich
Date: Fri Sep 23 13:14:29 2016
New Revision: 422672
URL: https://svnweb.freebsd.org/changeset/ports/422672

Log:
  multimedia/x264: update to 0.148.2708
  
  Changes:	https://git.videolan.org/?p=x264.git;a=shortlog;h=86b71982e131eaa70125f8d0e725fcade9c4c677
  Differential Revision:	https://reviews.freebsd.org/D7958
  Approved by:	koobs (maintainer)

Deleted:
  head/multimedia/x264/files/patch-common_cpu.c
  head/multimedia/x264/files/patch-deblock-a.S
  head/multimedia/x264/files/patch-quant-a.S
  head/multimedia/x264/files/patch-x264.h
Modified:
  head/multimedia/avidemux/Makefile   (contents, props changed)
  head/multimedia/ffmpeg/Makefile   (contents, props changed)
  head/multimedia/ffmpeg0/Makefile   (contents, props changed)
  head/multimedia/gstreamer-plugins-x264/Makefile   (contents, props changed)
  head/multimedia/gstreamer1-plugins-x264/Makefile   (contents, props changed)
  head/multimedia/handbrake/Makefile   (contents, props changed)
  head/multimedia/libav/Makefile   (contents, props changed)
  head/multimedia/libquicktime/Makefile   (contents, props changed)
  head/multimedia/libx264/Makefile   (contents, props changed)
  head/multimedia/mencoder/Makefile   (contents, props changed)
  head/multimedia/mpeg4ip/Makefile   (contents, props changed)
  head/multimedia/msx264/Makefile   (contents, props changed)
  head/multimedia/obs-studio/Makefile   (contents, props changed)
  head/multimedia/transcode/Makefile   (contents, props changed)
  head/multimedia/vlc/Makefile   (contents, props changed)
  head/multimedia/x264/Makefile   (contents, props changed)
  head/multimedia/x264/distinfo   (contents, props changed)
  head/multimedia/x264/files/patch-configure   (contents, props changed)
  head/net/opal/Makefile   (contents, props changed)
  head/x11/xpra/Makefile   (contents, props changed)

Modified: head/multimedia/avidemux/Makefile
==============================================================================

--- head/multimedia/avidemux/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/avidemux/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -6,7 +6,7 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia at FreeBSD.org

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/ffmpeg/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/ffmpeg0/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.17
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/

Modified: head/multimedia/gstreamer-plugins-x264/Makefile
==============================================================================
--- head/multimedia/gstreamer-plugins-x264/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/gstreamer-plugins-x264/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
 
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin

Modified: head/multimedia/gstreamer1-plugins-x264/Makefile
==============================================================================
--- head/multimedia/gstreamer1-plugins-x264/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/gstreamer1-plugins-x264/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer libx264 based H264 plugin

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/handbrake/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,6 +3,7 @@
 
 PORTNAME=	handbrake
 PORTVERSION=	0.10.5
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.handbrake.fr/releases/${PORTVERSION}/ \
 		http://download.handbrake.fr/handbrake/contrib/:contrib \

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/libav/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libav
 PORTVERSION=	11.7
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://libav.org/releases/
 

Modified: head/multimedia/libquicktime/Makefile
==============================================================================
--- head/multimedia/libquicktime/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/libquicktime/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
-PORTREVISION?=	12
+PORTREVISION?=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 

Modified: head/multimedia/libx264/Makefile
==============================================================================
--- head/multimedia/libx264/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/libx264/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,6 @@
 #
 # Updating notes: see multimedia/x264/Makefile.
 
-PORTREVISION=	3
 PKGNAMEPREFIX=	lib
 COMMENT=	H.264/MPEG-4 AVC Video Encoding (Library)
 MASTERDIR=	${.CURDIR}/../x264

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/mencoder/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs at FreeBSD.org

Modified: head/multimedia/mpeg4ip/Makefile
==============================================================================
--- head/multimedia/mpeg4ip/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/mpeg4ip/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	33
+PORTREVISION=	34
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136

Modified: head/multimedia/msx264/Makefile
==============================================================================
--- head/multimedia/msx264/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/msx264/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -2,6 +2,7 @@
 
 PORTNAME=	msx264
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
 

Modified: head/multimedia/obs-studio/Makefile
==============================================================================
--- head/multimedia/obs-studio/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/obs-studio/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -2,6 +2,7 @@
 
 PORTNAME=	obs-studio
 PORTVERSION=	0.15.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports at FreeBSD.org

Modified: head/multimedia/transcode/Makefile
==============================================================================
--- head/multimedia/transcode/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/transcode/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/france/transcode-tcforge/downloads/
 

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/vlc/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.2.4
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/x264/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -19,7 +19,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	4
+PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -38,11 +38,11 @@ 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_BUILD=	148
+X264_REV=	2708
+X264_COMMIT=	86b71982e131eaa70125f8d0e725fcade9c4c677
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20150629
+X264_SNAPSHOT=	20160921
 
 USES?=		pkgconfig
 USES+=		gmake localbase shebangfix tar:bzip2

Modified: head/multimedia/x264/distinfo
==============================================================================
--- head/multimedia/x264/distinfo	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/x264/distinfo	Fri Sep 23 13:14:29 2016	(r422672)
@@ -1,4 +1,5 @@
-SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340
-SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453
+TIMESTAMP = 1474449136
+SHA256 (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 340045020a79e44784ec158d9d2f73ec4248b6923393f6d5fbb683ec63db6d2f
+SIZE (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 731264
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029

Modified: head/multimedia/x264/files/patch-configure
==============================================================================
--- head/multimedia/x264/files/patch-configure	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/multimedia/x264/files/patch-configure	Fri Sep 23 13:14:29 2016	(r422672)
@@ -1,46 +1,37 @@
 --- configure.orig	2015-06-29 20:45:09 UTC
 +++ configure
-@@ -604,12 +604,6 @@ case $host_cpu in
+@@ -677,12 +677,6 @@ case $host_cpu in
          AS_EXT=".asm"
-         ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
+         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"
+-                CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
 -            fi
              CFLAGS="-m32 $CFLAGS"
              LDFLAGS="-m32 $LDFLAGS"
-         elif [ $compiler = ICC ]; then
-@@ -639,7 +639,7 @@ case $host_cpu in
-             ASFLAGS="$ASFLAGS -f elf"
+         fi
+@@ -697,7 +691,7 @@ case $host_cpu in
+             ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    x86_64|amd64)
          ARCH="X86_64"
-         AS="yasm"
+         AS="${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
+@@ -761,7 +755,7 @@ case $host_cpu in
              AS="${AS-${CC}}"
          fi
          ;;
 -    aarch64)
 +    aarch64|arm64)
          ARCH="AARCH64"
+         stack_alignment=16
          if [ "$SYS" = MACOSX ] ; then
-             AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}"
-@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then
+@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then
      CFLAGS="-Wshadow $CFLAGS"
  fi
  

Modified: head/net/opal/Makefile
==============================================================================
--- head/net/opal/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/net/opal/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opal
 PORTVERSION=	3.10.10
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 

Modified: head/x11/xpra/Makefile
==============================================================================
--- head/x11/xpra/Makefile	Fri Sep 23 13:14:10 2016	(r422671)
+++ head/x11/xpra/Makefile	Fri Sep 23 13:14:29 2016	(r422672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpra
 PORTVERSION=	0.15.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
