Attachment #166463 for bug #206864

Lines 2-8 Link Here

(-)Makefile (-2 / +7 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 18-25 Link Here
18		18
19	USES= cmake tar:bz2	19	USES= cmake tar:bz2
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
		21	CMAKE_ARGS= -DENABLE_TESTS=on -DPLATFORM_LIBS=md
		22	EXTRACT_AFTER_ARGS+= --exclude "md5*"
21		23
22	WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-e27327f5da35/source	24	WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-1d3b6e448e01/source
23		25
24	post-patch:	26	post-patch:
25	@${REINPLACE_CMD} -e \	27	@${REINPLACE_CMD} -e \
Lines 26-29 Link Here
26	's\|$${LIB_INSTALL_DIR}/pkgconfig\|libdata/pkgconfig\|' \	28	's\|$${LIB_INSTALL_DIR}/pkgconfig\|libdata/pkgconfig\|' \
27	${WRKSRC}/CMakeLists.txt	29	${WRKSRC}/CMakeLists.txt
28		30
		31	do-test check: build
		32	${WRKSRC}/test/TestBench
		33
29	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 1-2 Link Here

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

Lines 3-7 Link Here

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

Return to bug 206864

Line 0 Link Here

(-)files/patch-md5 (+21 lines)
	1	Use FreeBSD's MD5-implementation instead of yet another bundled one.
	2
	3	-mi
	4
	5	--- common/CMakeLists.txt 2016-01-25 00:16:50.000000000 -0500
	6	+++ common/CMakeLists.txt 2016-02-02 17:57:52.620700000 -0500
	7	@@ -109,5 +109,4 @@
	8	threadpool.cpp threadpool.h
	9	wavefront.h wavefront.cpp
	10	- md5.cpp md5.h
	11	bitstream.h bitstream.cpp
	12	yuv.cpp yuv.h
	13	--- encoder/frameencoder.cpp 2016-01-25 00:16:50.000000000 -0500
	14	+++ encoder/frameencoder.cpp 2016-02-02 18:06:58.918647000 -0500
	15	@@ -667,5 +667,5 @@
	16	m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5;
	17	for (int i = 0; i < planes; i++)
	18	- MD5Final(&m_state[i], m_seiReconPictureDigest.m_digest[i]);
	19	+ MD5Final(m_seiReconPictureDigest.m_digest[i], &m_state[i]);
	20	}
	21	else if (m_param->decodedPictureHashSEI == 2)