Attachment 166484 Details for Bug 206864 – Incorporate most of the earlier suggestions

[patch] Incorporate most of the earlier suggestions

x265.patch (text/plain), 3.69 KB, created by Mikhail Teterin on 2016-02-03 06:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2016-02-03 06:30:11 UTC

Size: 3.69 KB

patch

obsolete

>Index: x11/xpra/Makefile
>===================================================================
>--- x11/xpra/Makefile	(revision 407660)
>+++ x11/xpra/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	xpra
> PORTVERSION=	0.15.10
>+PORTREVISION=	1
> CATEGORIES=	x11
> MASTER_SITES=	http://xpra.org/src/
> 
>Index: multimedia/gstreamer1-plugins-x265/Makefile
>===================================================================
>--- multimedia/gstreamer1-plugins-x265/Makefile	(revision 407660)
>+++ multimedia/gstreamer1-plugins-x265/Makefile	(working copy)
>@@ -1,6 +1,6 @@
> # $FreeBSD$
> 
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	multimedia
> 
> COMMENT=	GStreamer libx265 based H265 plugin
>Index: multimedia/x265/Makefile
>===================================================================
>--- multimedia/x265/Makefile	(revision 407933)
>+++ multimedia/x265/Makefile	(working copy)
>@@ -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}
>@@ -16,14 +16,14 @@
> 
> 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 <bsd.port.mk>
>Index: multimedia/x265/distinfo
>===================================================================
>--- multimedia/x265/distinfo	(revision 407933)
>+++ multimedia/x265/distinfo	(working copy)
>@@ -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
>Index: multimedia/x265/files/patch-md5
>===================================================================
>--- multimedia/x265/files/patch-md5	(nonexistent)
>+++ multimedia/x265/files/patch-md5	(working copy)
>@@ -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 <sys/types.h>
>++#include <md5.h>
>++
>+ #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)
>Index: multimedia/x265/pkg-plist
>===================================================================
>--- multimedia/x265/pkg-plist	(revision 407933)
>+++ multimedia/x265/pkg-plist	(working copy)
>@@ -3,5 +3,5 @@
> include/x265_config.h
> lib/libx265.a
> lib/libx265.so
>-lib/libx265.so.68
>+lib/libx265.so.79
> libdata/pkgconfig/x265.pc

Actions: View | Diff

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