Attachment #166472 for bug #206864

Lines 3-9 Link Here

(-)graphics/libbpg/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libbpg	4	PORTNAME= libbpg
5	PORTVERSION= 0.9.5	5	PORTVERSION= 0.9.5
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= http://bellard.org/bpg/	8	MASTER_SITES= http://bellard.org/bpg/
9		9

Lines 6-11 Link Here

(-)multimedia/avidemux/Makefile (+1 lines)
6		6
7	PORTNAME= avidemux	7	PORTNAME= avidemux
8	PORTVERSION= ${AVIDEMUX_VERSION}	8	PORTVERSION= ${AVIDEMUX_VERSION}
		9	PORTREVISION= 1
9	CATEGORIES= multimedia	10	CATEGORIES= multimedia
10		11
11	MAINTAINER= multimedia@FreeBSD.org	12	MAINTAINER= multimedia@FreeBSD.org

Lines 3-8 Link Here

(-)multimedia/ffmpeg/Makefile (+1 lines)
3		3
4	PORTNAME= ffmpeg	4	PORTNAME= ffmpeg
5	PORTVERSION= 2.8.5	5	PORTVERSION= 2.8.5
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= multimedia audio ipv6 net	8	CATEGORIES= multimedia audio ipv6 net
8	MASTER_SITES= http://ffmpeg.org/releases/	9	MASTER_SITES= http://ffmpeg.org/releases/

Lines 1-6 Link Here

(-)multimedia/gstreamer1-plugins-x265/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTREVISION= 0	3	PORTREVISION= 1
4	CATEGORIES= multimedia	4	CATEGORIES= multimedia
5		5
6	COMMENT= GStreamer libx265 based H265 plugin	6	COMMENT= GStreamer libx265 based H265 plugin

Lines 3-9 Link Here

(-)multimedia/vlc/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vlc	4	PORTNAME= vlc
5	DISTVERSION= 2.2.1	5	DISTVERSION= 2.2.1
6	PORTREVISION= 6	6	PORTREVISION= 7
7	PORTEPOCH= 4	7	PORTEPOCH= 4
8	CATEGORIES= multimedia audio ipv6 net www	8	CATEGORIES= multimedia audio ipv6 net www
9	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \	9	MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \




# $FreeBSD$

PORTNAME=	x265
PORTVERSION=	1.9
CATEGORIES=	multimedia
MASTER_SITES=	http://bitbucket.org/multicoreware/${PORTNAME}/get/
DISTNAME=	${PORTVERSION}

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/../COPYING

USES=		cmake pathfix tar:bz2

USES=		cmake 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

SIMD_BUILD_DEPENDS=	yasm>=1.2.0:devel/yasm
SIMD_CMAKE_ON=		-DENABLE_ASSEMBLY=on -DENABLE_TESTS=on

check regression-test:	test
do-test-SIMD-on:
	${WRKSRC}/test/TestBench
		${WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)multimedia/x265/distinfo (-2 / +2 lines)
