1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00

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
This commit is contained in:
Mikhail Teterin 2016-02-10 20:08:39 +00:00
parent 8f4ce8a786
commit 7677b52b1f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408649
6 changed files with 46 additions and 12 deletions

View File

@ -1,6 +1,6 @@
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= GStreamer libx265 based H265 plugin

View File

@ -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 <bsd.port.mk>

View File

@ -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

View File

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

View File

@ -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

View File

@ -3,6 +3,7 @@
PORTNAME= xpra
PORTVERSION= 0.15.10
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/