aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorJeremy Hansen <jebrhansen+github@gmail.com>2022-06-23 12:07:36 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-07-02 09:55:39 +0700
commit0d7226aa4213b01802de375f77c39cd41e1c679c (patch)
treefb8f34be96c7dfe1f24e72a25d3f4fd1ed321694 /libraries
parent3c121cdc1a478e373444f111c4dff71a63efacbe (diff)
libraries/libmediainfo: Updated for version 22.06.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libmediainfo/libmediainfo.SlackBuild6
-rw-r--r--libraries/libmediainfo/libmediainfo.info6
-rw-r--r--libraries/libmediainfo/tfsxml.patch33
3 files changed, 4 insertions, 41 deletions
diff --git a/libraries/libmediainfo/libmediainfo.SlackBuild b/libraries/libmediainfo/libmediainfo.SlackBuild
index 25ece97219715..4a3c9877ada4c 100644
--- a/libraries/libmediainfo/libmediainfo.SlackBuild
+++ b/libraries/libmediainfo/libmediainfo.SlackBuild
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libmediainfo
-VERSION=${VERSION:-21.09}
+VERSION=${VERSION:-22.06}
SRCNAM=MediaInfoLib
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -85,10 +85,6 @@ find -L . \
# We do not want to use the builtin libzen
patch -p1 < $CWD/remove-internal-libzen-support.patch
-# Fix tfsxml issue
-# Already fixed upstream, will be in next release
-patch -p1 < $CWD/tfsxml.patch
-
# Autodetect graphviz, libmms, and tinyxml2
if pkg-config --exists libgvc ; then graphviz="--with-graphviz" ; else graphviz="--without-grapviz" ; fi
if pkg-config --exists libmms ; then libmms="--with-libmms" ; else libmms="--without-libmms" ; fi
diff --git a/libraries/libmediainfo/libmediainfo.info b/libraries/libmediainfo/libmediainfo.info
index 470ab27055745..b73295b6991c0 100644
--- a/libraries/libmediainfo/libmediainfo.info
+++ b/libraries/libmediainfo/libmediainfo.info
@@ -1,8 +1,8 @@
PRGNAM="libmediainfo"
-VERSION="21.09"
+VERSION="22.06"
HOMEPAGE="https://mediaarea.net/MediaInfo"
-DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v21.09/MediaInfoLib-21.09.tar.gz"
-MD5SUM="6ef1978110a1bbca86aff7b9e2d2d3d6"
+DOWNLOAD="https://github.com/MediaArea/MediaInfoLib/archive/v22.06/MediaInfoLib-22.06.tar.gz"
+MD5SUM="03ac4b2f1c39d3ce62b048cb0d26b2ae"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libzen"
diff --git a/libraries/libmediainfo/tfsxml.patch b/libraries/libmediainfo/tfsxml.patch
deleted file mode 100644
index c7211b5d4c654..0000000000000
--- a/libraries/libmediainfo/tfsxml.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 038dff8433053aada3e8bf34655e2cec67305c5c Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Wed, 22 Sep 2021 12:10:41 +0200
-Subject: [PATCH] ADM: compile-in tfsxml unconditionally (unrelated to
- tinyxml2)
-
-Fixes unresolved symbols when compiling with system tinyxml2.
----
- Project/GNU/Library/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am
-index ffa05219e..7cf200670 100644
---- a/Project/GNU/Library/Makefile.am
-+++ b/Project/GNU/Library/Makefile.am
-@@ -230,7 +230,8 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
- ../../../Source/MediaInfo/Video/File_Vp8.cpp \
- ../../../Source/MediaInfo/Video/File_Y4m.cpp \
- ../../../Source/MediaInfo/XmlUtils.cpp \
-- ../../../Source/MediaInfo/OutputHelpers.cpp
-+ ../../../Source/MediaInfo/OutputHelpers.cpp \
-+ ../../../Source/ThirdParty/tfsxml/tfsxml.c
-
- @MediaInfoLib_LibName@includedir = $(includedir)/MediaInfo
- @MediaInfoLib_LibName@include_HEADERS = \
-@@ -280,7 +281,6 @@ endif
-
- if COMPILE_TINYXML2
- lib@MediaInfoLib_LibName@_la_SOURCES += \
-- ../../../Source/ThirdParty/tfsxml/tfsxml.c \
- ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp
- endif
-