libebml: update to 1.4.4

Remove upstream patch commit
436095bc14
This commit is contained in:
Biswapriyo Nath
2022-10-15 13:09:32 +05:30
parent f81fb2818d
commit be7f933f3b
2 changed files with 13 additions and 52 deletions

View File

@@ -1,35 +0,0 @@
From f0bfd53647961e799a43d918c46cf3b6bff89806 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Sat, 27 Feb 2021 20:36:52 +0100
Subject: [PATCH] include appropriate header files for std::numeric_limits
Fixes #80.
---
src/EbmlString.cpp | 1 +
src/EbmlUnicodeString.cpp | 1 +
3 files changed, 6 insertions(+)
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"

View File

@@ -3,8 +3,8 @@
_realname=libebml
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.4.2
pkgrel=2
pkgver=1.4.4
pkgrel=1
pkgdesc="Extensible Binary Meta Language library (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -17,17 +17,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-cc")
options=('staticlibs')
source=("https://dl.matroska.org/downloads/${_realname}/${_realname}-${pkgver}.tar.xz"
002-mingw-versioned-dll.patch
003-include-appropriate-header-files-for-numeric_limits.patch)
sha256sums=('41c7237ce05828fb220f62086018b080af4db4bb142f31bec0022c925889b9f2'
'b9697c3c8cba108cc76df6d943c51c4b2bc30092bd5fd6c60e8beff641361a71'
'1ec238f0a2cc563371be4f9b15ca844cf4ea477e4fd92c3a4d093b08cd794b50')
002-mingw-versioned-dll.patch)
sha256sums=('82dc5f83356cc9340aee76ed7512210b3a4edf5f346bc9c2c7044f55052687a7'
'b9697c3c8cba108cc76df6d943c51c4b2bc30092bd5fd6c60e8beff641361a71')
prepare() {
cd ${srcdir}/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/002-mingw-versioned-dll.patch
# Fix build with GCC 11
patch -p1 -i ${srcdir}/003-include-appropriate-header-files-for-numeric_limits.patch
}
build() {
@@ -37,8 +33,8 @@ build() {
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
[[ -d ${srcdir}/static-${MINGW_CHOST} ]] && rm -rf ${srcdir}/static-${MINGW_CHOST}
mkdir -p ${srcdir}/static-${MINGW_CHOST} && cd ${srcdir}/static-${MINGW_CHOST}
[[ -d ${srcdir}/build-${MSYSTEM}-static ]] && rm -rf ${srcdir}/build-${MSYSTEM}-static
mkdir -p ${srcdir}/build-${MSYSTEM}-static && cd ${srcdir}/build-${MSYSTEM}-static
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
${MINGW_PREFIX}/bin/cmake.exe \
@@ -50,8 +46,8 @@ build() {
${MINGW_PREFIX}/bin/cmake.exe --build ./
[[ -d ${srcdir}/shared-${MINGW_CHOST} ]] && rm -rf ${srcdir}/shared-${MINGW_CHOST}
mkdir -p ${srcdir}/shared-${MINGW_CHOST} && cd ${srcdir}/shared-${MINGW_CHOST}
[[ -d ${srcdir}/build-${MSYSTEM}-shared ]] && rm -rf ${srcdir}/build-${MSYSTEM}-shared
mkdir -p ${srcdir}/build-${MSYSTEM}-shared && cd ${srcdir}/build-${MSYSTEM}-shared
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
${MINGW_PREFIX}/bin/cmake.exe \
@@ -65,11 +61,11 @@ build() {
}
package() {
cd "${srcdir}/static-${MINGW_CHOST}"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
cd "${srcdir}/build-${MSYSTEM}-static"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
cd "${srcdir}/shared-${MINGW_CHOST}"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
cd "${srcdir}/build-${MSYSTEM}-shared"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.LGPL ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.LGPL
}