[110158] users/mojca/wxports/multimedia/mkvtoolnix
mojca at macports.org
mojca at macports.org
Tue Aug 27 11:22:34 PDT 2013
Revision: 110158
https://trac.macports.org/changeset/110158
Author: mojca at macports.org
Date: 2013-08-27 11:22:34 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
mojca/mkvtoolnix: merge changes from trunk
Modified Paths:
--------------
users/mojca/wxports/multimedia/mkvtoolnix/Portfile
Added Paths:
-----------
users/mojca/wxports/multimedia/mkvtoolnix/files/
users/mojca/wxports/multimedia/mkvtoolnix/files/patch-clang_errors.diff
users/mojca/wxports/multimedia/mkvtoolnix/files/patch-df750c2.diff
Removed Paths:
-------------
users/mojca/wxports/multimedia/mkvtoolnix/files/patch-src-common-logger.cpp
Property Changed:
----------------
users/mojca/wxports/multimedia/mkvtoolnix/
Property changes on: users/mojca/wxports/multimedia/mkvtoolnix
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/multimedia/mkvtoolnix:109888
+ /trunk/dports/multimedia/mkvtoolnix:109366-110157
Modified: users/mojca/wxports/multimedia/mkvtoolnix/Portfile
===================================================================
--- users/mojca/wxports/multimedia/mkvtoolnix/Portfile 2013-08-27 18:03:04 UTC (rev 110157)
+++ users/mojca/wxports/multimedia/mkvtoolnix/Portfile 2013-08-27 18:22:34 UTC (rev 110158)
@@ -6,7 +6,7 @@
PortGroup wxWidgets 1.0
name mkvtoolnix
-version 5.8.0
+version 6.3.0
revision 1
categories multimedia
maintainers nomaintainer
@@ -20,14 +20,16 @@
platforms darwin
master_sites ${homepage}sources/ \
http://svn.mandriva.com/svn/packages/cooker/mkvtoolnix/releases/${version}/1/SOURCES/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 29c11e66680d0f0f58f9aab4c9edd69f84f67f1d \
- sha256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960
+checksums rmd160 7147271b54cf7ccb1ea9683428f6d9ccd47ae3fb \
+ sha256 bc05f07d92190d018e901091a07ed5139f4eec833203af04672e4d3a0c619ba1
wxWidgets.use wxWidgets-3.0
-depends_build port:pkgconfig
+depends_build port:pkgconfig \
+ port:libebml \
+ port:libmatroska
depends_lib port:boost \
port:bzip2 \
@@ -35,7 +37,6 @@
port:expat \
port:file \
port:flac \
- port:gcc47 \
port:gettext \
port:libogg \
port:libvorbis \
@@ -44,8 +45,22 @@
port:ruby \
port:zlib
-configure.compiler macports-gcc-4.7
+patch.pre_args -p1
+patchfiles patch-clang_errors.diff
+# Remove when version > 6.3.0 is released
+patchfiles-append patch-df750c2.diff
+
+platform darwin {
+ if {${os.major} < 13} {
+ # TODO: Need to link against static versions of boost and icu for this to work right
+ # See: https://trac.macports.org/ticket/40231
+
+ # configure complains about gcc < 4.6 and clang
+ compiler.whitelist macports-gcc-4.7 macports-gcc-4.8 macports-gcc-4.9
+ }
+}
+
build.cmd ./drake
build.target default
build.args -j${build.jobs}
Copied: users/mojca/wxports/multimedia/mkvtoolnix/files/patch-clang_errors.diff (from rev 110157, trunk/dports/multimedia/mkvtoolnix/files/patch-clang_errors.diff)
===================================================================
--- users/mojca/wxports/multimedia/mkvtoolnix/files/patch-clang_errors.diff (rev 0)
+++ users/mojca/wxports/multimedia/mkvtoolnix/files/patch-clang_errors.diff 2013-08-27 18:22:34 UTC (rev 110158)
@@ -0,0 +1,31 @@
+diff -pur mkvtoolnix-6.3.0.orig/src/common/command_line.cpp mkvtoolnix-6.3.0/src/common/command_line.cpp
+--- mkvtoolnix-6.3.0.orig/src/common/command_line.cpp 2013-08-24 18:35:22.000000000 -0400
++++ mkvtoolnix-6.3.0/src/common/command_line.cpp 2013-08-24 18:36:30.000000000 -0400
+@@ -285,6 +285,7 @@ handle_common_cli_args(std::vector<std::
+ } else if ((args[i] == "-h") || (args[i] == "-?") || (args[i] == "--help"))
+ usage();
+
++#if 0
+ #if defined(HAVE_CURL_EASY_H)
+ else if (args[i] == "--check-for-updates") {
+ mtx_release_version_t rel = get_latest_release_version();
+@@ -304,6 +305,7 @@ handle_common_cli_args(std::vector<std::
+ mxexit(rel.current_version < rel.latest_source ? 1 : 0);
+ }
+ #endif // defined(HAVE_CURL_EASY_H)
++#endif
+
+ else
+ ++i;
+diff -pur mkvtoolnix-6.3.0.orig/src/common/version.cpp mkvtoolnix-6.3.0/src/common/version.cpp
+--- mkvtoolnix-6.3.0.orig/src/common/version.cpp 2013-08-24 18:35:22.000000000 -0400
++++ mkvtoolnix-6.3.0/src/common/version.cpp 2013-08-24 18:35:43.000000000 -0400
+@@ -220,7 +220,7 @@ get_latest_release_version() {
+ std::stringstream urls;
+ brng::for_each(release.urls, [&](std::pair<std::string, std::string> const &kv) { urls << " " << kv.first << ":" << kv.second; });
+ mxdebug(boost::format("update check: current %1% latest source %2% latest winpre %3% URLs%4%\n")
+- % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls);
++ % release.current_version.to_string() % release.latest_source.to_string() % release.latest_windows_build.to_string() % urls.str());
+ }
+
+ return release;
Copied: users/mojca/wxports/multimedia/mkvtoolnix/files/patch-df750c2.diff (from rev 110157, trunk/dports/multimedia/mkvtoolnix/files/patch-df750c2.diff)
===================================================================
--- users/mojca/wxports/multimedia/mkvtoolnix/files/patch-df750c2.diff (rev 0)
+++ users/mojca/wxports/multimedia/mkvtoolnix/files/patch-df750c2.diff 2013-08-27 18:22:34 UTC (rev 110158)
@@ -0,0 +1,41 @@
+From df750c28b6f7258dd4c3037e1132c81300b8cdfa Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <moritz at bunkus.org>
+Date: Sun, 14 Jul 2013 17:25:42 +0200
+Subject: [PATCH] Fix compilation with clang/libc++ on FreeBSD
+
+On FreeBSD the high_resolution_clock is an alias for the steady_clock
+-- which doesn't support converting into time_t. As we only need a
+precision of seconds for outputting timestamps using system_clock
+instead is enough.
+---
+ src/common/logger.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/logger.cpp b/src/common/logger.cpp
+index 7f6e5f2..04251d2 100644
+--- a/src/common/logger.cpp
++++ b/src/common/logger.cpp
+@@ -20,7 +20,7 @@
+
+ logger_cptr logger_c::s_default_logger;
+
+-static auto s_program_start_time = std::chrono::high_resolution_clock::now();
++static auto s_program_start_time = std::chrono::system_clock::now();
+
+ logger_c::logger_c(bfs::path const &file_name)
+ : m_file_name(file_name)
+@@ -41,9 +41,9 @@
+ mm_text_io_c out(new mm_file_io_c(m_file_name.string(), bfs::exists(m_file_name) ? MODE_WRITE : MODE_CREATE));
+ out.setFilePointer(0, seek_end);
+
+- auto now = std::chrono::high_resolution_clock::now();
++ auto now = std::chrono::system_clock::now();
+ auto diff = now - s_program_start_time;
+- auto tnow = std::chrono::high_resolution_clock::to_time_t(now);
++ auto tnow = std::chrono::system_clock::to_time_t(now);
+
+ // 2013-03-02 15:42:32
+ char timestamp[30];
+--
+1.8.1.6
+
Deleted: users/mojca/wxports/multimedia/mkvtoolnix/files/patch-src-common-logger.cpp
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/files/patch-src-common-logger.cpp 2013-08-21 13:42:51 UTC (rev 109887)
+++ users/mojca/wxports/multimedia/mkvtoolnix/files/patch-src-common-logger.cpp 2013-08-27 18:22:34 UTC (rev 110158)
@@ -1,41 +0,0 @@
---- src/common/logger.cpp.orig 2013-06-27 23:02:44.000000000 +0300
-+++ src/common/logger.cpp 2013-07-14 10:13:25.026646733 +0300
-@@ -12,6 +12,7 @@
-
- #include <chrono>
- #include <ctime>
-+#include <ciso646>
-
- #include "common/logger.h"
- #include "common/fs_sys_helpers.h"
-@@ -20,7 +21,11 @@
-
- logger_cptr logger_c::s_default_logger;
-
-+#if defined( _LIBCPP_VERSION )
-+static auto s_program_start_time = std::chrono::system_clock::now();
-+#else
- static auto s_program_start_time = std::chrono::high_resolution_clock::now();
-+#endif
-
- logger_c::logger_c(bfs::path const &file_name)
- : m_file_name(file_name)
-@@ -41,9 +46,17 @@
- mm_text_io_c out(new mm_file_io_c(m_file_name.string(), bfs::exists(m_file_name) ? MODE_WRITE : MODE_CREATE));
- out.setFilePointer(0, seek_end);
-
-- auto now = std::chrono::high_resolution_clock::now();
-+ #if defined( _LIBCPP_VERSION )
-+ auto now = std::chrono::system_clock::now();
-+ #else
-+ auto now = std::chrono::high_resolution_clock::now();
-+ #endif
- auto diff = now - s_program_start_time;
-+ #if defined( _LIBCPP_VERSION )
-+ auto tnow = std::chrono::system_clock::to_time_t(now);
-+ #else
- auto tnow = std::chrono::high_resolution_clock::to_time_t(now);
-+ #endif
-
- // 2013-03-02 15:42:32
- char timestamp[30];
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/d404a482/attachment.html>
More information about the macports-changes
mailing list