commit mkvtoolnix for openSUSE:Factory

2 Nov 2010

Hello community,

here is the log from the commit of package mkvtoolnix for openSUSE:Factory
checked in at Tue Nov 2 16:16:02 CET 2010.



--------

--- mkvtoolnix/mkvtoolnix.changes	2010-09-07 19:57:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix.changes	2010-11-02 11:48:32.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Nov  2 10:04:07 UTC 2010 - reddwarf@opensuse.org
+
+- Update to 4.4.0
+  - It contains a lot of bug fixes and a few enhancements but no
+    major new features
+- Drop mkvtoolnix-4.3.0-aliasing.patch
+- Update mkvtoolnix-4.4.0-guide_install.patch
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  _service:download_url:mkvtoolnix-4.3.0.tar.bz2
  mkvtoolnix-4.3.0-aliasing.patch
  mkvtoolnix-4.3.0-guide_install.patch

New:
----
  _service:download_url:mkvtoolnix-4.4.0.tar.bz2
  mkvtoolnix-4.4.0-guide_install.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mkvtoolnix.spec ++++++
--- /var/tmp/diff_new_pack.oaN7GV/_old	2010-11-02 16:15:05.000000000 +0100
+++ /var/tmp/diff_new_pack.oaN7GV/_new	2010-11-02 16:15:05.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package mkvtoolnix (Version 4.3.0)
+# spec file for package mkvtoolnix (Version 4.4.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,17 +18,15 @@
 
 
 Name:           mkvtoolnix
-Version:        4.3.0
+Version:        4.4.0
 Release:        1
 License:        GPLv2+
 Summary:        Tools to Create, Alter, and Inspect Matroska Files
 Url:            http://www.bunkus.org/videotools/mkvtoolnix/
 Group:          Productivity/Multimedia/Other
 Source:         http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE %{name}-4.3.0-guide-install.patch reddwarf@opensuse.org -- Install docs in %{_docdir}.
-Patch0:         %{name}-4.3.0-guide_install.patch
-# PATCH-FIX-OPENSUSE %{name}-4.3.0-aliasing.patch reddwarf@opensuse.org -- Show aliasing problems
-Patch1:         %{name}-4.3.0-aliasing.patch
+# PATCH-FIX-UPSTREAM %{name}-4.4.0-guide-install.patch emailed_upstream reddwarf@opensuse.org -- Install docs in %{_docdir}.
+Patch0:         %{name}-4.4.0-guide_install.patch
 BuildRequires:  boost-devel
 BuildRequires:  file-devel
 BuildRequires:  flac-devel
@@ -53,10 +51,9 @@
 %prep
 %setup -q
 %patch0
-%patch1
 
 %build
-%configure --without-build-timestamp --docdir=%{_docdir}
+%configure --without-build-timestamp --docdir=%{_docdir}/%{name}
 # V=1 so post-build-checks can check if a file is compiled without optflags
 ./drake %{?_smp_mflags} V=1
 

++++++ _service ++++++
--- /var/tmp/diff_new_pack.oaN7GV/_old	2010-11-02 16:15:05.000000000 +0100
+++ /var/tmp/diff_new_pack.oaN7GV/_new	2010-11-02 16:15:05.000000000 +0100
@@ -3,11 +3,11 @@
   <service name="download_url">
     <param name="protocol">http</param>
     <param name="host">www.bunkus.org</param>
-    <param name="path">/videotools/mkvtoolnix/sources/mkvtoolnix-4.3.0.tar.bz2</param>
+    <param name="path">/videotools/mkvtoolnix/sources/mkvtoolnix-4.4.0.tar.bz2</param>
   </service>
   <service name="verify_file">
-    <param name="file">_service:download_url:mkvtoolnix-4.3.0.tar.bz2</param>
+    <param name="file">_service:download_url:mkvtoolnix-4.4.0.tar.bz2</param>
     <param name="verifier">sha256</param>
