libraries/libebml: Updated for version 1.4.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 30 insertions, 31 deletions

diff --git a/libraries/libebml/0001.patch b/libraries/libebml/0001.patch
new file mode 100644
index 0000000000..3d548edd3b
--- /dev/null
+++ b/libraries/libebml/0001.patch
@@ -0,0 +1,24 @@
+diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp
+index 27e55fd..4c05fcf 100644
+--- a/src/EbmlString.cpp
++++ b/src/EbmlString.cpp
+@@ -34,6 +34,7 @@
+   \author Steve Lhomme     <robux4 @ users.sf.net>
+ */
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlString.h"
+ 
+diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp
+index 496a16a..99fc073 100644
+--- a/src/EbmlUnicodeString.cpp
++++ b/src/EbmlUnicodeString.cpp
+@@ -36,6 +36,7 @@
+ */
+ 
+ #include <cassert>
++#include <limits>
+ 
+ #include "ebml/EbmlUnicodeString.h"
+ 
diff --git a/libraries/libebml/README b/libraries/libebml/README
index 429af8b8e1..c2a9887a6a 100644
--- a/libraries/libebml/README
+++ b/libraries/libebml/README
@@ -1,6 +1,3 @@
 libebml is a C++ libary to parse EBML files. EBML (Extensible Binary 
 Meta-Language library) is a simple XML like binary language for 
 describing data in structured style. 
-
-Interested parties can build static libs by passing STATICLIB=yes to the
-script.
diff --git a/libraries/libebml/libebml.SlackBuild b/libraries/libebml/libebml.SlackBuild
index fee98c6694..393e4afb30 100644
--- a/libraries/libebml/libebml.SlackBuild
+++ b/libraries/libebml/libebml.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=libebml
-VERSION=${VERSION:-1.3.6}
+VERSION=${VERSION:-1.4.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -81,7 +81,7 @@ 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 {} \;
 
-patch -p1 < $CWD/patch.patch
+patch -p1 < $CWD/0001.patch
 
 mkdir -p build
 cd build
@@ -89,6 +89,7 @@ cd build
 cmake \
    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_BUILD_TYPE=Release ..
   
diff --git a/libraries/libebml/libebml.info b/libraries/libebml/libebml.info
index 17ef491720..86106fcc90 100644
--- a/libraries/libebml/libebml.info
+++ b/libraries/libebml/libebml.info
@@ -1,8 +1,8 @@
 PRGNAM="libebml"
-VERSION="1.3.6"
+VERSION="1.4.2"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix/source.html"
-DOWNLOAD="http://dl.matroska.org/downloads/libebml/libebml-1.3.6.tar.xz"
-MD5SUM="3e2bc574bb22582c724ab659652fe0db"
+DOWNLOAD="http://dl.matroska.org/downloads/libebml/libebml-1.4.2.tar.xz"
+MD5SUM="194095f4315334fcedacb4900c59c014"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libebml/patch.patch b/libraries/libebml/patch.patch
deleted file mode 100644
index 3e341d0792..0000000000
--- a/libraries/libebml/patch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e46906b80e7662fb78d305f576412f9fa4a22218 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
-Date: Mon, 23 Apr 2018 12:05:42 +0200
-Subject: [PATCH] EbmlSInteger: Use <limits> instead of <climits>
-
-The former is the proper header to use for std::numerical_limits
----
- src/EbmlSInteger.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/EbmlSInteger.cpp b/src/EbmlSInteger.cpp
-index 33f3637..b930f7d 100644
---- a/src/EbmlSInteger.cpp
-+++ b/src/EbmlSInteger.cpp
-@@ -33,7 +33,7 @@
-   \author Moritz Bunkus <moritz @ bunkus.org>
- */
- #include <cassert>
--#include <climits>
-+#include <limits>
- 
- #include "ebml/EbmlSInteger.h"
-