forked from ports/contrib
mkvtoolnix: patch for boost 1.58
This commit is contained in:
parent
82d629cef5
commit
201b88af7f
@ -1 +1,2 @@
|
||||
ba7ad1b6a0573e70351f879576df56ea boost-1.58.patch
|
||||
91fd8f34c25b8d3980c3e39b3cb6ae6c mkvtoolnix-7.8.0.tar.xz
|
||||
|
@ -7,12 +7,15 @@
|
||||
|
||||
name=mkvtoolnix
|
||||
version=7.8.0
|
||||
release=1
|
||||
source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$name-$version.tar.xz)
|
||||
release=2
|
||||
source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$name-$version.tar.xz
|
||||
boost-1.58.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/boost-1.58.patch
|
||||
|
||||
local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
|
||||
test -n "$JOBS" && export DRAKETHREADS="$JOBS"
|
||||
|
||||
|
26
mkvtoolnix/boost-1.58.patch
Normal file
26
mkvtoolnix/boost-1.58.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/testing/mkvtoolnix/boost-1.58.patch b/testing/mkvtoolnix/boost-1.58.patch
|
||||
new file mode 100644
|
||||
index 0000000..b42c04a
|
||||
--- /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.
|
Loading…
x
Reference in New Issue
Block a user