rathann pushed to mkvtoolnix (f21). "update to 7.8.0 (..more)"

Sun Apr 5 13:16:00 UTC 2015

>From 8c15bcbc1190ef13135a291a278eb585e600aa0f Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date: Tue, 31 Mar 2015 01:54:02 +0200
Subject: update to 7.8.0

- fix building tools
- unbundle utf8cpp

diff --git a/.gitignore b/.gitignore
index 8cb54a3..3c2747c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /mkvtoolnix-7.5.0.tar.xz
 /mkvtoolnix-7.6.0.tar.xz
 /mkvtoolnix-7.7.0.tar.xz
+/mkvtoolnix-7.8.0.tar.xz
diff --git a/mkvtoolnix-use-system-utf8cpp.patch b/mkvtoolnix-use-system-utf8cpp.patch
new file mode 100644
index 0000000..65883ae
--- /dev/null
+++ b/mkvtoolnix-use-system-utf8cpp.patch
@@ -0,0 +1,112 @@
+diff -up mkvtoolnix-7.8.0/ac/utf8cpp.m4.utf8cpp mkvtoolnix-7.8.0/ac/utf8cpp.m4
+--- mkvtoolnix-7.8.0/ac/utf8cpp.m4.utf8cpp	2015-03-31 01:37:44.469319723 +0200
++++ mkvtoolnix-7.8.0/ac/utf8cpp.m4	2015-03-31 01:37:44.469319723 +0200
+@@ -0,0 +1,20 @@
++dnl
++dnl Check for UTF8-CPP
++dnl
++
++AC_LANG_PUSH(C++)
++
++AC_CHECK_HEADERS([utf8.h])
++
++
++AC_LANG_POP
++
++if test x"$ac_cv_header_utf8_h" = xyes; then
++  AC_MSG_NOTICE([Using the system version of UTF8-CPP])
++  UTF8CPP_INTERNAL=no
++else
++  AC_MSG_NOTICE([Using the internal version of UTF8-CPP])
++  UTF8CPP_INTERNAL=yes
++fi
++
++AC_SUBST(UTF8CPP_INTERNAL)
+diff -up mkvtoolnix-7.8.0/configure.in.utf8cpp mkvtoolnix-7.8.0/configure.in
+--- mkvtoolnix-7.8.0/configure.in.utf8cpp	2015-03-27 14:26:25.000000000 +0100
++++ mkvtoolnix-7.8.0/configure.in	2015-03-31 01:37:44.469319723 +0200
+@@ -30,6 +30,7 @@ m4_include(ac/vorbis.m4)
+ m4_include(ac/flac.m4)
+ m4_include(ac/matroska.m4)
+ m4_include(ac/pugixml.m4)
++m4_include(ac/utf8cpp.m4)
+ m4_include(ac/zlib.m4)
+ m4_include(ac/wxwidgets.m4)
+ m4_include(ac/qt5.m4)
+diff -up mkvtoolnix-7.8.0/configure.utf8cpp mkvtoolnix-7.8.0/configure
+--- mkvtoolnix-7.8.0/configure.utf8cpp	2015-03-27 14:26:30.000000000 +0100
++++ mkvtoolnix-7.8.0/configure	2015-03-31 01:38:38.875754967 +0200
+@@ -667,6 +667,7 @@ WXWIDGETS_CFLAGS
+ WX_CONFIG
+ ZLIB_LIBS
+ ZLIB_CFLAGS
++UTF8CPP_INTERNAL
+ PUGIXML_INTERNAL
+ CXXCPP
+ EBML_MATROSKA_INTERNAL
+@@ -7467,6 +7468,47 @@ $as_echo "$as_me: Using the internal ver
+ fi
+ 
+ 
++
++
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++
++for ac_header in utf8.h
++do :
++  ac_fn_cxx_check_header_mongrel "$LINENO" "utf8.h" "ac_cv_header_utf8_h" "$ac_includes_default"
++if test "x$ac_cv_header_utf8_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_UTF8_H 1
++_ACEOF
++
++fi
++
++done
++
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++if test x"$ac_cv_header_utf8_h" = xyes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: Using the system version of UTF8-CPP" >&5
++$as_echo "$as_me: Using the system version of UTF8-CPP" >&6;}
++  UTF8CPP_INTERNAL=no
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: Using the internal version of UTF8-CPP" >&5
++$as_echo "$as_me: Using the internal version of UTF8-CPP" >&6;}
++  UTF8CPP_INTERNAL=yes
++fi
++
++
+ 
+ 
+ 
+diff -up mkvtoolnix-7.8.0/Rakefile.utf8cpp mkvtoolnix-7.8.0/Rakefile
+--- mkvtoolnix-7.8.0/Rakefile.utf8cpp	2015-03-27 14:26:25.000000000 +0100
++++ mkvtoolnix-7.8.0/Rakefile	2015-03-31 01:37:44.469319723 +0200
+@@ -54,9 +54,13 @@ def setup_globals
+   $manpages                =  $programs.collect { |name| "doc/man/#{name}.1" }
+   $manpages                << "doc/man/mkvtoolnix-gui.1" if !$build_mkvtoolnix_gui
+ 
+-  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
++  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Isrc"
+   $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
+ 
++  if c?(:UTF8CPP_INTERNAL)
++    $system_includes      += " -Ilib/utf8-cpp/source"
++  end
++
+   if c?(:PUGIXML_INTERNAL)
+     $system_includes      += " -Ilib/pugixml/src"
+     $system_libdirs       += " -Llib/pugixml/src"
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index 4b7c54f..e998f33 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -1,11 +1,13 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
-Version: 7.7.0
+Version: 7.8.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.xz
 Patch0: mkvtoolnix-use-system-boost.patch