-    <param name="checksum">f98cb220495f23985c3b9f883ee9573c7fa38705ace94b025578feebfcdfcd1f</param>
+    <param name="checksum">d458448f099abd3609fccddf54bd0d1cf8cadf2e966478432fb09116a0aaef2a</param>
   </service>
 </services>

++++++ _service:download_url:mkvtoolnix-4.3.0.tar.bz2 -> _service:download_url:mkvtoolnix-4.4.0.tar.bz2 ++++++
++++ 35975 lines of diff (skipped)

++++++ mkvtoolnix-4.3.0-guide_install.patch -> mkvtoolnix-4.4.0-guide_install.patch ++++++
--- mkvtoolnix/mkvtoolnix-4.3.0-guide_install.patch	2010-09-05 19:53:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix-4.4.0-guide_install.patch	2010-11-02 12:51:44.000000000 +0100
@@ -2,27 +2,27 @@
 ===================================================================
 --- Rakefile.orig
 +++ Rakefile
-@@ -73,7 +73,7 @@ def setup_globals
+@@ -78,7 +78,7 @@ def setup_globals
  
    $build_tools           ||=  c?(:TOOLS)
  
--  cflags_common            = "-Wall -Wno-comment -Wno-strict-aliasing #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\""
-+  cflags_common            = "-Wall -Wno-comment -Wno-strict-aliasing #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_PKG_DOC_DIR=\\\"#{c(:pkgdocdir)}\\\""
+-  cflags_common            = "-Wall -Wno-comment #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\""
++  cflags_common            = "-Wall -Wno-comment #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:USER_CPPFLAGS)} -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\""
    ldflags_extra            = c?(:MINGW) ? '' : "-Wl,--enable-auto-import"
    $flags                   = {
      :cflags                => "#{cflags_common} #{c(:USER_CFLAGS)}",
-@@ -342,11 +342,11 @@ namespace :install do
+@@ -349,11 +349,11 @@ namespace :install do
      end
  
      task :guides do
 -      install_dir :pkgdatadir, $languages[:guides].collect { |language| "#{c(:pkgdatadir)}/guide/#{language}/images" }
-+      install_dir :pkgdocdir, $languages[:guides].collect { |language| "#{c(:pkgdocdir)}/guide/#{language}/images" }
++      install_dir :docdir, $languages[:guides].collect { |language| "#{c(:docdir)}/guide/#{language}/images" }
  
        $languages[:guides].each do |language|
 -        install_data "#{c(:pkgdatadir)}/guide/#{language}/",        FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ]
 -        install_data "#{c(:pkgdatadir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif"   ]
-+        install_data "#{c(:pkgdocdir)}/guide/#{language}/",        FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ]
-+        install_data "#{c(:pkgdocdir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif"   ]
++        install_data "#{c(:docdir)}/guide/#{language}/",        FileList[ "#{$top_srcdir}/doc/guide/#{language}/mkvmerge-gui.*" ]
++        install_data "#{c(:docdir)}/guide/#{language}/images/", FileList[ "#{$top_srcdir}/doc/guide/#{language}/images/*.gif"   ]
        end
      end
    end
@@ -38,14 +38,6 @@
  sysconfdir = @sysconfdir@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
-@@ -26,6 +27,7 @@ man1dir = $(mandir)/man1
- includedir = @includedir@
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdocdir = $(docdir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
 Index: src/mmg/mmg_dialog.cpp
 ===================================================================
 --- src/mmg/mmg_dialog.cpp.orig
@@ -71,7 +63,7 @@
 -    // New location
 -    potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR));
 -    potential_help_paths.push_back(wxT(MTX_PKG_DATA_DIR "-" VERSION));
-+    potential_help_paths.push_back(wxT(MTX_PKG_DOC_DIR));
++    potential_help_paths.push_back(wxT(MTX_DOC_DIR));
  #endif
  
      wxConfigBase *cfg = wxConfigBase::Get();


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)