From owner-svn-ports-all@freebsd.org Wed Feb 10 20:08:41 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EECD3AA36B7; Wed, 10 Feb 2016 20:08:41 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0438C58; Wed, 10 Feb 2016 20:08:41 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1AK8eSb072436; Wed, 10 Feb 2016 20:08:40 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1AK8e95072430; Wed, 10 Feb 2016 20:08:40 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201602102008.u1AK8e95072430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Wed, 10 Feb 2016 20:08:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408649 - in head: multimedia/gstreamer1-plugins-x265 multimedia/x265 multimedia/x265/files x11/xpra X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2016 20:08:42 -0000 Author: mi Date: Wed Feb 10 20:08:39 2016 New Revision: 408649 URL: https://svnweb.freebsd.org/changeset/ports/408649 Log: Upgrade x265 from 1.8 to 1.9. Add the test-target to utilize upstream's bundled tests and make myself the maintainer to deal with fallout, if any. Bump PORTREVISION of the two other ports, which depend on x265 by default. PR: 206864 Added: head/multimedia/x265/files/ head/multimedia/x265/files/patch-md5 (contents, props changed) Modified: head/multimedia/gstreamer1-plugins-x265/Makefile head/multimedia/x265/Makefile head/multimedia/x265/distinfo head/multimedia/x265/pkg-plist head/x11/xpra/Makefile Modified: head/multimedia/gstreamer1-plugins-x265/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins-x265/Makefile Wed Feb 10 20:04:00 2016 (r408648) +++ head/multimedia/gstreamer1-plugins-x265/Makefile Wed Feb 10 20:08:39 2016 (r408649) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= GStreamer libx265 based H265 plugin Modified: head/multimedia/x265/Makefile ============================================================================== --- head/multimedia/x265/Makefile Wed Feb 10 20:04:00 2016 (r408648) +++ head/multimedia/x265/Makefile Wed Feb 10 20:08:39 2016 (r408649) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= x265 -PORTVERSION= 1.8 +PORTVERSION= 1.9 CATEGORIES= multimedia MASTER_SITES= http://bitbucket.org/multicoreware/${PORTNAME}/get/ DISTNAME= ${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mi@aldan.algebra.com COMMENT= H.265/High Efficiency Video Coding (HEVC) format LICENSE= GPLv2+ @@ -16,14 +16,14 @@ LICENSE_FILE= ${WRKSRC}/../COPYING BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm -USES= cmake tar:bz2 +USES= cmake pathfix tar:bz2 USE_LDCONFIG= yes +CMAKE_ARGS= -DENABLE_TESTS=on -DPLATFORM_LIBS=md +EXTRACT_AFTER_ARGS+= --exclude "md5*" -WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-e27327f5da35/source +WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-1d3b6e448e01/source -post-patch: - @${REINPLACE_CMD} -e \ - 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt +do-test: + ${WRKSRC}/test/TestBench .include Modified: head/multimedia/x265/distinfo ============================================================================== --- head/multimedia/x265/distinfo Wed Feb 10 20:04:00 2016 (r408648) +++ head/multimedia/x265/distinfo Wed Feb 10 20:08:39 2016 (r408649) @@ -1,2 +1,2 @@ -SHA256 (x265/1.8.tar.bz2) = 3d36472d9b41cdf04ae92eede1f1da2198432d0ebc2c29ec2da36d8bddaafb7e -SIZE (x265/1.8.tar.bz2) = 739692 +SHA256 (x265/1.9.tar.bz2) = e1e4de6ead44e21c15378675e09c39ef192f2b7c844dd369d2ba1e979aca1ebb +SIZE (x265/1.9.tar.bz2) = 774118 Added: head/multimedia/x265/files/patch-md5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/x265/files/patch-md5 Wed Feb 10 20:08:39 2016 (r408649) @@ -0,0 +1,33 @@ +Use FreeBSD's MD5-implementation instead of yet another bundled one. + + -mi + +--- common/CMakeLists.txt 2016-01-25 00:16:50.000000000 -0500 ++++ common/CMakeLists.txt 2016-02-02 17:57:52.620700000 -0500 +@@ -109,5 +109,4 @@ + threadpool.cpp threadpool.h + wavefront.h wavefront.cpp +- md5.cpp md5.h + bitstream.h bitstream.cpp + yuv.cpp yuv.h +--- common/picyuv.h 2016-01-25 00:16:50.000000000 -0500 ++++ common/picyuv.h 2016-02-02 21:52:24.690114000 -0500 +@@ -25,6 +25,8 @@ + #define X265_PICYUV_H + ++#include ++#include ++ + #include "common.h" +-#include "md5.h" + #include "x265.h" + +--- encoder/frameencoder.cpp 2016-01-25 00:16:50.000000000 -0500 ++++ encoder/frameencoder.cpp 2016-02-02 18:06:58.918647000 -0500 +@@ -667,5 +667,5 @@ + m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5; + for (int i = 0; i < planes; i++) +- MD5Final(&m_state[i], m_seiReconPictureDigest.m_digest[i]); ++ MD5Final(m_seiReconPictureDigest.m_digest[i], &m_state[i]); + } + else if (m_param->decodedPictureHashSEI == 2) Modified: head/multimedia/x265/pkg-plist ============================================================================== --- head/multimedia/x265/pkg-plist Wed Feb 10 20:04:00 2016 (r408648) +++ head/multimedia/x265/pkg-plist Wed Feb 10 20:08:39 2016 (r408649) @@ -3,5 +3,5 @@ include/x265.h include/x265_config.h lib/libx265.a lib/libx265.so -lib/libx265.so.68 +lib/libx265.so.79 libdata/pkgconfig/x265.pc Modified: head/x11/xpra/Makefile ============================================================================== --- head/x11/xpra/Makefile Wed Feb 10 20:04:00 2016 (r408648) +++ head/x11/xpra/Makefile Wed Feb 10 20:08:39 2016 (r408649) @@ -3,6 +3,7 @@ PORTNAME= xpra PORTVERSION= 0.15.10 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/