diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-20 12:43:29 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-20 12:43:29 +0000 |
| commit | 22401ec917f3eaa2691eca14141400a86993c5a0 (patch) | |
| tree | a1759d2271dc9158787bbec49be90c152c4db1a3 /testing/mkvtoolnix | |
| parent | 82e16737ccb5483eafb53b39b41e23d0f4f40992 (diff) | |
| download | aports-22401ec917f3eaa2691eca14141400a86993c5a0.tar.bz2 aports-22401ec917f3eaa2691eca14141400a86993c5a0.tar.xz | |
testing/mkvtoolnix: upgrade to 7.8.0
Diffstat (limited to 'testing/mkvtoolnix')
| -rw-r--r-- | testing/mkvtoolnix/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/mkvtoolnix/boost-1.58.patch | 20 |
2 files changed, 31 insertions, 6 deletions
diff --git a/testing/mkvtoolnix/APKBUILD b/testing/mkvtoolnix/APKBUILD index 11a6bda1de..6ab116c259 100644 --- a/testing/mkvtoolnix/APKBUILD +++ b/testing/mkvtoolnix/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mkvtoolnix -pkgver=7.3.0 -pkgrel=3 +pkgver=7.8.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" @@ -13,7 +13,9 @@ depends_dev="libmatroska-dev flac-dev libvorbis-dev boost-dev makedepends="$depends_dev autoconf automake ruby bash" install="" subpackages="$pkgname-doc" -source="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-$pkgver.tar.xz" +source="http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-$pkgver.tar.xz + boost-1.58.patch + " _builddir="$srcdir"/mkvtoolnix-$pkgver prepare() { @@ -49,6 +51,9 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="190ce613bde843def89a499330ca779b mkvtoolnix-7.3.0.tar.xz" -sha256sums="2cb09f926d16bfa8091a9f8fcbd63f6490bf1f2ce3280001f8d5c4798979d420 mkvtoolnix-7.3.0.tar.xz" -sha512sums="e725d8bbc97ca0cef0e281f8cfb3477555640bef5ce31fc9cf62d1ce36b95b895cbe757d983a9081ca626025eef3f7ae9052e810d2541d98808e09a5793d2e8f mkvtoolnix-7.3.0.tar.xz" +md5sums="91fd8f34c25b8d3980c3e39b3cb6ae6c mkvtoolnix-7.8.0.tar.xz +db72bf028eeedd3029129e9c3a15a028 boost-1.58.patch" +sha256sums="4ea13a75db2170944e95e180aaab97e3f0d42c04d88a0d4baadacd554248fe54 mkvtoolnix-7.8.0.tar.xz +d1ea41d683732f4b20929da0efe1518d9b158e6c953923550f156ad4fc8b4bac boost-1.58.patch" +sha512sums="6a56013da749fc6c661ade68a5d0fe50e710e2194f756d92cf47ccec471eb49206c14482ba1ccffedaf1ca164d3da49c3ea7f62296957bad7099baef8c7a083a mkvtoolnix-7.8.0.tar.xz +fdf90f4b74c280587e63f82d5ebe0f974270e90930039d6b39bc691a1254293514be526f95360b3eecf21b9843edc36bd4f4a24816225dd63f77cee12838c1e2 boost-1.58.patch" diff --git a/testing/mkvtoolnix/boost-1.58.patch b/testing/mkvtoolnix/boost-1.58.patch new file mode 100644 index 0000000000..b42c04a724 --- /dev/null +++ b/testing/mkvtoolnix/boost-1.58.patch @@ -0,0 +1,20 @@ +--- ./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. |