aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCeleste <20312-Celeste@users.gitlab.alpinelinux.org>2023-10-30 02:44:35 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2023-11-02 07:48:29 +0000
commitbe9946d82fc20a3616e8d99c1e32c4cdcb908316 (patch)
treef635eacd466ee8c75f7fac3769dcd7e0a467aac6
parent746ca9e13e0d1b1a20bba2db68c9eb05a25105ed (diff)
community/mkvtoolnix: upgrade to 80.0
-rw-r--r--community/mkvtoolnix/APKBUILD9
-rw-r--r--community/mkvtoolnix/fix-undefined-reference.patch44
2 files changed, 3 insertions, 50 deletions
diff --git a/community/mkvtoolnix/APKBUILD b/community/mkvtoolnix/APKBUILD
index 60c4c9ea783..eaeea8ebe14 100644
--- a/community/mkvtoolnix/APKBUILD
+++ b/community/mkvtoolnix/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=mkvtoolnix
-pkgver=79.0
+pkgver=80.0
pkgrel=0
pkgdesc="Set of tools to create, edit and inspect Matroska files"
url="https://mkvtoolnix.download/index.html"
@@ -32,9 +32,7 @@ makedepends="
zlib-dev
"
subpackages="$pkgname-doc $pkgname-gui"
-source="https://mkvtoolnix.download/sources/mkvtoolnix-$pkgver.tar.xz
- fix-undefined-reference.patch
- "
+source="https://mkvtoolnix.download/sources/mkvtoolnix-$pkgver.tar.xz"
build() {
export CFLAGS="$CFLAGS -flto=auto"
@@ -69,6 +67,5 @@ gui() {
}
sha512sums="
-ec4d0dc6d7bf9fcc65a6ea464a449b5e4d92c1186ac330b39030e1483f6bf8dc406667c0e7aa495fbb80c689a3a951d3d4885f22cad5d2b178ff1a75828f8e07 mkvtoolnix-79.0.tar.xz
-5b8d6c506072ee31990a49bb442428d704549e3d26375227b99a957a1a22cbb1ac61bf401a2b41e14cb381855e26b7d6c8ef94b54440210858ea30fa53088246 fix-undefined-reference.patch
+066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc mkvtoolnix-80.0.tar.xz
"
diff --git a/community/mkvtoolnix/fix-undefined-reference.patch b/community/mkvtoolnix/fix-undefined-reference.patch
deleted file mode 100644
index 64ac38fc7ab..00000000000
--- a/community/mkvtoolnix/fix-undefined-reference.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Patch-Source: https://gitlab.com/mbunkus/mkvtoolnix/-/commit/b317f8dd6ae4b6a1ac70e56c458063fab7a4e991.patch
---
-From b317f8dd6ae4b6a1ac70e56c458063fab7a4e991 Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus <mo@bunkus.online>
-Date: Sun, 20 Aug 2023 18:28:03 +0200
-Subject: [PATCH] DTS reader: fix linker error wrt. static class member vars
-
-On some compiler versions with some options the previous way seemed to
-cause errors wrt. undefined references. So give the variable a fixed
-place to live.
----
- src/input/r_dts.cpp | 2 ++
- src/input/r_dts.h | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/input/r_dts.cpp b/src/input/r_dts.cpp
-index 5094d9e57..692a9a777 100644
---- a/src/input/r_dts.cpp
-+++ b/src/input/r_dts.cpp
-@@ -25,6 +25,8 @@
- #include "merge/input_x.h"
- #include "output/p_dts.h"
-
-+unsigned int const dts_reader_c::s_buf_size = 128 * 1000;
-+
- bool
- dts_reader_c::probe_file() {
- m_chunks = scan_chunks(*m_in);
-diff --git a/src/input/r_dts.h b/src/input/r_dts.h
-index 69e990062..7db299ad8 100644
---- a/src/input/r_dts.h
-+++ b/src/input/r_dts.h
-@@ -55,7 +55,7 @@ private:
- chunks_t m_chunks;
- chunks_t::const_iterator m_current_chunk;
-
-- static auto const s_buf_size = 128 * 1000;
-+ static unsigned int const s_buf_size;
-
- public:
- dts_reader_c();
---
-GitLab
-