Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b8e620a06b42a642b6b973e4e9e1de8377e74317)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (b8e620a06b42a642b6b973e4e9e1de8377e74317)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b8e620a06b42a642b6b973e4e9e1de8377e74317)
  • Date: Thu, 1 Jun 2023 11:46:30 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/bmake/DETAILS | 4
devel/bmake/HISTORY | 3
video-libs/libebml/DETAILS | 7 -
video-libs/libebml/HISTORY | 3
video-libs/libmatroska/DETAILS | 7 -
video-libs/libmatroska/HISTORY | 3
video/mkvtoolnix/BUILD | 11 +-
video/mkvtoolnix/DEPENDS | 10 +-
video/mkvtoolnix/DETAILS | 5 -
video/mkvtoolnix/HISTORY | 5 +
video/mkvtoolnix/PRE_BUILD | 3
video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch | 27
++++++
video/mkvtoolnix/patches/0001-fix-format-strings.patch | 45
++++++++++
13 files changed, 113 insertions(+), 20 deletions(-)

New commits:
commit b8e620a06b42a642b6b973e4e9e1de8377e74317
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bmake 20230522

commit bba1912cb59f5fd1678f9910c7b648bd5bae692d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mkvtoolnix: Fix build against fmt 10.x

commit 20c42a5b3d5f0c60788870afeb754a2b7a66f3a5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mkvtoolnix 76.0

commit c2d75d282f5922c290455fa2b82e95e82eab6dc5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libmatroska 1.7.1

commit 9c89608cfc6c25a849b6e92e648940cfb5e8e271
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libebml 1.4.4

diff --git a/devel/bmake/DETAILS b/devel/bmake/DETAILS
index 4007673..d4ce9a6 100755
--- a/devel/bmake/DETAILS
+++ b/devel/bmake/DETAILS
@@ -1,9 +1,9 @@
# Watch: http://ftp.netbsd.org/pub/NetBSD/misc/sjg/
bmake-(20[2-9][0-9]+)[.]tar
SPELL=bmake
- VERSION=20230303
+ VERSION=20230522
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://ftp.netbsd.org/pub/NetBSD/misc/sjg/${SOURCE}
-
SOURCE_HASH=sha512:d4595f3b19eac828de9a3ba6901ae883b147de441dc2707da24187860136ae4fcd4cfa343dcc9f52be3b96abf54b165f9808ae863b3a70fabec051257525994f
+
SOURCE_HASH=sha512:ac64ae60f9992ac9af3666f5d797146fb71a6d6e982339eafbb9e34c5ee0ce085aaafd9e76ec019f1cf1443c0661779b58f950e32eb37a726551a7736c22f32d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://crufty.net/help/sjg/bmake.html";
LICENSE[0]="BSD"
diff --git a/devel/bmake/HISTORY b/devel/bmake/HISTORY
index 6a2b916..3a9e5fc 100644
--- a/devel/bmake/HISTORY
+++ b/devel/bmake/HISTORY
@@ -1,3 +1,6 @@
+2023-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 20230522
+
2023-03-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 20230303

diff --git a/video-libs/libebml/DETAILS b/video-libs/libebml/DETAILS
index 7404a0b..8668a47 100755
--- a/video-libs/libebml/DETAILS
+++ b/video-libs/libebml/DETAILS
@@ -1,7 +1,8 @@
-source $GRIMOIRE/CMAKE_FUNCTIONS
+# Watch: https://dl.matroska.org/downloads/libebml/
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=libebml
- VERSION=1.4.2
-
SOURCE_HASH=sha512:b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
+ VERSION=1.4.4
+
SOURCE_HASH=sha512:24f2bf51cd71f583bdd3bb33dbf20b5adeb8e96345de3abf3014f3ae1b0610c1bd04b802f26b4a1a26f884a696d6accf784bed1510f12538a6664cbd9ae51d6d
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.matroska.org/downloads/$SPELL/$SOURCE
diff --git a/video-libs/libebml/HISTORY b/video-libs/libebml/HISTORY
index 35ca6d6..e8bed18 100644
--- a/video-libs/libebml/HISTORY
+++ b/video-libs/libebml/HISTORY
@@ -1,3 +1,6 @@
+2023-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.4
+
2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2

