aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/libbpg/Makefile2
-rw-r--r--multimedia/ccextractor/Makefile2
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-x265/Makefile2
-rw-r--r--multimedia/handbrake/Makefile2
-rw-r--r--multimedia/vlc/Makefile1
-rw-r--r--multimedia/x265/Makefile40
-rw-r--r--multimedia/x265/distinfo6
-rw-r--r--multimedia/x265/pkg-plist2
-rw-r--r--x11/xpra/Makefile2
10 files changed, 43 insertions, 18 deletions
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index 735660cbd5bc..97c9281b4372 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libbpg
PORTVERSION= 0.9.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://bellard.org/bpg/
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index 61418432c0db..02e47e992a08 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ccextractor
DISTVERSIONPREFIX= v
DISTVERSION= 0.85
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MAINTAINER= oz@nixil.net
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index c30bdfcfac2f..ac8fed777a59 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 3.4.1
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
diff --git a/multimedia/gstreamer1-plugins-x265/Makefile b/multimedia/gstreamer1-plugins-x265/Makefile
index 1c1107f4705f..20f162c047cd 100644
--- a/multimedia/gstreamer1-plugins-x265/Makefile
+++ b/multimedia/gstreamer1-plugins-x265/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= multimedia
COMMENT= GStreamer libx265 based H265 plugin
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 069e616cf0ac..14155f531d45 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -3,7 +3,7 @@
PORTNAME= handbrake
PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
DIST_SUBDIR= ${PORTNAME}
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 01c5c3a67a00..09f9d2b7cf0e 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.8
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 3e290d0a2346..add5c2dd0d27 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= x265
-PORTVERSION= 2.3
+PORTVERSION= 2.6
CATEGORIES= multimedia
-MASTER_SITES= http://bitbucket.org/multicoreware/${PORTNAME}/get/
-DISTNAME= ${PORTVERSION}
-DIST_SUBDIR= ${PORTNAME}
+MASTER_SITES= http://ftp.videolan.org/pub/videolan/${PORTNAME}/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
COMMENT= H.265/High Efficiency Video Coding (HEVC) format
@@ -16,16 +15,41 @@ LICENSE_FILE= ${WRKSRC}/../COPYING
BUILD_DEPENDS= yasm:devel/yasm
-USES= cmake pathfix tar:bz2
+USES= cmake pathfix
+
+OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS
+OPTIONS_DEFINE_amd64= HI10P HI12P
+
+DEBUG_PREVENTS= OPTIMIZED_FLAGS
+DEBUG_PREVENTS_MSG= Optimizations are incompatible with debugging code
+DEBUG_VARS_OFF= CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG
+HI10P_CMAKE_BOOL= HIGH_BIT_DEPTH
+HI12P_CMAKE_BOOL= MAIN12
+HI12P_IMPLIES= HI10P
+OPTIMIZED_FLAGS_VARS= CFLAGS+=-O3 CPPFLAGS+=-O3
+
+DEBUG_DESC= Enable debugging
+HI10P_DESC= Enable HI10P Support (64-bit only)
+HI12P_DESC= Enable HI12P Support (64-bit only)
+OPTIMIZED_FLAGS_DESC= Enable O3 optimization
+
USE_LDCONFIG= yes
-CMAKE_ARGS= -DENABLE_PIC=on -DENABLE_TESTS=on -DPLATFORM_LIBS=md
+CMAKE_ARGS= -DPLATFORM_LIBS=md -DENABLE_TESTS=on
CFLAGS_mips= -DNO_ATOMICS # cannot use lang/gcc
CFLAGS_mips64= -DNO_ATOMICS # cannot use lang/gcc
EXTRACT_AFTER_ARGS+= --exclude "md5*"
+WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION}/source
+
+.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/multicoreware-${PORTNAME}-3037c1448549/source
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100052
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang50:devel/llvm50
+CPP= ${LOCALBASE}/bin/clang-cpp50
+CC= ${LOCALBASE}/bin/clang50
+CXX= ${LOCALBASE}/bin/clang++50
+.endif
do-test:
${WRKSRC}/test/TestBench
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index 35c07c965749..e0359860f7e0 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487446516
-SHA256 (x265/2.3.tar.bz2) = 890f52a69c52c344d6469969bc9aca86d0294f9590fda0974338ed4184c46e28
-SIZE (x265/2.3.tar.bz2) = 939895
+TIMESTAMP = 1516798519
+SHA256 (x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+SIZE (x265_2.6.tar.gz) = 1271976
diff --git a/multimedia/x265/pkg-plist b/multimedia/x265/pkg-plist
index 52d7779fe1db..5b371e8aabd7 100644
--- a/multimedia/x265/pkg-plist
+++ b/multimedia/x265/pkg-plist
@@ -3,5 +3,5 @@ include/x265.h
include/x265_config.h
lib/libx265.a
lib/libx265.so
-lib/libx265.so.110
+lib/libx265.so.146
libdata/pkgconfig/x265.pc
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 6e6bbb425d12..2b2f4c42b7b3 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xpra
PORTVERSION= 2.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/