diff options
author | riggs <riggs@FreeBSD.org> | 2017-04-03 14:10:33 +0800 |
---|---|---|
committer | riggs <riggs@FreeBSD.org> | 2017-04-03 14:10:33 +0800 |
commit | bc766599f11e69217e1eeebdd5a96a2bb146ff1e (patch) | |
tree | fb8f8fb6a094a905332aaa3b0ca1ffecabed7e9a /multimedia | |
parent | d5c06aa396140e789fccf560d8202dabed6f1c73 (diff) | |
download | freebsd-ports-gnome-bc766599f11e69217e1eeebdd5a96a2bb146ff1e.tar.gz freebsd-ports-gnome-bc766599f11e69217e1eeebdd5a96a2bb146ff1e.tar.zst freebsd-ports-gnome-bc766599f11e69217e1eeebdd5a96a2bb146ff1e.zip |
Drop support for releases older than FreeBSD 10.3
Diffstat (limited to 'multimedia')
9 files changed, 1 insertions, 175 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 6e43f2662b61..88187ba6619a 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -3,6 +3,7 @@ PORTNAME= mkvtoolnix PORTVERSION= 10.0.0 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ diff --git a/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h b/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h deleted file mode 100644 index 394782263623..000000000000 --- a/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libebml/ebml/EbmlBinary.h.orig 2015-07-18 11:39:43 UTC -+++ lib/libebml/ebml/EbmlBinary.h -@@ -41,6 +41,7 @@ - - #include "EbmlTypes.h" - #include "EbmlElement.h" -+#include <stdlib.h> - - // ----- Added 10/15/2003 by jcsston from Zen ----- - #if defined (__BORLANDC__) //Maybe other compilers? diff --git a/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp b/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp deleted file mode 100644 index 9007c3e83670..000000000000 --- a/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp +++ /dev/null @@ -1,81 +0,0 @@ ---- lib/nlohmann-json/src/json.hpp.orig 2016-04-23 13:52:02 UTC -+++ lib/nlohmann-json/src/json.hpp -@@ -87,6 +87,14 @@ struct has_mapped_type - static constexpr bool value = sizeof(test<T>(0)) == 1; - }; - -+template<typename T> -+std::string ToString(T val) -+{ -+ std::ostringstream TempStream; -+ TempStream << val; -+ return TempStream.str(); -+} -+ - } - - /*! -@@ -3029,7 +3037,7 @@ class basic_json - catch (std::out_of_range&) - { - // create better exception explanation -- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); -+ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); - } - } - else -@@ -3073,7 +3081,7 @@ class basic_json - catch (std::out_of_range&) - { - // create better exception explanation -- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); -+ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); - } - } - else -@@ -6224,7 +6232,7 @@ class basic_json - // use integer array index as key - case value_t::array: - { -- return std::to_string(array_index); -+ return ToString(array_index); - } - - // use key from the object -@@ -8204,7 +8212,7 @@ basic_json_parser_63: - */ - long double str_to_float_t(long double* /* type */, char** endptr) const - { -- return std::strtold(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); -+ return std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); - } - - /*! -@@ -8244,7 +8252,8 @@ basic_json_parser_63: - */ - float str_to_float_t(float* /* type */, char** endptr) const - { -- return std::strtof(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); -+ auto v = std::strtod(reinterpret_cast<typename string_t::const_pointer>(m_start), endptr); -+ return (float)v; - } - - /*! -@@ -8316,7 +8325,7 @@ basic_json_parser_63: - { - // positive, parse with strtoull and attempt cast to - // number_unsigned_t -- if (attempt_cast(std::strtoull(reinterpret_cast<typename string_t::const_pointer>(m_start), &endptr, -+ if (attempt_cast(strtoull(reinterpret_cast<typename string_t::const_pointer>(m_start), &endptr, - 10), result.m_value.number_unsigned)) - { - result.m_type = value_t::number_unsigned; -@@ -8331,7 +8340,7 @@ basic_json_parser_63: - { - // Negative, parse with strtoll and attempt cast to - // number_integer_t -- if (attempt_cast(std::strtoll(reinterpret_cast<typename string_t::const_pointer>(m_start), &endptr, -+ if (attempt_cast(strtoll(reinterpret_cast<typename string_t::const_pointer>(m_start), &endptr, - 10), result.m_value.number_integer)) - { - result.m_type = value_t::number_integer; diff --git a/multimedia/mkvtoolnix/files/patch-src_common_common.cpp b/multimedia/mkvtoolnix/files/patch-src_common_common.cpp deleted file mode 100644 index ce1f7566d87e..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_common_common.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/common/common.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/common/common.cpp -@@ -33,6 +33,10 @@ - #include "common/strings/editing.h" - #include "common/translation.h" - -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if !defined(LIBMATROSKA_VERSION) || (LIBMATROSKA_VERSION <= 0x000801) - #define matroska_init() - #define matroska_done() diff --git a/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp b/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp deleted file mode 100644 index e94f57502a32..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/common/dts.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/common/dts.cpp -@@ -23,6 +23,10 @@ - #include "common/endian.h" - #include "common/math.h" - -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - // --------------------------------------------------------------------------- - - namespace mtx { namespace dts { diff --git a/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp b/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp deleted file mode 100644 index 4127dc03611b..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/input/r_dts.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/input/r_dts.cpp -@@ -27,6 +27,10 @@ - #include "merge/input_x.h" - #include "output/p_dts.h" - -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #define READ_SIZE 16384 - - int diff --git a/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp b/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp deleted file mode 100644 index 9c562dfaccc9..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/input/r_qtmp4.cpp.orig 2016-09-11 12:16:51 UTC -+++ src/input/r_qtmp4.cpp -@@ -107,7 +107,7 @@ read_qtmp4_atom(mm_io_c *read_from, - if (exit_on_error) - mxerror(boost::format(Y("Quicktime/MP4 reader: Invalid chunk size %1% at %2%.\n")) % a.size % a.pos); - else -- throw mtx::atom_chunk_size_x{a.size, a.pos}; -+ throw mtx::atom_chunk_size_x{static_cast<size_t>(a.size), static_cast<size_t>(a.pos)}; - } - - return a; diff --git a/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp b/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp deleted file mode 100644 index d5c862fcc7f7..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/input/r_wav.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/input/r_wav.cpp -@@ -32,6 +32,10 @@ - #include "output/p_dts.h" - #include "output/p_pcm.h" - -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #define AC3ACM_READ_SIZE 100000 - - wav_demuxer_c::wav_demuxer_c(wav_reader_c *reader, diff --git a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp b/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp deleted file mode 100644 index c57899cc2068..000000000000 --- a/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/mkvtoolnix-gui/util/file_identifier.cpp.orig 2016-07-14 05:51:59 UTC -+++ src/mkvtoolnix-gui/util/file_identifier.cpp -@@ -1,5 +1,7 @@ - #include "common/common_pch.h" - -+#include <cmath> -+ - #include <QDebug> - #include <QDir> - #include <QFile> -@@ -288,8 +290,8 @@ FileIdentifier::addProbeRangePercentageA - if (probeRangePercentage <= 0) - return; - -- auto integerPart = static_cast<unsigned int>(std::round(probeRangePercentage * 100)) / 100; -- auto decimalPart = static_cast<unsigned int>(std::round(probeRangePercentage * 100)) % 100; -+ auto integerPart = static_cast<unsigned int>(round(probeRangePercentage * 100)) / 100; -+ auto decimalPart = static_cast<unsigned int>(round(probeRangePercentage * 100)) % 100; - - if (integerPart >= 100) - return; |