Added media video

4 files changed, 184 insertions, 2 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8f705b8f..13375e98 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1 @@
-DIST mkvtoolnix-5.0.1.tar.bz2 2155095 RMD160 3c6220a1ff304a18e4d7125d6981966c3e9d368e SHA1 900211d47ba6cbeb4188bb45a492a2b9edf08ed2 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19
-EBUILD mkvtoolnix-5.0.1.ebuild 1907 RMD160 f65e203b483c425b8e453803a6f4a3a4dc5d7a2f SHA1 bf7b6cd8679100e002bdbd803ed66ae757216011 SHA256 4b842af11a50fdaa5541fef1726cd1a01c31b791463db5259c5d3746f82a6b01
+DIST mkvtoolnix-6.2.0.tar.xz 5122644 SHA256 567b1cc3e67f1da92df17bf18e956778a6bb3d303e6c27162b933bcb5addc420 SHA512 e41fac3858f60d4725a8666d02c3f0afa3dd1ab83ed0051d95c5ab59b375637aac30775fe52fd650c20ad3f363cdd8fd1a41e3f242b9073a6ee58926d95e208a WHIRLPOOL 48b0a84b21c8e1fc91ff3e2f974532bb19b6bff28afce6aa602d53589e54d975c92aec05f5f850ea180eaceae8e7bb590a16ce49d9107b1f5e698646592240fb
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
new file mode 100644
index 00000000..72b94b96
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 00000000..a3fcf219
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
@@ -0,0 +1,31 @@
+--- 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/mkvtoolnix-6.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
new file mode 100644
index 00000000..1c987801
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug pch qt4 wxwidgets"
+
+RDEPEND="
+	>=dev-libs/libebml-1.3.0:=
+	>=media-libs/libmatroska-1.4.0:=
+	>=dev-libs/boost-1.46.0
+	dev-libs/pugixml
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	>=sys-devel/gcc-4.6
+	sys-libs/zlib
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		!media-video/mkvtoolnix-gui
+	)
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] !media-video/mkvtoolnix-gui )
+"
+DEPEND="${RDEPEND}
+	dev-lang/ruby
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	# http://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
+		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use wxwidgets ; then
+		WX_GTK_VER="2.8"
+		need-wxwidgets unicode
+		myconf="--with-wx-config=${WX_CONFIG}"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt4 qt) \
+		$(use_enable wxwidgets) \
+		$(usex pch "" --disable-precompiled-headers) \
+		${myconf} \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--without-curl
+}
+
+src_compile() {
+	./drake V=1 -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README TODO
+	doman doc/man/*.1
+
+	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
+}