diff options
| author | Jeremy Hansen <jebrhansen+github@gmail.com> | 2022-02-27 03:05:58 -0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-28 15:10:56 +0700 |
| commit | 5c19a1677193df6e8e0b1433a6635f0fd7e876b0 (patch) | |
| tree | ec7d6ab28767bc8f170a62c12f40ec2e14777550 /libraries | |
| parent | e554b735d56f4a07bff38bf68398587a56cad225 (diff) | |
libraries/libmediainfo: Add tfsxml patch
If libmediainfo is compiled with optional tinyxml dep, mediainfo compilation
will fail without this patch. Fix will be included in next release.
https://github.com/MediaArea/MediaInfoLib/pull/1434
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/libmediainfo/libmediainfo.SlackBuild | 4 | ||||
| -rw-r--r-- | libraries/libmediainfo/tfsxml.patch | 33 |
2 files changed, 37 insertions, 0 deletions
diff --git a/libraries/libmediainfo/libmediainfo.SlackBuild b/libraries/libmediainfo/libmediainfo.SlackBuild index 2073def46396..25ece9721971 100644 --- a/libraries/libmediainfo/libmediainfo.SlackBuild +++ b/libraries/libmediainfo/libmediainfo.SlackBuild @@ -85,6 +85,10 @@ 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/tfsxml.patch b/libraries/libmediainfo/tfsxml.patch new file mode 100644 index 000000000000..c7211b5d4c65 --- /dev/null +++ b/libraries/libmediainfo/tfsxml.patch @@ -0,0 +1,33 @@ +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 + |