aboutsummaryrefslogtreecommitdiff
path: root/libraries/libebml
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libebml')
-rw-r--r--libraries/libebml/libebml.SlackBuild32
-rw-r--r--libraries/libebml/libebml.info6
-rw-r--r--libraries/libebml/patch.patch23
3 files changed, 40 insertions, 21 deletions
diff --git a/libraries/libebml/libebml.SlackBuild b/libraries/libebml/libebml.SlackBuild
index a498838461668..1af1d755aacb0 100644
--- a/libraries/libebml/libebml.SlackBuild
+++ b/libraries/libebml/libebml.SlackBuild
@@ -25,12 +25,10 @@
# Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
PRGNAM=libebml
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.3.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-STATICLIB=${STATICLIB:-no}
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
@@ -73,23 +71,21 @@ 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 {} \;
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --build=$ARCH-slackware-linux \
- --enable-static=${STATICLIB}
-
+patch -p1 < $CWD/patch.patch
+
+mkdir -p build
+cd build
+
+cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release ..
+
make
-make install DESTDIR=$PKG
+make install/strip DESTDIR=$PKG
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd ..
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a ChangeLog LICENSE.LGPL $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/libebml/libebml.info b/libraries/libebml/libebml.info
index 563f3c2361d97..17ef4917200fd 100644
--- a/libraries/libebml/libebml.info
+++ b/libraries/libebml/libebml.info
@@ -1,8 +1,8 @@
PRGNAM="libebml"
-VERSION="1.3.5"
+VERSION="1.3.6"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix/source.html"
-DOWNLOAD="http://dl.matroska.org/downloads/libebml/libebml-1.3.5.tar.xz"
-MD5SUM="f1e8c8e4664abb9f51483ff95019eeed"
+DOWNLOAD="http://dl.matroska.org/downloads/libebml/libebml-1.3.6.tar.xz"
+MD5SUM="3e2bc574bb22582c724ab659652fe0db"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libebml/patch.patch b/libraries/libebml/patch.patch
new file mode 100644
index 0000000000000..3e341d0792061
--- /dev/null
+++ b/libraries/libebml/patch.patch
@@ -0,0 +1,23 @@
+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"
+