diff options
Diffstat (limited to 'multimedia/mkvtoolnix')
| -rw-r--r-- | multimedia/mkvtoolnix/boost-1.69.0.patch | 51 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/mkvtoolnix.SlackBuild | 5 | ||||
| -rw-r--r-- | multimedia/mkvtoolnix/mkvtoolnix.info | 6 |
3 files changed, 58 insertions, 4 deletions
diff --git a/multimedia/mkvtoolnix/boost-1.69.0.patch b/multimedia/mkvtoolnix/boost-1.69.0.patch new file mode 100644 index 0000000000..5ea1117528 --- /dev/null +++ b/multimedia/mkvtoolnix/boost-1.69.0.patch @@ -0,0 +1,51 @@ +After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails: + +src/common/debugging.h:63:14: fatal error: no viable conversion from returned value of type 'boost::tribool' to function return type 'bool' + return m_requested; + ^~~~~~~~~~~ +src/input/r_matroska.cpp:1685:43: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool' + PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track); + ^~~~~~~~~~~~~~~~ +src/merge/generic_packetizer.h:199:44: note: passing argument to parameter 'enabled_track' here + virtual void set_track_enabled_flag(bool enabled_track); + ^ +src/output/p_avc_es.cpp:49:41: fatal error: no viable conversion from 'boost::logic::tribool' to 'bool' + m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/common/avc_es_parser.h:152:42: note: passing argument to parameter 'fix' here + void set_fix_bitstream_frame_rate(bool fix) { + ^ + +--- src/common/debugging.h.orig 2018-10-20 14:44:02 UTC ++++ src/common/debugging.h +@@ -60,7 +60,7 @@ class debugging_option_c { + if (boost::logic::indeterminate(m_requested)) + m_requested = debugging_c::requested(m_option); + +- return m_requested; ++ return bool{m_requested}; + } + }; + +--- src/input/r_matroska.cpp.orig 2018-10-20 14:44:02 UTC ++++ src/input/r_matroska.cpp +@@ -1682,7 +1682,7 @@ kax_reader_c::set_packetizer_headers(kax_track_t *t) { + PTZR(t->ptzr)->set_track_forced_flag(true); + + if (boost::logic::indeterminate(PTZR(t->ptzr)->m_ti.m_enabled_track)) +- PTZR(t->ptzr)->set_track_enabled_flag(t->enabled_track); ++ PTZR(t->ptzr)->set_track_enabled_flag(bool{t->enabled_track}); + + if ((0 != t->track_uid) && !PTZR(t->ptzr)->set_uid(t->track_uid)) + mxwarn(boost::format(Y("matroska_reader: Could not keep the track UID %1% because it is already allocated for the new file.\n")) % t->track_uid); +--- src/output/p_avc_es.cpp.orig 2018-10-20 14:44:02 UTC ++++ src/output/p_avc_es.cpp +@@ -46,7 +46,7 @@ avc_es_video_packetizer_c(generic_reader_c *p_reader, + set_codec_id(MKV_V_MPEG4_AVC); + + m_parser.set_keep_ar_info(false); +- m_parser.set_fix_bitstream_frame_rate(m_ti.m_fix_bitstream_frame_rate); ++ m_parser.set_fix_bitstream_frame_rate(bool{m_ti.m_fix_bitstream_frame_rate}); + + // If no external timestamp file has been specified then mkvmerge + // might have created a factory due to the --default-duration diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild index 05b885583f..d147676c4f 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild +++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mkvtoolnix -VERSION=${VERSION:-27.0.0} +VERSION=${VERSION:-29.0.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://svnweb.freebsd.org/ports?view=revision&revision=482787 +patch -p0 < $CWD/boost-1.69.0.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info index e11b61a87b..74eb674549 100644 --- a/multimedia/mkvtoolnix/mkvtoolnix.info +++ b/multimedia/mkvtoolnix/mkvtoolnix.info @@ -1,8 +1,8 @@ PRGNAM="mkvtoolnix" -VERSION="27.0.0" +VERSION="29.0.0" HOMEPAGE="https://www.bunkus.org/videotools/mkvtoolnix" -DOWNLOAD="https://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-27.0.0.tar.xz" -MD5SUM="67370772ea1e0d404f371813ac85c153" +DOWNLOAD="https://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-29.0.0.tar.xz" +MD5SUM="f252db8c5c43588677f9bd4d337de3de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cmark" |