commit 7b0bbf7efa0bb8ec65b34d1479c03352a27516cb
Author: Karol Krenski <[email protected]>
Date: Tue Jul 24 01:14:14 2012 +0200
- fixes working with Boost 1.50
- rel. 2
mkvtoolnix-boost_1_5.patch | 11 +++++++++++
mkvtoolnix.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/mkvtoolnix-boost_1_5.patch b/mkvtoolnix-boost_1_5.patch
new file mode 100644
index 0000000..707ef1a
--- /dev/null
+++ b/mkvtoolnix-boost_1_5.patch
@@ -0,0 +1,11 @@
+--- mkvtoolnix-5.7.0/src/common/mm_io.cpp.orig 2012-07-08 20:06:02.000000000
+0200
++++ mkvtoolnix-5.7.0/src/common/mm_io.cpp 2012-07-24 00:36:34.197525801
+0200
+@@ -147,7 +147,7 @@
+ void
+ mm_file_io_c::prepare_path(const std::string &path) {
+ boost::filesystem::path directory =
boost::filesystem::path(path).parent_path();
+- if (boost::filesystem::exists(directory))
++ if (directory.empty() || boost::filesystem::exists(directory))
+ return;
+
+ boost::system::error_code error_code;
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 36540ea..0df7b68 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -11,12 +11,13 @@ Summary: Matroska video utilities
Summary(pl.UTF-8): Narzędzia do filmów w formacie Matroska
Name: mkvtoolnix
Version: 5.7.0
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/Multimedia
Source0:
http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
# Source0-md5: 99ea44be570412dadafe4ccaee0cfe6e
Patch0: %{name}-init_locales.patch
+Patch1: %{name}-boost_1_5.patch
URL: http://www.bunkus.org/videotools/mkvtoolnix/
%{?with_qt:BuildRequires: QtGui-devel}
BuildRequires: boost-devel >= 1.36
@@ -50,6 +51,7 @@ Narzędzia do filmów w formacie Matroska.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%configure \
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
