testing/mkvtoolnix: fix build failure and cleanup a bit

3 files changed, 12 insertions, 91 deletions

diff --git a/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch b/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
deleted file mode 100644
index 1e385210ce..0000000000
--- a/testing/mkvtoolnix/0001-uclibc-already-defines-bswap.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
index ab63c3cd35..decfea2660 100644
--- a/testing/mkvtoolnix/APKBUILD
+++ b/testing/mkvtoolnix/APKBUILD
@@ -1,50 +1,39 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=mkvtoolnix
 pkgver=9.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Set of tools to create, edit and inspect Matroska files"
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
+url="https://mkvtoolnix.download/index.html"
 arch="all"
 license="GPL"
 depends=""
-depends_dev="libmatroska-dev flac-dev libvorbis-dev boost-dev
-	zlib-dev file-dev libogg-dev"
-makedepends="$depends_dev autoconf automake ruby bash"
+depends_dev=""
+makedepends="libmatroska-dev flac-dev libvorbis-dev boost-dev
+	zlib-dev file-dev libogg-dev ruby-rake ruby-json bash"
 install=""
 subpackages="$pkgname-doc"
-source="http://www.bunkus.org/videotools/$pkgname/sources/$pkgname-$pkgver.tar.xz"
-
-_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
-}
+source="https://mkvtoolnix.download/sources/$pkgname-$pkgver.tar.xz"
 
+builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$_builddir"
-	./autogen.sh || return 1
-	./configure \
+	cd "$builddir"
+	./configure CC="${CC:-gcc}" CFLAGS="${CFLAGS}" \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--disable-gui \
 		--without-curl \
+		--without-gettext \
 		|| return 1
 	./drake V=1 -j${JOBS} || return
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	./drake DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/testing/mkvtoolnix/boost-1.58.patch b/testing/mkvtoolnix/boost-1.58.patch
deleted file mode 100644
index b42c04a724..0000000000
--- a/testing/mkvtoolnix/boost-1.58.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp.orig
-+++ ./lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp
-@@ -171,14 +171,13 @@
- // How many char objects can I process to get <= max_limit
- // wchar_t objects?
- int utf8_codecvt_facet::do_length(
--    BOOST_CODECVT_DO_LENGTH_CONST std::mbstate_t &,
-+    const std::mbstate_t &,
-     const char * from,
-     const char * from_end, 
-     std::size_t max_limit
-+) const 
- #if BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
--) const throw()
--#else
--) const
-+        throw()
- #endif
- { 
-     // RG - this code is confusing!  I need a better way to express it.