Hello community,
here is the log from the commit of package mkvtoolnix for openSUSE:Factory
checked in at Wed Oct 6 23:07:11 CEST 2010.
--------
--- mkvtoolnix/mkvtoolnix.changes 2010-03-26 18:26:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix.changes 2010-09-07 19:57:00.000000000 +0200
@@ -1,0 +2,49 @@
+Sun Sep 5 17:49:35 UTC 2010 - reddwarf@opensuse.org
+
+- Update to 4.3.0
+ - It contains a lot of bug fixes and a few enhancements but no
+ major new features
+- mkvmerge-gui symlink is not available anymore, use mmg instead
+
+-------------------------------------------------------------------
+Thu Jul 29 17:03:12 UTC 2010 - reddwarf@opensuse.org
+
+- Update to 4.2.0
+ - It contains a lot of bug fixes and a few enhancements but no
+ major new features
+- Revert last commit since broke openSUSE 11.1 build
+
+-------------------------------------------------------------------
+Sun Jul 11 13:18:59 UTC 2010 - jengelh@medozas.de
+
+- Rerun autoreconf to retrieve ax_boost_base.m4 where libdir
+ detection is fixed
+- Use %_smp_mflags
+
+-------------------------------------------------------------------
+Sat Jul 3 21:49:34 UTC 2010 - cmorve69@yahoo.es
+
+- Update to 4.1.1
+ - Fix serious bug introduced in v4.1.0. If causes mkvmerge to
+ crash with default option in various circumstances, especially
+ when handling MPEG-4 part 2 video tracks.
+
+-------------------------------------------------------------------
+Thu Jul 1 15:35:34 UTC 2010 - cmorve69@yahoo.es
+
+- Update to 4.1.0
+ - A couple of bug fixes and enhancements especially in
+ combination with WebM.
+ - Full support for PGS/SUP subtitles.
+ - New and improved translations.
+
+-------------------------------------------------------------------
+Sat Jun 5 20:35:11 UTC 2010 - cmorve69@yahoo.es
+
+- Update to 4.0.0
+ - Full support for the WebM variant of the Matroska container
+ format, VP8 video tracks, the IVF container format
+ - Several important bug fixes and a few new features
+ - New translations
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
mkvtoolnix-3.3.0.tar.bz2
mkvtoolnix-guide-install.patch
mkvtoolnix-post-build-checks-RPM_OPT_FLAGS.patch
New:
----
_service
_service:download_url:mkvtoolnix-4.3.0.tar.bz2
mkvtoolnix-4.3.0-aliasing.patch
mkvtoolnix-4.3.0-guide_install.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkvtoolnix.spec ++++++
--- /var/tmp/diff_new_pack.WFL1VM/_old 2010-10-06 23:06:30.000000000 +0200
+++ /var/tmp/diff_new_pack.WFL1VM/_new 2010-10-06 23:06:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mkvtoolnix (Version 3.3.0)
+# spec file for package mkvtoolnix (Version 4.3.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,32 +18,37 @@
Name: mkvtoolnix
-BuildRequires: boost-devel flac-devel gcc-c++ libexpat-devel libmatroska-devel
-BuildRequires: libvorbis-devel lzo-devel update-desktop-files wxGTK-devel
-Url: http://www.bunkus.org/videotools/mkvtoolnix/
-Version: 3.3.0
+Version: 4.3.0
Release: 1
-Summary: Tools to Create, Alter, and Inspect Matroska Files
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}-guide-install.patch seife@suse.de cmorve69@yahoo.es -- Install docs in %{_docdir}.
-Patch0: %{name}-guide-install.patch
-# PATCH-FIX-OPENSUSE %{name}-post-build-checks-RPM_OPT_FLAGS.patch cmorve69@yahoo.es -- Avoids false "no-rpm-opt-flags" reports
-Patch1: %{name}-post-build-checks-RPM_OPT_FLAGS.patch
+# 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
+BuildRequires: boost-devel
+BuildRequires: file-devel
+BuildRequires: flac-devel
+BuildRequires: gcc-c++
+BuildRequires: libebml-devel >= 1.0.0
+BuildRequires: libexpat-devel
+BuildRequires: libmatroska-devel >= 1.0.0
+BuildRequires: libvorbis-devel
+BuildRequires: lzo-devel
+BuildRequires: ruby
+BuildRequires: update-desktop-files
+BuildRequires: wxGTK-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
%description
-Tools to create and manipulate Matroska files (extensions .mkv and
-.mka), a new container format for audio and video files. Includes
-command line tools mkvextract, mkvinfo, mkvmerge, and a graphical
-front-end for them, mkvmerge-gui.
-
-
-
-Authors:
---------
- Moritz Bunkus
+Tools to create and manipulate Matroska files (extensions .mkv and .mka), a new
+container format for audio and video files. Includes command line tools
+mkvextract, mkvinfo, mkvmerge, and a graphical front-end for them, mmg.
%prep
%setup -q
@@ -51,49 +56,49 @@
%patch1
%build
-%configure --without-build-timestamp --docdir=%{_docdir}/%{name}
-# V=1 so post-build-checks can check if a file is compiled without RPM_OPT_FLAGS
-%{__make} %{?jobs:-j%jobs} V=1
+%configure --without-build-timestamp --docdir=%{_docdir}
+# V=1 so post-build-checks can check if a file is compiled without optflags
+./drake %{?_smp_mflags} V=1
%install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT STRIP=:
-# "mkvmerge-gui" has been available in openSUSE since 2004, people could rely on
-# it in scripts. Look what to do once the Qt GUI is available.
-%{__ln_s} mmg $RPM_BUILD_ROOT%{_bindir}/mkvmerge-gui
-%{__install} -Dpm 0644 src/mmg/matroskalogo.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
-%{__install} -Dpm 0644 src/mmg/matroskalogo_big.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/mmg.xpm
-%suse_update_desktop_file -c mmg 'mkvmerge GUI' 'Merge multimedia streams into a Matroska file' mmg mmg 'AudioVideo;AudioVideoEditing;'
-%{__install} -Dpm 0644 src/info/matroska.xpm \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
-%suse_update_desktop_file -c mkvinfo mkvinfo 'Show information about tracks in Matroska files' 'mkvinfo -g' mkvinfo 'AudioVideo;AudioVideoEditing;'
-%{__install} -pm 0644 AUTHORS ChangeLog COPYING README \
- $RPM_BUILD_ROOT%{_docdir}/%{name}
+./drake install DESTDIR=%{buildroot}
+%suse_update_desktop_file mkvmergeGUI
+%suse_update_desktop_file mkvinfo
+%{__install} -pm 0644 AUTHORS ChangeLog COPYING README %{buildroot}%{_docdir}/%{name}
+%{__install} -dm 0755 %{buildroot}%{_docdir}/%{name}/examples
+%{__install} -pm 0644 examples/* %{buildroot}%{_docdir}/%{name}/examples
%find_lang %{name} --with-man --all-name
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
+
+%post
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
-%defattr (-,root,root)
+%defattr (0644, root, root, 0755)
%{_docdir}/%{name}
-%{_bindir}/mkvextract
-%{_bindir}/mkvinfo
-%{_bindir}/mkvmerge
-%{_bindir}/mkvmerge-gui
-%{_bindir}/mmg
-%{_bindir}/mkvpropedit
+%attr(0755,root,root) %{_bindir}/mkvextract
+%attr(0755,root,root) %{_bindir}/mkvinfo
+%attr(0755,root,root) %{_bindir}/mkvmerge
+%attr(0755,root,root) %{_bindir}/mmg
+%attr(0755,root,root) %{_bindir}/mkvpropedit
%{_datadir}/applications/mkvinfo.desktop
-%{_datadir}/applications/mmg.desktop
-%{_datadir}/icons/hicolor/32x32/apps/mkvinfo.xpm
-%{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
-%{_datadir}/icons/hicolor/64x64/apps/mmg.xpm
+%{_datadir}/applications/mkvmergeGUI.desktop
+%{_datadir}/icons/hicolor/*/apps/mkvinfo.png
+%{_datadir}/icons/hicolor/*/apps/mkvmergeGUI.png
+%{_datadir}/mime/packages/mkvtoolnix.xml
%{_mandir}/man1/mkvextract.1%{ext_man}
%{_mandir}/man1/mkvinfo.1%{ext_man}
%{_mandir}/man1/mkvmerge.1%{ext_man}
%{_mandir}/man1/mmg.1%{ext_man}
%{_mandir}/man1/mkvpropedit.1%{ext_man}
+%if 0%{?suse_version} <= 1120
+%{_mandir}/nl
%{_mandir}/zh_CN
+%endif
%changelog
++++++ mkvtoolnix-4.3.0-aliasing.patch ++++++
Index: Rakefile
===================================================================
--- Rakefile.orig
+++ Rakefile
@@ -73,7 +73,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)}\\\" -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)}\\\" -DMTX_PKG_DOC_DIR=\\\"#{c(:pkgdocdir)}\\\""
ldflags_extra = c?(:MINGW) ? '' : "-Wl,--enable-auto-import"
$flags = {
:cflags => "#{cflags_common} #{c(:USER_CFLAGS)}",
++++++ mkvtoolnix-4.3.0-guide_install.patch ++++++
Index: Rakefile
===================================================================
--- Rakefile.orig
+++ Rakefile
@@ -73,7 +73,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)}\\\""
ldflags_extra = c?(:MINGW) ? '' : "-Wl,--enable-auto-import"
$flags = {
:cflags => "#{cflags_common} #{c(:USER_CFLAGS)}",
@@ -342,11 +342,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" }
$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" ]
end
end
end
Index: build-config.in
===================================================================
--- build-config.in.orig
+++ build-config.in
@@ -16,6 +16,7 @@ sbindir = @sbindir@
libexecdir = @libexecdir@
datarootdir = @datarootdir@
datadir = @datadir@
+docdir = @docdir@
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
+++ src/mmg/mmg_dialog.cpp
@@ -626,23 +626,7 @@ mmg_dialog::display_help(int id) {
potential_help_paths.push_back(installation_path + wxT("/doc"));
#else
- // Debian, probably others
- potential_help_paths.push_back(wxT("/usr/share/doc/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/share/doc/mkvtoolnix/doc"));
- potential_help_paths.push_back(wxT("/usr/share/doc/mkvtoolnix-gui"));
- // SuSE
- potential_help_paths.push_back(wxT("/usr/share/doc/packages/mkvtoolnix"));
- // Fedora Core
- potential_help_paths.push_back(wxT("/usr/share/doc/mkvtoolnix-" VERSION));
- potential_help_paths.push_back(wxT("/usr/share/doc/mkvtoolnix-gui-" VERSION));
- // (Almost the) same for /usr/local
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/packages/mkvtoolnix"));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-" VERSION));
- potential_help_paths.push_back(wxT("/usr/local/share/doc/mkvtoolnix-gui-" VERSION));
- // 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));
#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