1	SHA256 (x265/1.8.tar.bz2) = 3d36472d9b41cdf04ae92eede1f1da2198432d0ebc2c29ec2da36d8bddaafb7e	1	SHA256 (x265/1.9.tar.bz2) = e1e4de6ead44e21c15378675e09c39ef192f2b7c844dd369d2ba1e979aca1ebb
2	SIZE (x265/1.8.tar.bz2) = 739692	2	SIZE (x265/1.9.tar.bz2) = 774118




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)
         {

Lines 3-7 include/x265.h Link Here

(-)multimedia/x265/pkg-plist (-1 / +1 lines)
3	include/x265_config.h	3	include/x265_config.h
4	lib/libx265.a	4	lib/libx265.a
5	lib/libx265.so	5	lib/libx265.so
6	lib/libx265.so.68	6	lib/libx265.so.79
7	libdata/pkgconfig/x265.pc	7	libdata/pkgconfig/x265.pc

Lines 3-8 Link Here

(-)x11/xpra/Makefile (+1 lines)
3		3
4	PORTNAME= xpra	4	PORTNAME= xpra
5	PORTVERSION= 0.15.10	5	PORTVERSION= 0.15.10
		6	PORTREVISION= 1
6	CATEGORIES= x11	7	CATEGORIES= x11
7	MASTER_SITES= http://xpra.org/src/	8	MASTER_SITES= http://xpra.org/src/
8		9

Return to bug 206864

Lines 2-8 Link Here

(-)multimedia/x265/Makefile (-9 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= x265	4	PORTNAME= x265
5	PORTVERSION= 1.8	5	PORTVERSION= 1.9
6	CATEGORIES= multimedia	6	CATEGORIES= multimedia
7	MASTER_SITES= http://bitbucket.org/multicoreware/${PORTNAME}/get/	7	MASTER_SITES= http://bitbucket.org/multicoreware/${PORTNAME}/get/
8	DISTNAME= ${PORTVERSION}	8	DISTNAME= ${PORTVERSION}
Lines 14-29 COMMENT= H.265/High Efficiency Video Coding (HEVC) format Link Here
14	LICENSE= GPLv2+	14	LICENSE= GPLv2+
15	LICENSE_FILE= ${WRKSRC}/../COPYING	15	LICENSE_FILE= ${WRKSRC}/../COPYING
16		16
17	BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm	17	USES= cmake pathfix tar:bz2
18
19	USES= cmake tar:bz2
20	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
		19	EXTRACT_AFTER_ARGS+= --exclude "md5*"
		20	CMAKE_ARGS= -DPLATFORM_LIBS=md
		21	CFLAGS+= -Du_int32_t=uint32_t # sys/md5.h
		22
		23	WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-1d3b6e448e01/source
		24
		25	OPTIONS_DEFINE_i386= SIMD
		26	OPTIONS_DEFINE_amd64= SIMD
		27	OPTIONS_DEFAULT_i386= SIMD
		28	OPTIONS_DEFAULT_amd64= SIMD
21		29
22	WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-e27327f5da35/source	30	SIMD_BUILD_DEPENDS= yasm>=1.2.0:devel/yasm
		31	SIMD_CMAKE_ON= -DENABLE_ASSEMBLY=on -DENABLE_TESTS=on
23		32
24	post-patch:	33	check regression-test: test
25	@${REINPLACE_CMD} -e \	34	do-test-SIMD-on:
26	's\|$${LIB_INSTALL_DIR}/pkgconfig\|libdata/pkgconfig\|' \	35	${WRKSRC}/test/TestBench
27	${WRKSRC}/CMakeLists.txt
28		36
29	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Added Link Here

(-)multimedia/x265/files/patch-md5 (+25 lines)
1	Use FreeBSD's MD5-implementation instead of yet another bundled one.
2
3	-mi
4
5	--- common/CMakeLists.txt.orig 2016-01-25 05:16:50 UTC
6	+++ common/CMakeLists.txt
7	@@ -108,7 +108,6 @@ add_library(common OBJECT
8	threading.cpp threading.h
9	threadpool.cpp threadpool.h
10	wavefront.h wavefront.cpp
11	- md5.cpp md5.h
12	bitstream.h bitstream.cpp
13	yuv.cpp yuv.h
14	shortyuv.cpp shortyuv.h
15	--- encoder/frameencoder.cpp.orig 2016-01-25 05:16:50 UTC
16	+++ encoder/frameencoder.cpp
17	@@ -666,7 +666,7 @@ void FrameEncoder::compressFrame()
18	{
19	m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5;
20	for (int i = 0; i < planes; i++)
21	- MD5Final(&m_state[i], m_seiReconPictureDigest.m_digest[i]);
22	+ MD5Final(m_seiReconPictureDigest.m_digest[i], &m_state[i]);
23	}
24	else if (m_param->decodedPictureHashSEI == 2)
25	{