testing/mkvtoolnix: new aport

3 files changed, 173 insertions, 0 deletions

diff --git a/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch b/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
new file mode 100644
index 0000000000..1e385210ce
--- /dev/null
+++ b/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
@@ -0,0 +1,48 @@
+From b115cc238a4433e0b29d97392e4251b689aff311 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Thu, 16 Jan 2014 12:26:50 +0000
+Subject: [PATCH] uclibc already defines bswap
+
+---
+ src/common/bswap.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/common/bswap.h b/src/common/bswap.h
+index f1cf28a..c59a5a2 100644
+--- a/src/common/bswap.h
++++ b/src/common/bswap.h
+@@ -16,11 +16,14 @@
+ 
+ #include "common/common_pch.h"
+ 
++#ifndef bswap_16
+ inline uint16_t
+ bswap_16(uint16_t x) {
+   return (x >> 8) | (x << 8);
+ }
++#endif
+ 
++#ifndef bswap_32
+ inline uint32_t
+ bswap_32(uint32_t x) {
+   x = ((x <<  8) & 0xff00ff00) | ((x >>  8) & 0x00ff00ff);
+@@ -28,7 +31,9 @@ bswap_32(uint32_t x) {
+ 
+   return x;
+ }
++#endif
+ 
++#ifndef bswap_64
+ inline uint64_t
+ bswap_64(uint64_t x) {
+   union {
+@@ -42,5 +47,6 @@ bswap_64(uint64_t x) {
+ 
+   return r.ll;
+ }
++#endif
+ 
+ #endif  // MTX_COMMON_BSWAP_H
+-- 
+1.8.5.2
+
diff --git a/testing/mkvtoolnix/APKBUILD b/testing/mkvtoolnix/APKBUILD
new file mode 100644
index 0000000000..2296d29cad
--- /dev/null
+++ b/testing/mkvtoolnix/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer:
+pkgname=mkvtoolnix
+pkgver=6.7.0
+pkgrel=0
+pkgdesc="Set of tools to create, edit and inspect Matroska files"
+url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="libmatroska-dev flac-dev libvorbis-dev boost-dev libiconv-dev
+	zlib-dev file-dev libogg-dev"
+makedepends="$depends_dev autoconf automake ruby"
+install=""
+subpackages="$pkgname-doc"
+source="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-$pkgver.tar.xz
+	mkvtoolnix-5.8.0-boost-configure.patch
+	0001-uclibc-already-defines-bswap.patch"
+
+_builddir="$srcdir"/mkvtoolnix-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./autogen.sh || return 1
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-gui \
+		--without-curl \
+		|| return 1
+	./drake V=1 -j${JOBS} || return
+}
+
+package() {
+	cd "$_builddir"
+	./drake DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+md5sums="27bb6b0a10b3bb2fcf1c3e520c300207  mkvtoolnix-6.7.0.tar.xz
+f8a4913b5f2ddee76143736aa1dcd4bb  mkvtoolnix-5.8.0-boost-configure.patch
+ebb3aab6efa29de8cd176963971956d6  0001-uclibc-already-defines-bswap.patch"
+sha256sums="82207c6ece01e76d51edcf6a330c9f0dc75e3bf4201fead3023c98bd7f323785  mkvtoolnix-6.7.0.tar.xz
+060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5  mkvtoolnix-5.8.0-boost-configure.patch
+8e263aeb87a17dcd2809a5b7a5ed784766da1bff2b7c23ac3a8294588513f55a  0001-uclibc-already-defines-bswap.patch"
+sha512sums="e45621b2d68e8938731b89e2ac35d3811523896736d15c73acda283c61ae3414b459b881bcfe6764b3839a61e0d2f83ce23ea2ad94d329378d1904b0b97ac949  mkvtoolnix-6.7.0.tar.xz
+8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b  mkvtoolnix-5.8.0-boost-configure.patch
+f297b1b8715f06388b96b41c094843376c561599d8087a8c0375ce3985bd9e96f553bef6645e9811a2c589c58d5baf4b22cf9fda4df4a52739a090d8cb323a87  0001-uclibc-already-defines-bswap.patch"
diff --git a/testing/mkvtoolnix/mkvtoolnix-5.8.0-boost-configure.patch b/testing/mkvtoolnix/mkvtoolnix-5.8.0-boost-configure.patch
new file mode 100644
index 0000000000..72b94b9688
--- /dev/null
+++ b/testing/mkvtoolnix/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],