Attachment 166471 Details for Bug 206864 – v3: update, bump, commit message

[patch] v3: update, bump, commit message

x265_1.9.diff (text/plain), 5.53 KB, created by Jan Beich on 2016-02-03 01:45:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-02-03 01:45:52 UTC

Size: 5.53 KB

patch

obsolete

>commit be5ae2c (HEAD -> misc)
>Author: Mikhail Teterin <mi@FreeBSD.org>
>Date:   Tue Feb 2 21:51:00 2016 +0000
>
>    multimedia/x265: update to 1.9 and use system md5(3)
>    
>    ABI isn't compatible, so bump PORTREVISION in consumers.
>    
>    Changes:	https://bitbucket.org/multicoreware/x265/branches/compare/1.9%0D1.8
>    ACC report:	https://people.freebsd.org/~jbeich/compat_reports/x265/1.8_to_1.9/compat_report.html
>    PR:		206864
>    Reviewed by:	jbeich
>    Exp-run by:	antoine ?
>---
> graphics/libbpg/Makefile        |  2 +-
> multimedia/avidemux/Makefile    |  1 +
> multimedia/ffmpeg/Makefile      |  1 +
> multimedia/vlc/Makefile         |  2 +-
> multimedia/x265/Makefile        | 26 +++++++++++++++++---------
> multimedia/x265/distinfo        |  4 ++--
> multimedia/x265/files/patch-md5 | 25 +++++++++++++++++++++++++
> multimedia/x265/pkg-plist       |  2 +-
> x11/xpra/Makefile               |  1 +
> 9 files changed, 50 insertions(+), 14 deletions(-)
>
>diff --git graphics/libbpg/Makefile graphics/libbpg/Makefile
>index 50f092a..a03d92d 100644
>--- graphics/libbpg/Makefile
>+++ graphics/libbpg/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libbpg
> PORTVERSION=	0.9.5
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics
> MASTER_SITES=	http://bellard.org/bpg/
> 
>diff --git multimedia/avidemux/Makefile multimedia/avidemux/Makefile
>index c629417..d7973c8 100644
>--- multimedia/avidemux/Makefile
>+++ multimedia/avidemux/Makefile
>@@ -6,6 +6,7 @@
> 
> PORTNAME=	avidemux
> PORTVERSION=	${AVIDEMUX_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	multimedia@FreeBSD.org
>diff --git multimedia/ffmpeg/Makefile multimedia/ffmpeg/Makefile
>index 18f018b..1841180 100644
>--- multimedia/ffmpeg/Makefile
>+++ multimedia/ffmpeg/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	2.8.5
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	http://ffmpeg.org/releases/
>diff --git multimedia/vlc/Makefile multimedia/vlc/Makefile
>index ed6709e..b6a59b7 100644
>--- multimedia/vlc/Makefile
>+++ multimedia/vlc/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vlc
> DISTVERSION=	2.2.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> PORTEPOCH=	4
> CATEGORIES=	multimedia audio ipv6 net www
> MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
>diff --git multimedia/x265/Makefile multimedia/x265/Makefile
>index 0bd25a8..8cfabca 100644
>--- multimedia/x265/Makefile
>+++ multimedia/x265/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	x265
>-PORTVERSION=	1.8
>+PORTVERSION=	1.9
> CATEGORIES=	multimedia
> MASTER_SITES=	http://bitbucket.org/multicoreware/${PORTNAME}/get/
> DISTNAME=	${PORTVERSION}
>@@ -14,16 +14,24 @@ COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/../COPYING
> 
>-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
>-
>-USES=		cmake tar:bz2
>+USES=		cmake pathfix tar:bz2
> USE_LDCONFIG=	yes
>+EXTRACT_AFTER_ARGS+=	--exclude "md5*"
>+CMAKE_ARGS=	-DPLATFORM_LIBS=md
>+CFLAGS+=	-Du_int32_t=uint32_t # sys/md5.h
>+
>+WRKSRC=		${WRKDIR}/multicoreware-${PORTNAME}-1d3b6e448e01/source
>+
>+OPTIONS_DEFINE_i386=	SIMD
>+OPTIONS_DEFINE_amd64=	SIMD
>+OPTIONS_DEFAULT_i386=	SIMD
>+OPTIONS_DEFAULT_amd64=	SIMD
> 
>-WRKSRC=		${WRKDIR}/multicoreware-${PORTNAME}-e27327f5da35/source
>+SIMD_BUILD_DEPENDS=	yasm>=1.2.0:devel/yasm
>+SIMD_CMAKE_ON=		-DENABLE_ASSEMBLY=on -DENABLE_TESTS=on
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
>-		${WRKSRC}/CMakeLists.txt
>+check regression-test:	test
>+do-test-SIMD-on:
>+	${WRKSRC}/test/TestBench
> 
> .include <bsd.port.mk>
>diff --git multimedia/x265/distinfo multimedia/x265/distinfo
>index 6bc3962..72fa43d 100644
>--- multimedia/x265/distinfo
>+++ multimedia/x265/distinfo
>@@ -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
>diff --git multimedia/x265/files/patch-md5 multimedia/x265/files/patch-md5
>new file mode 100644
>index 0000000..e28cf08
>--- /dev/null
>+++ multimedia/x265/files/patch-md5
>@@ -0,0 +1,25 @@
>+Use FreeBSD's MD5-implementation instead of yet another bundled one.
>+
>+	-mi
>+
>+--- common/CMakeLists.txt.orig	2016-01-25 05:16:50 UTC
>++++ common/CMakeLists.txt
>+@@ -108,7 +108,6 @@ add_library(common OBJECT
>+     threading.cpp threading.h
>+     threadpool.cpp threadpool.h
>+     wavefront.h wavefront.cpp
>+-    md5.cpp md5.h
>+     bitstream.h bitstream.cpp
>+     yuv.cpp yuv.h
>+     shortyuv.cpp shortyuv.h
>+--- encoder/frameencoder.cpp.orig	2016-01-25 05:16:50 UTC
>++++ encoder/frameencoder.cpp
>+@@ -666,7 +666,7 @@ void FrameEncoder::compressFrame()
>+         {
>+             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)
>+         {
>diff --git multimedia/x265/pkg-plist multimedia/x265/pkg-plist
>index cd5064d..4109b53 100644
>--- multimedia/x265/pkg-plist
>+++ multimedia/x265/pkg-plist
>@@ -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
>diff --git x11/xpra/Makefile x11/xpra/Makefile
>index 189f619..eb3aa5e 100644
>--- x11/xpra/Makefile
>+++ x11/xpra/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	xpra
> PORTVERSION=	0.15.10
>+PORTREVISION=	1
> CATEGORIES=	x11
> MASTER_SITES=	http://xpra.org/src/
>

Actions: View | Diff

Attachments on bug 206864: 166461 | 166463 | 166471 | 166472 | 166474 | 166484