From 493cda8dd181e1e9f037198d39c219843e80bd87 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Fri, 1 Sep 2017 09:39:28 +0200
Subject: [PATCH] configure, README, NEWS: fix requirements for libEBML and
 libMatroska

Fixes #2088.
---
 NEWS.md        | 8 ++++++++
 README.md      | 8 ++++----
 ac/matroska.m4 | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 67ec6ab34..44cc2526e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -14,6 +14,14 @@
 * mkvmerge: AVC/h.264 ES parser: only non-key frames that have the NALU header
   field `nal_ref_idc` set to 0 will be marked as "discardable" in
   `SimpleBlock` elements. Other half of the fix for #2047.
+* configure: the checks for libEBML and libMatroska have been fixed to require
+  libEBML 1.3.5 and libMatroska 1.4.7 as intended.
+
+## Build system changes
+
+* libEBML v1.3.5 and libMatroska v1.4.7 are now required. In fact v15.0.0
+  already requires both but did not include proper version checks for them
+  (nor was there a NEWS.md entry for the new libMatroska requirement).
 
 
 # Version 15.0.0 "Duel with the Devil" 2017-08-19
diff --git a/README.md b/README.md
index 8a733304a..9813f8ae9 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,8 @@ programs and libraries you absolutely need are:
   needed, too. For GCC this means at least v4.9.x; for clang v3.4 or
   later.
 
-- [libEBML v1.3.4](http://dl.matroska.org/downloads/libebml/) or later
-  and [libMatroska v1.4.5](http://dl.matroska.org/downloads/libmatroska/)
+- [libEBML v1.3.5](http://dl.matroska.org/downloads/libebml/) or later
+  and [libMatroska v1.4.7](http://dl.matroska.org/downloads/libmatroska/)
   or later for low-level access to Matroska files. Instructions on how to
   compile them are a bit further down in this file.
 
@@ -131,8 +131,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.
 
 Start with the two libraries. Either download releases of
-[libEBML 1.3.4](http://dl.matroska.org/downloads/libebml/) and
-[libMatroska 1.4.5](http://dl.matroska.org/downloads/libmatroska/) or
+[libEBML v1.3.5](http://dl.matroska.org/downloads/libebml/) and
+[libMatroska v1.4.7](http://dl.matroska.org/downloads/libmatroska/) or
 get a fresh copy from the git repository:
 
     git clone https://github.com/Matroska-Org/libebml.git
diff --git a/ac/matroska.m4 b/ac/matroska.m4
index 546e6d18a..8f6c7d7f3 100644
--- a/ac/matroska.m4
+++ b/ac/matroska.m4
@@ -4,7 +4,7 @@ dnl
 
 EBML_MATROSKA_INTERNAL=no
 PKG_CHECK_MODULES([EBML],[libebml >= 1.3.5],[],[EBML_MATROSKA_INTERNAL=yes])
-PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.5],[],[EBML_MATROSKA_INTERNAL=yes])
+PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.7],[],[EBML_MATROSKA_INTERNAL=yes])
 
 if test x"$EBML_MATROSKA_INTERNAL" = xyes; then
   if ! test -f lib/libebml/ebml/EbmlTypes.h ; then