diff --git a/video-libs/libmatroska/DETAILS b/video-libs/libmatroska/DETAILS
index 842ae5b..9943967 100755
--- a/video-libs/libmatroska/DETAILS
+++ b/video-libs/libmatroska/DETAILS
@@ -1,7 +1,8 @@
-source $GRIMOIRE/CMAKE_FUNCTIONS
+# Watch: https://dl.matroska.org/downloads/libmatroska/
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=libmatroska
- VERSION=1.6.3
-
SOURCE_HASH=sha512:271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
+ VERSION=1.7.1
+
SOURCE_HASH=sha512:a6f38d388f6c9bfe399b9263ba4ef0965cfb4e27b39ac04453d5c9a9db8eac719a04c87b58d88b612902297e17aa7437382a66332f3f5b3d41744a13351751fd
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.matroska.org/downloads/$SPELL/$SOURCE
diff --git a/video-libs/libmatroska/HISTORY b/video-libs/libmatroska/HISTORY
index 9aebfdd..c7f2876 100644
--- a/video-libs/libmatroska/HISTORY
+++ b/video-libs/libmatroska/HISTORY
@@ -1,3 +1,6 @@
+2023-06-01 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.1
+
2021-03-13 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: added check for libebml version

diff --git a/video/mkvtoolnix/BUILD b/video/mkvtoolnix/BUILD
index 73c4d58..abac687 100755
--- a/video/mkvtoolnix/BUILD
+++ b/video/mkvtoolnix/BUILD
@@ -1,10 +1,9 @@
+. "$GRIMOIRE"/FUNCTIONS
# This seems wrong. Don't we have a standard thing for qtbase-dependent
stuff?
-if is_depends_enabled $SPELL qtbase; then
- . ${GRIMOIRE}/FUNCTIONS
- export PKG_CONFIG_PATH=$QT5BASE/lib/pkgconfig:$PKG_CONFIG_PATH
- OPTS="$OPTS --with-moc=$QT5BASE/bin/moc"
- OPTS="$OPTS --with-uic=$QT5BASE/bin/uic"
- OPTS="$OPTS --with-rcc=$QT5BASE/bin/rcc"
+if is_depends_enabled $SPELL qt6base; then
+ export
PKG_CONFIG_PATH="$QT6DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+elif is_depends_enabled $SPELL qtbase; then
+ export
PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
fi &&
default_build_configure &&
rake
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index 63b2537..4b07036 100755
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -15,11 +15,13 @@ sub_depends boost REGEX &&
sub_depends boost SYSTEM &&
sub_depends boost DATE_TIME &&

