mkvtoolnix: cherry picked commit for fmt 11 compatibility
This commit is contained in:
parent
758cd0a708
commit
d26e870c2c
@ -1,5 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF39f0NIddrLRKqOIUglG4dxFO2O+JceHTbPbNEyZP/71xWpDQGd1lSqRSzlmVa9C1FHNKD0FwLj8+wo5VH7GelQg=
|
||||
SHA256 (Pkgfile) = 38ec6676906c053c72bac7d25f31c69999d054f3b4cf66a9a784a1e6adea92db
|
||||
RWSagIOpLGJF35HmAFIZgVXN5tY2ikhaBDpYntchxGlb62nkFiEEY2YQpNcUs8ZIXRFiuvY41gD8D6gfhJyGbMkgJCbbWCa3Aws=
|
||||
SHA256 (Pkgfile) = 5320b220dd5ed26c25c7d9d481fdb0a27488a4b45cbad1ecd79fff1b503c0b8b
|
||||
SHA256 (.footprint) = bae97e1f0ab2b9e8ddb6194eff37e00cec42b8d17cef132aae16f25f60782c8d
|
||||
SHA256 (mkvtoolnix-86.0.tar.xz) = 29a9155fbba99f9074de2abcfbdc4e966ea38c16d9f6f547cf2d8d9a48152c97
|
||||
SHA256 (b57dde69dc80b151844e0762a2ae6bca3ba86d95.patch) = 09d6e953db263db44ea70d0c18b9d6ddb993431b223a27d113733036eaca46be
|
||||
|
@ -7,12 +7,14 @@
|
||||
name=mkvtoolnix
|
||||
version=86.0
|
||||
release=1
|
||||
source=(https://mkvtoolnix.download/sources/$name-$version.tar.xz)
|
||||
source=(https://mkvtoolnix.download/sources/$name-$version.tar.xz
|
||||
b57dde69dc80b151844e0762a2ae6bca3ba86d95.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
rm -rf lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml}
|
||||
patch -Np1 -i $SRC/b57dde69dc80b151844e0762a2ae6bca3ba86d95.patch
|
||||
|
||||
./autogen.sh
|
||||
./configure $PKGMK_MKVTOOLNIX \
|
||||
|
28
mkvtoolnix/b57dde69dc80b151844e0762a2ae6bca3ba86d95.patch
Normal file
28
mkvtoolnix/b57dde69dc80b151844e0762a2ae6bca3ba86d95.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From b57dde69dc80b151844e0762a2ae6bca3ba86d95 Mon Sep 17 00:00:00 2001
|
||||
From: Kefu Chai <tchaikov@gmail.com>
|
||||
Date: Mon, 15 Jul 2024 11:10:09 +0800
|
||||
Subject: [PATCH] fix build with fmt v11
|
||||
|
||||
fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
|
||||
include this header for using it.
|
||||
|
||||
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
|
||||
---
|
||||
src/common/common.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/common/common.h b/src/common/common.h
|
||||
index 68a129fab2..b5e0c8a899 100644
|
||||
--- a/src/common/common.h
|
||||
+++ b/src/common/common.h
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include <fmt/format.h>
|
||||
#include <fmt/ostream.h>
|
||||
+#include <fmt/ranges.h>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/multiprecision/cpp_int.hpp>
|
||||
--
|
||||
GitLab
|
||||
|
Loading…
x
Reference in New Issue
Block a user