+# https://github.com/mbunkus/mkvtoolnix/pull/1153
+Patch1: mkvtoolnix-use-system-utf8cpp.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRequires: boost-devel
 BuildRequires: bzip2-devel
@@ -22,6 +24,7 @@ BuildRequires: po4a
 BuildRequires: pcre-devel
 BuildRequires: pugixml-devel
 BuildRequires: ruby
+BuildRequires: utf8cpp-devel
 BuildRequires: wxGTK-devel
 BuildRequires: zlib-devel
 
@@ -44,16 +47,18 @@ This package contains the graphical interface for these utilities.
 %prep
 %setup -q
 %patch0 -p1 -b .boost
+%patch1 -p1 -b .utf8cpp
 chmod -x src/input/r_flv.{h,cpp}
-rm -rf lib/{boost,libebml,libmatroska}
+rm -rf lib/{boost,libebml,libmatroska,pugixml,utf8-cpp}
 
 %build
 %configure \
   --disable-optimization \
   --with-boost-libdir=%{_libdir} \
+  --with-tools \
   --without-curl \
   || cat config.log
-./drake %{?_smp_mflags} TOOLS=1 V=1
+./drake %{?_smp_mflags} V=1
 
 %install
 ./drake DESTDIR=$RPM_BUILD_ROOT TOOLS=1 install
@@ -154,6 +159,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/mkvtoolnix.xml
 
 %changelog
+* Mon Mar 30 2015 Dominik Mierzejewski <rpm at greysector.net> 7.8.0-1
+- update to 7.8.0
+- fix building tools
+- unbundle utf8cpp
+
 * Fri Mar 06 2015 Dominik Mierzejewski <rpm at greysector.net> 7.7.0-1
 - update to 7.7.0
 - include new manpages
diff --git a/sources b/sources
index 8816242..33050d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-821e14cc6680cad84fe38575e715cec9  mkvtoolnix-7.7.0.tar.xz
+91fd8f34c25b8d3980c3e39b3cb6ae6c  mkvtoolnix-7.8.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mkvtoolnix.git/commit/?h=f21&id=8c15bcbc1190ef13135a291a278eb585e600aa0f