-optional_depends qtbase --{en,dis}able-qt \
- "for Qt mkvinfo and mmg gui" &&
+optional_depends qt6base --{en,dis}able-qt6 \
+ "for Qt 6 mvkinfo and mmg gui" &&
+if ! is_depends_enabled "$SPELL" qt6base; then
+ optional_depends qtbase --{en,dis}able-qt5 \
+ "for Qt 5 mkvinfo and mmg gui"
+fi &&
optional_depends flac --with{,out}-flac \
"for FLAC support" &&
-optional_depends file --{en,dis}able-magic \
- 'for automatic content type detection' &&
optional_depends GETTEXT --with{,out}-gettext \
'for gettext support'
diff --git a/video/mkvtoolnix/DETAILS b/video/mkvtoolnix/DETAILS
index 58f81ad..376313e 100755
--- a/video/mkvtoolnix/DETAILS
+++ b/video/mkvtoolnix/DETAILS
@@ -1,10 +1,11 @@
+# Watch: https://mkvtoolnix.download/sources/
SPELL=mkvtoolnix
- VERSION=9.9.0
+ VERSION=76.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://mkvtoolnix.download/sources/$SOURCE
WEB_SITE=http://www.bunkus.org/videotools/mkvtoolnix/
-
SOURCE_HASH=sha512:a00162abd75cf7d34ec14555da4fd80e114473e2a34323f9e1404c807e312ebdc516614643c02e5c22be0e3927e0c3f9ab7ad043d24dc5fd7176cf0719503484
+
SOURCE_HASH=sha512:7be054bd5b4772e8744db358b5147d922ab46c723803b718d3eda4871f75ad69953a0a4b73f4678048702c7b711a6f9dc87156b5dc2e4f9dc588667eae03d185
LICENSE[0]=GPL
ENTERED=20030520
KEYWORDS="video"
diff --git a/video/mkvtoolnix/HISTORY b/video/mkvtoolnix/HISTORY
index ec329e9..73be1ca 100644
--- a/video/mkvtoolnix/HISTORY
+++ b/video/mkvtoolnix/HISTORY
@@ -1,3 +1,8 @@
+2023-05-31 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: updated spell to 76.0
+ * PRE_BUILD, patches/0001-fix-compilation-with-fmt-10.0.0.patch,
+ patches/0001-fix-format-strings.patch: fixed build against fmt 10.x
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/video/mkvtoolnix/PRE_BUILD b/video/mkvtoolnix/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/video/mkvtoolnix/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
b/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
new file mode 100644
index 0000000..2c240ed
--- /dev/null
+++ b/video/mkvtoolnix/patches/0001-fix-compilation-with-fmt-10.0.0.patch
@@ -0,0 +1,27 @@
+From 24716ce95bf5b10d685611de23489045cf2ca5cc Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo AT bunkus.online>
+Date: Sat, 13 May 2023 22:25:34 +0200
+Subject: [PATCH] fix compilation with fmt 10.0.0
+
+Upstream-Status: Backport
+Origin: Upstream
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/common/codec.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/common/codec.h b/src/common/codec.h
+index f8bc1b4e3..f4a92c322 100644
+--- a/src/common/codec.h
++++ b/src/common/codec.h
+@@ -231,3 +231,7 @@ operator <<(std::ostream &out,
+
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<codec_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--
+GitLab
+
diff --git a/video/mkvtoolnix/patches/0001-fix-format-strings.patch
b/video/mkvtoolnix/patches/0001-fix-format-strings.patch
new file mode 100644
index 0000000..d7775c3
--- /dev/null
+++ b/video/mkvtoolnix/patches/0001-fix-format-strings.patch
@@ -0,0 +1,45 @@
+From 5a0a3502d496a1a0d0881dd001bcf5888c6f88a9 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <mo AT bunkus.online>
+Date: Tue, 23 May 2023 14:28:54 +0200
+Subject: [PATCH] fix format strings
+
+Fixes #3548.
+Upstream-Status: Backport
+Origin: Upstream
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/common/ac3.cpp | 2 +-
+ src/merge/cluster_helper.cpp | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/ac3.cpp b/src/common/ac3.cpp
+index c392d2ddd..07de6b463 100644
+--- a/src/common/ac3.cpp
++++ b/src/common/ac3.cpp
+@@ -381,7 +381,7 @@ frame_c::to_string(bool verbose)
+ get_effective_channel_layout());
+
+ for (auto &frame : m_dependent_frames)
+- output += fmt::format(" { {0} }", frame.to_string(verbose));
++ output += fmt::format(" {{ {0} }}", frame.to_string(verbose));
+
+ return output;
+ }
+diff --git a/src/merge/cluster_helper.cpp b/src/merge/cluster_helper.cpp
+index e47651c2c..105db4c34 100644
+--- a/src/merge/cluster_helper.cpp
++++ b/src/merge/cluster_helper.cpp
+@@ -115,8 +115,8 @@
cluster_helper_c::render_before_adding_if_necessary(packet_cptr const
&packet) {
+ timestamp_delay = (int64_t)(timestamp_delay / g_timestamp_scale);
+
+ mxdebug_if(m->debug_packets,
+- fmt::format("cluster_helper_c::add_packet(): new packet {
source {0}/{1} "
+- "timestamp: {2} duration: {3} bref: {4} fref: {5}
assigned_timestamp: {6} timestamp_delay: {7} }\n",
++ fmt::format("cluster_helper_c::add_packet(): new packet {{
source {0}/{1} "
++ "timestamp: {2} duration: {3} bref: {4} fref: {5}
assigned_timestamp: {6} timestamp_delay: {7} }}\n",
+ packet->source->m_ti.m_id,
packet->source->m_ti.m_fname, packet->timestamp, packet->duration,
+ packet->bref, packet->fref,
packet->assigned_timestamp,
mtx::string::format_timestamp(timestamp_delay)));
+
+--
+GitLab
+


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b8e620a06b42a642b6b973e4e9e1de8377e74317), Ismael Luceno, 06/01/2023

Archive powered by MHonArc 2.6.24.

Top of Page