rpms/mkvtoolnix/F-9 mkvtoolnix-git18da82.patch, NONE, 1.1 mkvtoolnix-git706fa5.patch, NONE, 1.1 mkvtoolnix-git7429ba.patch, NONE, 1.1 mkvtoolnix-gita58727.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 mkvtoolnix.spec, 1.8, 1.9 sources, 1.7, 1.8 mkvtoolnix-boost-lib64.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31105

Modified Files:
	.cvsignore mkvtoolnix.spec sources 
Added Files:
	mkvtoolnix-git18da82.patch mkvtoolnix-git706fa5.patch 
	mkvtoolnix-git7429ba.patch mkvtoolnix-gita58727.patch 
Removed Files:
	mkvtoolnix-boost-lib64.patch 
Log Message:
* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
- updated to 2.4.2
- dropped obsolete boost detection patch
- fixed segmentation fault in mmg (bug #477857)
- backported some minor fixes from current git


mkvtoolnix-git18da82.patch:

--- NEW FILE mkvtoolnix-git18da82.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 18:59:55 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=cdcb7a3f03285cf815db95a5b715a98b2718da82

Removed extra % from output

The strings are not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/extract/mkvextract.cpp b/src/extract/mkvextract.cpp
index 03f6aef..6b2eac0 100644
--- a/src/extract/mkvextract.cpp
+++ b/src/extract/mkvextract.cpp
@@ -356,7 +356,7 @@ main(int argc,
     extract_tracks(input_file.c_str(), tracks);
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } else if (MODE_TAGS == mode)
     extract_tags(input_file.c_str(), s_parse_fully);
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 175fa32..782f809 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -355,7 +355,7 @@ extract_timecodes(const string &file_name,
     close_timecode_files();
 
     if (0 == verbose)
-      mxinfo(Y("Progress: 100%%\n"));
+      mxinfo(Y("Progress: 100%\n"));
 
   } catch (...) {
     show_error(Y("Caught exception"));

mkvtoolnix-git706fa5.patch:

--- NEW FILE mkvtoolnix-git706fa5.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 16:42:19 +0000 (+0100)
Subject: Removed extra % from output
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=9ddc19609e5daa9de51975c43b3a612f31706fa5

Removed extra % from output

The string is not passed through boost::filter; therefore one % is enough.
---

diff --git a/src/input/r_flac.cpp b/src/input/r_flac.cpp
index 2b4839a..6977337 100644
--- a/src/input/r_flac.cpp
+++ b/src/input/r_flac.cpp
@@ -384,7 +384,7 @@ flac_reader_c::parse_file() {
 #endif  // HAVE_FLAC_DECODER_SKIP
   }
 
-  mxinfo(Y("+-> Pre-parsing FLAC file: 100%%\n"));
+  mxinfo(Y("+-> Pre-parsing FLAC file: 100%\n"));
 
   if ((blocks.size() == 0) || (blocks[0].type != FLAC_BLOCK_TYPE_HEADERS))
     mxerror(Y("flac_reader: Could not read all header packets.\n"));

mkvtoolnix-git7429ba.patch:

--- NEW FILE mkvtoolnix-git7429ba.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Sun, 18 Jan 2009 19:42:40 +0000 (+0100)
Subject: mkvextract: do not output timecodes in scientific notation
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=b816b838a448e0c8eb8d284716afc1a95c7429ba

mkvextract: do not output timecodes in scientific notation

Huge timecodes were output in scientific notation because floating
point numbers were used. Now mkvextract creates the decimal and fractional
parts of the output itself so that the scientific notation will not be used.
---

diff --git a/ChangeLog b/ChangeLog
index 100b36a..dd8f205 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mkvextract: bug fix: During timecode extraction mkvextract wrote
+	large timecodes in scientific notation.
+
 2009-01-17  Moritz Bunkus  <moritz at bunkus.org>
 
 	* Released v2.4.2.
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 782f809..33f3440 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -58,6 +58,24 @@ static vector<timecode_extractor_t> timecode_extractors;
 
 // ------------------------------------------------------------------------
 
+static std::string
+format_timecode_for_timecode_file(int64_t timecode) {
+  std::string output      = (boost::format("%1%") % (int64_t)(timecode / 1000000)).str();
+  int64_t fractional_part = timecode % 1000000;
+
+  if (0 != fractional_part) {
+    output                       += (boost::format(".%06d") % fractional_part).str();
+    std::string::iterator zeroes  = output.end() - 1;
+
+    while (*zeroes == '0')
+      --zeroes;
+
+    output.erase(zeroes + 1, output.end());
+  }
+
+  return output;
+}
+
 static void
 close_timecode_files() {
   vector<timecode_extractor_t>::iterator extractor;
@@ -68,7 +86,7 @@ close_timecode_files() {
 
     sort(timecodes.begin(), timecodes.end());
     mxforeach(timecode, timecodes)
-      extractor->m_file->puts(boost::format("%1%\n") % (((double)(*timecode)) / 1000000.0));
+      extractor->m_file->puts(boost::format("%1%\n") % format_timecode_for_timecode_file(*timecode));
     delete extractor->m_file;
   }
   timecode_extractors.clear();

mkvtoolnix-gita58727.patch:

--- NEW FILE mkvtoolnix-gita58727.patch ---
From: Moritz Bunkus <moritz at bunkus.org>
Date: Mon, 19 Jan 2009 12:53:05 +0000 (+0100)
Subject: Test for NULL.
X-Git-Url: https://www.bunkus.org/cgi-bin/gitweb.cgi?p=mkvtoolnix.git;a=commitdiff_plain;h=f86b13a873eb6edce668a77601488439dca58727

Test for NULL.

The chapter editor does not assign an item data element to the root
element. Therefore the function should check if said item data element
is NULL before using it causing a crash otherwise.
---

diff --git a/ChangeLog b/ChangeLog
index dd8f205..0ff23b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Moritz Bunkus  <moritz at bunkus.org>
+
+	* mmg: bug fix: It was possible to crash mmg by clicking onto the
+	root element in the chapter editor.
+
 2009-01-18  Moritz Bunkus  <moritz at bunkus.org>
 
 	* mkvextract: bug fix: During timecode extraction mkvextract wrote
diff --git a/src/mmg/tab_chapters.cpp b/src/mmg/tab_chapters.cpp
index 3fefb3e..868567f 100644
--- a/src/mmg/tab_chapters.cpp
+++ b/src/mmg/tab_chapters.cpp
@@ -1703,7 +1703,7 @@ tab_chapters::on_chapter_name_selected(wxCommandEvent &evt) {
   if (!id.IsOk())
     return;
   t = (chapter_node_data_c *)tc_chapters->GetItemData(id);
-  if (!t->is_atom)
+  if (!t || !t->is_atom)
     return;
   cdisplay = NULL;
   n = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Dec 2008 21:08:43 -0000	1.7
+++ .cvsignore	19 Jan 2009 19:48:24 -0000	1.8
@@ -1 +1 @@
-mkvtoolnix-2.4.0.tar.bz2
+mkvtoolnix-2.4.2.tar.bz2


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/mkvtoolnix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mkvtoolnix.spec	1 Dec 2008 21:04:19 -0000	1.8
+++ mkvtoolnix.spec	19 Jan 2009 19:48:25 -0000	1.9
@@ -1,13 +1,16 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 2.4.0
+Version: 2.4.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
-Patch1: %{name}-boost-lib64.patch
+Patch0: %{name}-git18da82.patch
+Patch1: %{name}-git706fa5.patch
+Patch2: %{name}-git7429ba.patch
+Patch3: %{name}-gita58727.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: boost-devel
@@ -38,7 +41,10 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .lib64
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i -e 's/"-O3"/""/' configure*
 for file in AUTHORS ChangeLog ; do
   iconv -f iso8859-1 -t utf8 $file >$file.utf && \
@@ -113,6 +119,12 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Mon Jan 19 2009 Dominik Mierzejewski <rpm at greysector.net> 2.4.2-1
+- updated to 2.4.2
+- dropped obsolete boost detection patch
+- fixed segmentation fault in mmg (bug #477857)
+- backported some minor fixes from current git
+
 * Mon Dec 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.4.0-1
 - dropped obsolete mkvtoolnix-gcc43.patch
 - fixed boost detection on ppc64 (and sparc64) (bug #473976)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Dec 2008 21:08:43 -0000	1.7
+++ sources	19 Jan 2009 19:48:25 -0000	1.8
@@ -1 +1 @@
-125a6305de16236754d7554fa5b597cf  mkvtoolnix-2.4.0.tar.bz2
+050bc9019cfa10e243f17b5e84f5a05f  mkvtoolnix-2.4.2.tar.bz2


--- mkvtoolnix-boost-lib64.patch DELETED ---