diff --git a/.gitignore b/.gitignore index 2355b82..774d0c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /mkvtoolnix-4.5.0.tar.bz2 +/mkvtoolnix-4.9.1.tar.bz2 diff --git a/mkvtoolnix-4.5.0-backport-fix_boost-fsv3.patch b/mkvtoolnix-4.5.0-backport-fix_boost-fsv3.patch deleted file mode 100644 index afcace0..0000000 --- a/mkvtoolnix-4.5.0-backport-fix_boost-fsv3.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 597e307cc1461c32eac5229556a75a1ebbb80cca Mon Sep 17 00:00:00 2001 -From: Moritz Bunkus -Date: Tue, 15 Feb 2011 16:55:39 +0100 -Subject: [PATCH] Fixed compilation with Boost's filesystem library v3; also require Boost 1.36.0 or newer - ---- - ChangeLog | 4 ++++ - ac/boost.m4 | 2 +- - src/common/mm_multi_file_io.cpp | 14 +++++++++----- - 3 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index f742705..287f5be 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,9 @@ - 2011-02-15 Moritz Bunkus - -+ * build: Boost 1.36.0 or newer is required (up from 1.34.0). Also -+ fixed building with v3 of Boost's filesystem library, e.g. with -+ Boost 1.46.0 Beta 1 or newer. -+ - * mkvpropedit: new feature: Added support for adding, replacing - and removing tags. - -diff --git a/ac/boost.m4 b/ac/boost.m4 -index 86f75fa..a494247 100644 ---- a/ac/boost.m4 -+++ b/ac/boost.m4 -@@ -1,5 +1,5 @@ - # boost's headers must be present. --AX_BOOST_BASE([1.34.0]) -+AX_BOOST_BASE([1.36.0]) - - # boost::system can be absend for older versions. However, the test - # for boost::filesystem might fail if boost::system is not available -diff --git a/src/common/mm_multi_file_io.cpp b/src/common/mm_multi_file_io.cpp -index 4418a9f..1157d91 100644 ---- a/src/common/mm_multi_file_io.cpp -+++ b/src/common/mm_multi_file_io.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - #include - - #include "common/mm_multi_file_io.h" -@@ -155,14 +156,17 @@ mm_multi_file_io_c::create_verbose_identification_info(std::vector - - void - mm_multi_file_io_c::display_other_file_info() { -- std::vector file_names; -+ std::stringstream out; - - foreach(const mm_multi_file_io_c::file_t &file, m_files) -- if (file.m_file_name != m_files.front().m_file_name) -- file_names.push_back(file.m_file_name.leaf()); -+ if (file.m_file_name != m_files.front().m_file_name) { -+ if (!out.str().empty()) -+ out << ", "; -+ out << file.m_file_name.filename(); -+ } - -- if (!file_names.empty()) -- mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % join(", ", file_names)); -+ if (!out.str().empty()) -+ mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % out.str()); - } - - struct path_sorter_t { --- -1.7.0.4 - diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec index 3a649d7..3bf9940 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -1,14 +1,10 @@ -#Uptream patch applies unmodified -%global _default_patch_fuzz 3 - Summary: Matroska container manipulation utilities Name: mkvtoolnix -Version: 4.5.0 -Release: 2%{?dist} +Version: 4.9.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2 -Patch0: mkvtoolnix-4.5.0-backport-fix_boost-fsv3.patch URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -18,7 +14,7 @@ BuildRequires: expat-devel BuildRequires: file-devel BuildRequires: flac-devel BuildRequires: gettext -BuildRequires: libmatroska-devel >= 1.1.0 +BuildRequires: libmatroska-devel >= 1.0.0 BuildRequires: libvorbis-devel BuildRequires: lzo-devel BuildRequires: pcre-devel @@ -44,7 +40,6 @@ This package contains the graphical interface for these utilities. %prep %setup -q -%patch0 -p1 sed -i -e 's/"-O3"/""/' configure* for file in AUTHORS ChangeLog ; do iconv -f iso8859-1 -t utf8 $file >$file.utf && \ @@ -77,7 +72,7 @@ install -Dpm 644 share/icons/$size/mkvinfo.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$size/apps/mkvinfo.png done -rm -rf $RPM_BUILD_ROOT%{_docdir}/mkvtoolnix/guide +rm -r $RPM_BUILD_ROOT%{_docdir}/mkvtoolnix/guide install -pm 755 src/tools/{base64tool,diracparser,ebml_validator,vc1parser} $RPM_BUILD_ROOT%{_bindir} @@ -144,8 +139,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/mime/packages/mkvtoolnix.xml %changelog -* Sat Apr 09 2011 Nicolas Chauvet - 4.5.0-2 -- rebuilt +* Thu Jul 14 2011 Nicolas Chauvet - 4.9.1-1 +- Update to 4.9.1 * Tue Feb 15 2011 Nicolas Chauvet - 4.5.0-1 - Update to 4.5.0 diff --git a/sources b/sources index 8727391..5d46b78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53384e19451578620383d1bd525d59bb mkvtoolnix-4.5.0.tar.bz2 +5981f266e6d25da4a49f7464e4a97cdf mkvtoolnix-4.9.1.tar.bz2