Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build system: require libEBML v1.3.4, libMatroska v1.4.5

Browse Source
This commit is contained in:
Moritz Bunkus 2016-07-13 18:39:12 +02:00
parent 50501448b8
commit 6d85fbc046
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,10 @@
* Released v9.3.0 "Second Sight". * Released v9.3.0 "Second Sight".
* build system: libEBML v1.3.4 and libMatroska v1.4.5 are now
required due to several new elements having been specified for
Matroska, and mkvmerge uses those elements.
2016-07-10 Moritz Bunkus <moritz@bunkus.org> 2016-07-10 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge, MKVToolNix GUI: new chapter generation feature: two * mkvmerge, MKVToolNix GUI: new chapter generation feature: two

8
README.md
View File

@ -72,8 +72,8 @@ programs and libraries you absolutely need are:
and alias declarations. Others may be needed, too. For GCC this means and alias declarations. Others may be needed, too. For GCC this means
at least v4.8.0; for clang v3.4 or later. at least v4.8.0; for clang v3.4 or later.
- [libEBML v1.3.3](http://dl.matroska.org/downloads/libebml/) or later - [libEBML v1.3.4](http://dl.matroska.org/downloads/libebml/) or later
and [libMatroska v1.4.4](http://dl.matroska.org/downloads/libmatroska/) and [libMatroska v1.4.5](http://dl.matroska.org/downloads/libmatroska/)
or later for low-level access to Matroska files. Instructions on how to or later for low-level access to Matroska files. Instructions on how to
compile them are a bit further down in this file. compile them are a bit further down in this file.
@ -127,8 +127,8 @@ This is optional as MKVToolNix comes with its own set of the
libraries. It will use them if no version is found on the system. libraries. It will use them if no version is found on the system.
Start with the two libraries. Either download releases of Start with the two libraries. Either download releases of
[libEBML 1.3.3](http://dl.matroska.org/downloads/libebml/) and [libEBML 1.3.4](http://dl.matroska.org/downloads/libebml/) and
[libMatroska 1.4.4](http://dl.matroska.org/downloads/libmatroska/) or [libMatroska 1.4.5](http://dl.matroska.org/downloads/libmatroska/) or
get a fresh copy from the git repository: get a fresh copy from the git repository:
git clone https://github.com/Matroska-Org/libebml.git git clone https://github.com/Matroska-Org/libebml.git

4
ac/matroska.m4
View File

@ -3,8 +3,8 @@ dnl Test for libEBML and libMatroska, and define MATROSKA_CFLAGS and MATROSKA_LI
dnl dnl
EBML_MATROSKA_INTERNAL=no EBML_MATROSKA_INTERNAL=no
PKG_CHECK_MODULES([EBML],[libebml >= 1.3.3],[],[EBML_MATROSKA_INTERNAL=yes]) PKG_CHECK_MODULES([EBML],[libebml >= 1.3.4],[],[EBML_MATROSKA_INTERNAL=yes])
PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.4],[],[EBML_MATROSKA_INTERNAL=yes]) PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.5],[],[EBML_MATROSKA_INTERNAL=yes])
if test x"$EBML_MATROSKA_INTERNAL" = xyes; then if test x"$EBML_MATROSKA_INTERNAL" = xyes; then
if ! test -f lib/libebml/ebml/EbmlTypes.h ; then if ! test -f lib/libebml/ebml/EbmlTypes.h ; then