summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-12-28 08:31:19 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-12-28 08:31:19 +0100
commit36615defaf6b097f19699a18003b68aa9a311dda (patch)
tree978d903960652afdb4ada83064f73b54c14650b7 /media-video/mkvtoolnix/files
parentversion bump, #569628 (diff)
downloadgentoo-36615defaf6b097f19699a18003b68aa9a311dda.tar.gz
gentoo-36615defaf6b097f19699a18003b68aa9a311dda.tar.bz2
gentoo-36615defaf6b097f19699a18003b68aa9a311dda.zip
media-video/mkvtoolnix: remove old
Package-Manager: portage-2.2.26 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'media-video/mkvtoolnix/files')
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch63
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch31
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch52
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch11
4 files changed, 0 insertions, 157 deletions
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
deleted file mode 100644
index 72b94b9688c8..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
-index 97c4ad0..87b94a8 100644
---- a/ac/ax_boost_filesystem.m4
-+++ b/ac/ax_boost_filesystem.m4
-@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_filesystem_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
- done
- if test "x$link_filesystem" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
-index ffd537f..2cef64f 100644
---- a/ac/ax_boost_regex.m4
-+++ b/ac/ax_boost_regex.m4
-@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
- AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
- if test "x$ax_boost_user_regex_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
- [link_regex="no"])
- done
- if test "x$link_regex" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
-index b0685b9..a71907b 100644
---- a/ac/ax_boost_system.m4
-+++ b/ac/ax_boost_system.m4
-@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
-
- LDFLAGS_SAVE=$LDFLAGS
- if test "x$ax_boost_user_system_lib" = "x"; then
-- for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
-+ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
- if test "x$link_system" != "xyes"; then
-- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
-+ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
- ax_lib=${libextension}
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
deleted file mode 100644
index a3fcf21947e5..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mkvtoolnix-5.8.0/rake.d/target.rb
-+++ mkvtoolnix-5.8.0/rake.d/target.rb
-@@ -107,7 +107,6 @@
- when :mtxunittest then "tests/unit/libmtxunittest.a"
- when :avi then "lib/avilib-0.6.10/libavi.a"
- when :rmff then "lib/librmff/librmff.a"
-- when :pugixml then "lib/pugixml/src/libpugixml.a"
- when :mpegparser then "src/mpegparser/libmpegparser.a"
- when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil
- when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
---- mkvtoolnix-5.8.0/Rakefile
-+++ mkvtoolnix-5.8.0/Rakefile
-@@ -55,8 +55,8 @@
- $applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
- $manpages = $programs.collect { |name| "doc/man/#{name}.1" }
-
-- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
-- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
-+ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-+ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
-
- $source_directories = %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
- src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
-@@ -605,7 +605,6 @@
-
- [ { :name => 'avi', :dir => 'lib/avilib-0.6.10' },
- { :name => 'rmff', :dir => 'lib/librmff' },
-- { :name => 'pugixml', :dir => 'lib/pugixml/src' },
- { :name => 'mpegparser', :dir => 'src/mpegparser' },
- { :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
- { :name => 'mtxinput', :dir => 'src/input' },
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch b/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
deleted file mode 100644
index c99d06b52de5..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nuar mkvtoolnix-6.6.0/src/common/iso639.cpp mkvtoolnix-6.6.0-fix/src/common/iso639.cpp
---- mkvtoolnix-6.6.0/src/common/iso639.cpp 2013-12-01 16:51:35.000000000 +0000
-+++ mkvtoolnix-6.6.0-fix/src/common/iso639.cpp 2015-02-09 07:00:26.134735208 +0000
-@@ -13,6 +13,7 @@
-
- #include "common/common_pch.h"
-
-+#include <boost/version.hpp>
- #include <unordered_map>
-
- #include "common/iso639.h"
-@@ -590,20 +591,36 @@
- auto range = iso639_languages | badap::indexed(0);
- auto end = boost::end(range);
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (brng::find(names, s) != names.end())
-- return lang.index();
-+ return index;
- }
-
- if (!allow_short_english_name)
- return -1;
-
- for (auto lang = boost::begin(range); lang != end; lang++) {
-- auto names = split(lang->english_name, ";");
-+#if BOOST_VERSION < 105600
-+ auto const &english_name = lang->english_name;
-+ auto index = lang.index();
-+#else
-+ auto const &english_name = lang->value().english_name;
-+ auto index = lang->index();
-+#endif
-+
-+ auto names = split(english_name, ";");
- strip(names);
- if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, s); }))
-- return lang.index();
-+ return index;
- }
-
- return -1;
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch b/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
deleted file mode 100644
index 67ce30fdbbc6..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-8.2.0-fix-curl-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mkvtoolnix-gui/main_window/main_window.cpp
-+++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
-@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
- #if defined(HAVE_CURL_EASY_H)
- connect(ui->actionHelpCheckForUpdates, &QAction::triggered, this, &MainWindow::checkForUpdates);
- #else
-- ui->actionGUICheckForUpdates->setVisible(false);
-+ ui->actionHelpCheckForUpdates->setVisible(false);
- #endif // HAVE_CURL_EASY_H
- }
-