Ticket #43222: mkvtoolnix-6.8.0.diff

File mkvtoolnix-6.8.0.diff, 4.8 KB (added by mojca (Mojca Miklavec), 11 years ago)

  • Portfile

     
    66PortGroup           wxWidgets 1.0
    77
    88name                mkvtoolnix
    9 version             6.3.0
    10 revision            2
     9version             6.8.0
    1110categories          multimedia
    1211maintainers         nomaintainer
    1312license             GPL-2+ LGPL-2.1+
    … …  
    2221                    http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
    2322use_xz              yes
    2423
    25 checksums           rmd160  7147271b54cf7ccb1ea9683428f6d9ccd47ae3fb \
    26                     sha256  bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
     24checksums           rmd160  d600a14c9fc0ea570ff812f1ac67705e648d6e05 \
     25                    sha256  585b07a9a4c47d2ad0a907f5b0ee809108363721221494e9846da5736b808b99
    2726
    2827wxWidgets.use       wxWidgets-3.0
    2928
    … …  
    4544                    port:ruby \
    4645                    port:zlib
    4746
    48 patch.pre_args      -p1
    4947patchfiles          patch-clang_errors.diff
    50 # Remove when version > 6.3.0 is released
    51 patchfiles-append   patch-df750c2.diff
    5248
    5349
    5450platform darwin {

  • files/patch-clang_errors.diff

     
    1 diff -pur mkvtoolnix-6.3.0.orig/src/common/command_line.cpp mkvtoolnix-6.3.0/src/common/command_line.cpp
    2 --- mkvtoolnix-6.3.0.orig/src/common/command_line.cpp   2013-08-24 18:35:22.000000000 -0400
    3 +++ mkvtoolnix-6.3.0/src/common/command_line.cpp        2013-08-24 18:36:30.000000000 -0400
    4 @@ -285,6 +285,7 @@ handle_common_cli_args(std::vector<std::
     1--- src/common/command_line.cpp.orig
     2+++ src/common/command_line.cpp
     3@@ -291,6 +291,7 @@ handle_common_cli_args(std::vector<std::string> &args,
    54     } else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
    65       usage();
    76 
    … …  
    98 #if defined(HAVE_CURL_EASY_H)
    109     else if (args[i] == "--check-for-updates") {
    1110       mtx_release_version_t rel = get_latest_release_version();
    12 @@ -304,6 +305,7 @@ handle_common_cli_args(std::vector<std::
     11@@ -310,6 +311,7 @@ handle_common_cli_args(std::vector<std::string> &args,
    1312       mxexit(rel.current_version < rel.latest_source ? 1 : 0);
    1413     }
    1514 #endif  // defined(HAVE_CURL_EASY_H)
    … …  
    1716 
    1817     else
    1918       ++i;
    20 diff -pur mkvtoolnix-6.3.0.orig/src/common/version.cpp mkvtoolnix-6.3.0/src/common/version.cpp
    21 --- mkvtoolnix-6.3.0.orig/src/common/version.cpp        2013-08-24 18:35:22.000000000 -0400
    22 +++ mkvtoolnix-6.3.0/src/common/version.cpp     2013-08-24 18:35:43.000000000 -0400
    23 @@ -220,7 +220,7 @@ get_latest_release_version() {
     19--- src/common/version.cpp.orig
     20+++ src/common/version.cpp
     21@@ -228,7 +228,7 @@ get_latest_release_version() {
    2422     std::stringstream urls;
    2523     brng::for_each(release.urls, [&](std::pair<std::string, std::string> const &kv) { urls << " " << kv.first << ":" << kv.second; });
    2624     mxdebug(boost::format("update check: current %1% latest source %2% latest winpre %3% URLs%4%\n")

  • files/patch-df750c2.diff

     
    1 From df750c28b6f7258dd4c3037e1132c81300b8cdfa Mon Sep 17 00:00:00 2001
    2 From: Moritz Bunkus <moritz@bunkus.org>
    3 Date: Sun, 14 Jul 2013 17:25:42 +0200
    4 Subject: [PATCH] Fix compilation with clang/libc++ on FreeBSD
    5 
    6 On FreeBSD the high_resolution_clock is an alias for the steady_clock
    7 -- which doesn't support converting into time_t. As we only need a
    8 precision of seconds for outputting timestamps using system_clock
    9 instead is enough.
    10 ---
    11  src/common/logger.cpp | 6 +++---
    12  1 file changed, 3 insertions(+), 3 deletions(-)
    13 
    14 diff --git a/src/common/logger.cpp b/src/common/logger.cpp
    15 index 7f6e5f2..04251d2 100644
    16 --- a/src/common/logger.cpp
    17 +++ b/src/common/logger.cpp
    18 @@ -20,7 +20,7 @@
    19  
    20  logger_cptr logger_c::s_default_logger;
    21  
    22 -static auto s_program_start_time = std::chrono::high_resolution_clock::now();
    23 +static auto s_program_start_time = std::chrono::system_clock::now();
    24  
    25  logger_c::logger_c(bfs::path const &file_name)
    26    : m_file_name(file_name)
    27 @@ -41,9 +41,9 @@
    28      mm_text_io_c out(new mm_file_io_c(m_file_name.string(), bfs::exists(m_file_name) ? MODE_WRITE : MODE_CREATE));
    29      out.setFilePointer(0, seek_end);
    30  
    31 -    auto now  = std::chrono::high_resolution_clock::now();
    32 +    auto now  = std::chrono::system_clock::now();
    33      auto diff = now - s_program_start_time;
    34 -    auto tnow = std::chrono::high_resolution_clock::to_time_t(now);
    35 +    auto tnow = std::chrono::system_clock::to_time_t(now);
    36  
    37      // 2013-03-02 15:42:32
    38      char timestamp[30];
    39 --
    40 1.8.1.6
    41