Index: head/multimedia/gstreamer1-plugins-x265/Makefile =================================================================== --- head/multimedia/gstreamer1-plugins-x265/Makefile (revision 408648) +++ head/multimedia/gstreamer1-plugins-x265/Makefile (revision 408649) @@ -1,13 +1,13 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= GStreamer libx265 based H265 plugin GST_PLUGIN= x265 DIST= bad MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins .include "${MASTERDIR}/Makefile" Index: head/multimedia/x265/Makefile =================================================================== --- head/multimedia/x265/Makefile (revision 408648) +++ head/multimedia/x265/Makefile (revision 408649) @@ -1,29 +1,29 @@ # Created by: adamw # $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+ 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 Index: head/multimedia/x265/distinfo =================================================================== --- head/multimedia/x265/distinfo (revision 408648) +++ head/multimedia/x265/distinfo (revision 408649) @@ -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: head/multimedia/x265/files/patch-md5 =================================================================== --- head/multimedia/x265/files/patch-md5 (nonexistent) +++ head/multimedia/x265/files/patch-md5 (revision 408649) @@ -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 ++#include ++ + #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) Property changes on: head/multimedia/x265/files/patch-md5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/x265/pkg-plist =================================================================== --- head/multimedia/x265/pkg-plist (revision 408648) +++ head/multimedia/x265/pkg-plist (revision 408649) @@ -1,7 +1,7 @@ bin/x265 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 Index: head/x11/xpra/Makefile =================================================================== --- head/x11/xpra/Makefile (revision 408648) +++ head/x11/xpra/Makefile (revision 408649) @@ -1,104 +1,105 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= xpra PORTVERSION= 0.15.10 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ MAINTAINER= matthew@reztek.cz COMMENT= Xpra gives you persistent remote applications for X LICENSE= GPLv2 BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \ ${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \ ${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \ ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \ ssh-askpass:${PORTSDIR}/security/openssh-askpass \ setxkbmap:${PORTSDIR}/x11/setxkbmap \ xauth:${PORTSDIR}/x11/xauth \ xkbcomp:${PORTSDIR}/x11/xkbcomp \ ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext USES= desktop-file-utils pkgconfig python shared-mime-info tar:xz USE_GSTREAMER= good python USE_PYTHON= distutils USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} OPTIONS_DEFINE= AVAHI AVCODEC CUPS OPENCL SWSCALE VPX WEBP X264 X265 OPTIONS_DEFAULT= AVAHI AVCODEC CUPS SWSCALE VPX WEBP X264 X265 OPTIONS_SUB= yes AVCODEC_DESC= Enable avcodec2 decoder OPENCL_DESC= Enable OpenCL CSC module SWSCALE_DESC= Enable swscale CSC module VPX_DESC= Enable VP8 and VP9 encoder WEBP_DESC= Enable WebP encoder X264_DESC= Enable X264 encoder X265_DESC= Enable X265 encoder AVAHI_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 CUPS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups OPENCL_LIB_DEPENDS= libOpenCL.so:${PORTSDIR}/devel/ocl-icd OPENCL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyopencl/__init__.py:${PORTSDIR}/devel/py-pyopencl OPENCL_VARS= XPRA_OPTIONS+=csc_opencl SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_VARS= XPRA_OPTIONS+=vpx WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_VARS= XPRA_OPTIONS+=webp X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_VARS= XPRA_OPTIONS+=enc_x264 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_VARS= XPRA_OPTIONS+=enc_x265 PYDISTUTILS_PKGNAME= xpra_all XPRA_OPTIONS_ALL= csc_opencl csc_swscale dec_avcodec2 XPRA_OPTIONS_ALL+= enc_x264 enc_x265 vpx webp XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED} XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper XPRA_OPTIONS_DISABLED+= nvenc3 nvenc4 nvenc5 .include .for opt in ${XPRA_OPTIONS_ALL} .if empty(XPRA_OPTIONS:M${opt}) PYDISTUTILS_ARGS+= --without-${opt} .else PYDISTUTILS_ARGS+= --with-${opt} .endif .endfor .if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MSWSCALE} LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg .endif .include PYDISTUTILS_BUILDARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_CONFIGUREARGS+= ${PYDISTUTILS_ARGS} PYDISTUTILS_INSTALLARGS+= ${PYDISTUTILS_ARGS} post-patch: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py post-install: ${RM} ${STAGEDIR}${ETCDIR}/xpra.conf ${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} -name '*.so' \ -exec ${STRIP_CMD} {} \; .include