aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2019-01-06 12:24:44 +0000
committerThomas Zander <riggs@FreeBSD.org>2019-01-06 12:24:44 +0000
commitbece4aabbcafbe74a206aeca23a1cbbb5626ff26 (patch)
tree5b25775d501fed3273705c49ca8c87929bbf2df5 /multimedia
parent0a1acfd3caa642ac5f65b0f6b3aea3d5a140db36 (diff)
downloadports-bece4aabbcafbe74a206aeca23a1cbbb5626ff26.tar.gz
ports-bece4aabbcafbe74a206aeca23a1cbbb5626ff26.zip
Update to upstream version 30.1.0
Details: - New features and bug fixes, a.o. fixes for crashes with certain input streams, see changelog. - Build fixes for boost-1.69 are now upstream. - Upstream changelog: https://mkvtoolnix.download/doc/NEWS.md MFH: 2019Q1
Notes
Notes: svn path=/head/; revision=489480
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mkvtoolnix/Makefile3
-rw-r--r--multimedia/mkvtoolnix/distinfo6
-rw-r--r--multimedia/mkvtoolnix/files/patch-boost-1.6951
-rw-r--r--multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h24
4 files changed, 28 insertions, 56 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index f3d9d693c6b0..7d64319d844c 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mkvtoolnix
-PORTVERSION= 29.0.0
-PORTREVISION= 2
+PORTVERSION= 30.1.0
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 9525e09cb8eb..40558d4a8a5f 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543689447
-SHA256 (mkvtoolnix-29.0.0.tar.xz) = 54eb5f88fe3c9c7b5df77f80b0dfcac7695c19a8226f8ba52be8ad15ba0975d3
-SIZE (mkvtoolnix-29.0.0.tar.xz) = 7051380
+TIMESTAMP = 1546762324
+SHA256 (mkvtoolnix-30.1.0.tar.xz) = 4628f40d62d359edb1441c52381b1f3a61aa227279133d7e01257f91e0d92591
+SIZE (mkvtoolnix-30.1.0.tar.xz) = 7274296
diff --git a/multimedia/mkvtoolnix/files/patch-boost-1.69 b/multimedia/mkvtoolnix/files/patch-boost-1.69
deleted file mode 100644
index 5ea111752843..000000000000
--- a/multimedia/mkvtoolnix/files/patch-boost-1.69
+++ /dev/null
@@ -1,51 +0,0 @@
-After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
-
-src/common/debugging.h:63:14: fatal error: no viable conversion from returned value of type 'boost::tribool' to function return type 'bool'
- return m_requested;
- ^~~~~~~~~~~
-src/input/r_matroska.cpp:1685:43: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool'
- PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track);
- ^~~~~~~~~~~~~~~~
-src/merge/generic_packetizer.h:199:44: note: passing argument to parameter 'enabled_track' here
- virtual void set_track_enabled_flag(bool enabled_track);
- ^
-src/output/p_avc_es.cpp:49:41: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool'
- m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-src/common/avc_es_parser.h:152:42: note: passing argument to parameter 'fix' here
- void set_fix_bitstream_frame_rate(bool fix) {
- ^
-
---- src/common/debugging.h.orig 2018-10-20 14:44:02 UTC
-+++ src/common/debugging.h
-@@ -60,7 +60,7 @@ class debugging_option_c {
- if (boost::logic::indeterminate(m_requested))
- m_requested = debugging_c::requested(m_option);
-
-- return m_requested;
-+ return bool{m_requested};
- }
- };
-
---- src/input/r_matroska.cpp.orig 2018-10-20 14:44:02 UTC
-+++ src/input/r_matroska.cpp
-@@ -1682,7 +1682,7 @@ kax_reader_c::set_packetizer_headers(kax_track_t *t) {
- PTZR(t->ptzr)->set_track_forced_flag(true);
-
- if (boost::logic::indeterminate(PTZR(t->ptzr)->m_ti.m_enabled_track))
-- PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track);
-+ PTZR(t->ptzr)->set_track_enabled_flag(bool{t->enabled_track});
-
- if ((0 != t->track_uid) && !PTZR(t->ptzr)->set_uid(t->track_uid))
- mxwarn(boost::format(Y("matroska_reader: Could not keep the track UID %1% because it is already allocated for the new file.\n")) % t->track_uid);
---- src/output/p_avc_es.cpp.orig 2018-10-20 14:44:02 UTC
-+++ src/output/p_avc_es.cpp
-@@ -46,7 +46,7 @@ avc_es_video_packetizer_c(generic_reader_c *p_reader,
- set_codec_id(MKV_V_MPEG4_AVC);
-
- m_parser.set_keep_ar_info(false);
-- m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate);
-+ m_parser.set_fix_bitstream_frame_rate(bool{m_ti.m_fix_bitstream_frame_rate});
-
- // If no external timestamp file has been specified then mkvmerge
- // might have created a factory due to the --default-duration
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h b/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h
new file mode 100644
index 000000000000..89d30065ee57
--- /dev/null
+++ b/multimedia/mkvtoolnix/files/patch-src_common_mm__mem__io__p.h
@@ -0,0 +1,24 @@
+--- src/common/mm_mem_io_p.h.orig 2019-01-05 15:10:16 UTC
++++ src/common/mm_mem_io_p.h
+@@ -28,8 +28,8 @@ class mm_mem_io_private_c : public mm_io_private_c { (
+ explicit mm_mem_io_private_c(unsigned char *p_mem,
+ uint64_t p_mem_size,
+ std::size_t p_increase)
+- : mem_size{p_mem_size}
+- , allocated{p_mem_size}
++ : mem_size{static_cast<size_t>(p_mem_size)}
++ , allocated{static_cast<size_t>(p_mem_size)}
+ , increase{p_increase}
+ , mem{p_mem}
+ {
+@@ -48,8 +48,8 @@ class mm_mem_io_private_c : public mm_io_private_c { (
+
+ explicit mm_mem_io_private_c(unsigned char const *p_mem,
+ uint64_t p_mem_size)
+- : mem_size{p_mem_size}
+- , allocated{p_mem_size}
++ : mem_size{static_cast<size_t>(p_mem_size)}
++ , allocated{static_cast<size_t>(p_mem_size)}
+ , ro_mem{p_mem}
+ , read_only{true}
+ {