aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/libbpg/Makefile2
-rw-r--r--graphics/libheif/Makefile2
-rw-r--r--multimedia/avidemux-plugins/Makefile2
-rw-r--r--multimedia/ccextractor/Makefile2
-rw-r--r--multimedia/cinelerra-gg/Makefile2
-rw-r--r--multimedia/emby-server/Makefile2
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-x265/Makefile2
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/x265/Makefile7
-rw-r--r--multimedia/x265/distinfo14
-rw-r--r--multimedia/x265/files/patch-svt-hevc-1.3.053
-rw-r--r--multimedia/x265/pkg-plist2
-rw-r--r--x11/xpra/Makefile1
14 files changed, 68 insertions, 27 deletions
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index b7c841c9b0e5..f9ae53060093 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libbpg
PORTVERSION= 0.9.7
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= http://bellard.org/bpg/
diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 884ff1cdb323..a0b4dc4a871a 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libheif
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= me@sebastiansteinmetz.ch
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 667042d006b7..0aeadc4ac8f3 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index c7cc76a82094..5fc62056b3f2 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ccextractor
DISTVERSIONPREFIX= v
DISTVERSION= 0.85
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= multimedia
MAINTAINER= oz@nixil.net
diff --git a/multimedia/cinelerra-gg/Makefile b/multimedia/cinelerra-gg/Makefile
index 29edad551556..e87216998d85 100644
--- a/multimedia/cinelerra-gg/Makefile
+++ b/multimedia/cinelerra-gg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinelerra-gg
DISTVERSION= 5.1-20180714
DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index b5718c29c910..fedf677c0136 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -2,7 +2,7 @@
PORTNAME= emby-server
PORTVERSION= 4.1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
https://mediabrowser.github.io/embytools/
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 88db441261ae..3e3413209a67 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.1.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= https://ffmpeg.org/releases/
diff --git a/multimedia/gstreamer1-plugins-x265/Makefile b/multimedia/gstreamer1-plugins-x265/Makefile
index 432edc47a4b2..58ac054617cc 100644
--- a/multimedia/gstreamer1-plugins-x265/Makefile
+++ b/multimedia/gstreamer1-plugins-x265/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
COMMENT= GStreamer libx265 based H265 plugin
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index a96c24be914d..c0e3a3c0bcf3 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 3.0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
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 efd5f6e152c5..4e989f8d25c7 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= x265
-PORTVERSION= 3.0
-PORTREVISION= 1
+PORTVERSION= 3.1.1
CATEGORIES= multimedia
MASTER_SITES= https://downloads.videolan.org/pub/videolan/x265/ \
https://mirror.leaseweb.com/videolan/x265/ \
@@ -11,10 +10,6 @@ MASTER_SITES= https://downloads.videolan.org/pub/videolan/x265/ \
http://mirror.leaseweb.com/videolan/x265/
DISTNAME= ${PORTNAME}_${PORTVERSION}
-PATCH_SITES= http://hg.videolan.org/${PORTNAME}/raw-rev/
-PATCHFILES+= 878541319ea1:-p1 a41325fc854f:-p1 # SVT-HEVC
-PATCHFILES+= 31ab7e09a3b5:-p1 e16999096b48:-p1 # SVT-HEVC
-
MAINTAINER= mi@aldan.algebra.com
COMMENT= H.265/High Efficiency Video Coding (HEVC) format
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index 94fb1b962dd2..9f4d59c9bf6d 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,11 +1,3 @@
-TIMESTAMP = 1548236838
-SHA256 (x265_3.0.tar.gz) = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
-SIZE (x265_3.0.tar.gz) = 1398519
-SHA256 (878541319ea1) = cb135430143d4d0df4e1d7e5b9d7994f0b6279796f44f7b8b6e5159c00c92768
-SIZE (878541319ea1) = 86799
-SHA256 (a41325fc854f) = 5fb5a2d97cecf9920f5800364534f56584dbf805f1e215de9dbdeca025eb3ec8
-SIZE (a41325fc854f) = 912
-SHA256 (31ab7e09a3b5) = ecf6349c12cdb060ccbd7dfcf013599208cd9239b1fbc877318f3a779b98b7aa
-SIZE (31ab7e09a3b5) = 2927
-SHA256 (e16999096b48) = 7e4cdeb59d172ab0b04c03356ad05a38bec1802f44b64ce56bf3694efe06cc82
-SIZE (e16999096b48) = 1105
+TIMESTAMP = 1562584219
+SHA256 (x265_3.1.1.tar.gz) = 827900c7cc0a0105b8a96460fab7cd22b97afa7b2835b5cb979c44bddaa3c8d0
+SIZE (x265_3.1.1.tar.gz) = 1419826
diff --git a/multimedia/x265/files/patch-svt-hevc-1.3.0 b/multimedia/x265/files/patch-svt-hevc-1.3.0
new file mode 100644
index 000000000000..08c4eb3c2242
--- /dev/null
+++ b/multimedia/x265/files/patch-svt-hevc-1.3.0
@@ -0,0 +1,53 @@
+encoderColorFormat, tileColumnCount, etc. were added after 1.3.0, so omit it for now.
+
+source/x265.cpp:570:13: error: no member named 'encoderColorFormat' in 'EB_H265_ENC_CONFIGURATION'
+ svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
+ ~~~~~~~~ ^
+source/x265.cpp:570:35: error: use of undeclared identifier 'EB_COLOR_FORMAT'
+ svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
+ ^
+source/common/param.cpp:2505:19: error: no member named 'tileColumnCount' in 'EB_H265_ENC_CONFIGURATION'
+ svtHevcParam->tileColumnCount = 1;
+ ~~~~~~~~~~~~ ^
+source/common/param.cpp:2506:19: error: no member named 'tileRowCount' in 'EB_H265_ENC_CONFIGURATION'
+ svtHevcParam->tileRowCount = 1;
+ ~~~~~~~~~~~~ ^
+source/common/param.cpp:2507:19: error: no member named 'tileSliceMode' in 'EB_H265_ENC_CONFIGURATION'
+ svtHevcParam->tileSliceMode = 0;
+ ~~~~~~~~~~~~ ^
+source/common/param.cpp:2508:19: error: no member named 'unrestrictedMotionVector' in 'EB_H265_ENC_CONFIGURATION'
+ svtHevcParam->unrestrictedMotionVector = 1;
+ ~~~~~~~~~~~~ ^
+
+--- source/common/param.cpp.orig 2019-07-08 11:10:19 UTC
++++ source/common/param.cpp
+@@ -2454,7 +2454,6 @@ void svt_param_default(x265_param* param)
+ svtHevcParam->frameRateNumerator = 0;
+ svtHevcParam->frameRateDenominator = 0;
+ svtHevcParam->encoderBitDepth = 8;
+- svtHevcParam->encoderColorFormat = EB_YUV420;
+ svtHevcParam->compressedTenBitFormat = 0;
+ svtHevcParam->rateControlMode = 0;
+ svtHevcParam->sceneChangeDetection = 1;
+@@ -2502,11 +2501,6 @@ void svt_param_default(x265_param* param)
+ svtHevcParam->logicalProcessors = 0;
+ svtHevcParam->switchThreadsToRtPriority = 1;
+ svtHevcParam->fpsInVps = 0;
+-
+- svtHevcParam->tileColumnCount = 1;
+- svtHevcParam->tileRowCount = 1;
+- svtHevcParam->tileSliceMode = 0;
+- svtHevcParam->unrestrictedMotionVector = 1;
+ }
+
+ int svt_set_preset_tune(x265_param* param, const char* preset, const char* tune)
+--- source/x265.cpp.orig 2019-07-08 11:10:19 UTC
++++ source/x265.cpp
+@@ -567,7 +567,6 @@ bool CLIOptions::parse(int argc, char **argv)
+ svtParam->frameRateNumerator = param->fpsNum;
+ svtParam->frameRateDenominator = param->fpsDenom;
+ svtParam->framesToBeEncoded = param->totalFrames;
+- svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
+ }
+ #endif
+
diff --git a/multimedia/x265/pkg-plist b/multimedia/x265/pkg-plist
index c7e971fda4b0..26d9ed9d0fed 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.170
+lib/libx265.so.176
libdata/pkgconfig/x265.pc
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 38548c438b8f..7f57416b2f3a 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xpra
PORTVERSION= 2.5.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/