up to 21.09

- upstream patch fixing unresolved symbols when building with system
  tinyxml2
- enable graphviz (with bcond)

diff --git a/libmediainfo.spec b/libmediainfo.spec
index 939948472e784e41ab903ce1f3fd128f96887aaa..44300a975da7db37b2ef43b8fb52daa528a1ed3b 100644 (file)
--- a/libmediainfo.spec
+++ b/libmediainfo.spec
@@ -8,6 +8,7 @@
 # Conditional build:
 %bcond_without curl            # cURL support
 %bcond_without mms             # MMS support
+%bcond_without graphviz        # graphviz support
 %bcond_without apidocs         # API documentation (doxygen generated)
 %bcond_without static_libs     # static library
 
@@ -15,17 +16,19 @@
 Summary:       Supplies technical and tag information about a video or audio file
 Summary(pl.UTF-8):     Informacje techniczne i znaczniki dla plików wideo i dźwiękowych
 Name:          libmediainfo
-Version:       21.03
+Version:       21.09
 Release:       1
 License:       BSD or Apache v2.0+ or LGPL v2.1+ or GPL v2+ or MPL v2.0+
 Group:         Libraries
 Source0:       https://github.com/MediaArea/MediaInfoLib/archive/v%{version}/MediaInfoLib-%{version}.tar.gz
-# Source0-md5: df1cae79f3332505d37e7607b52a6052
+# Source0-md5: 6ef1978110a1bbca86aff7b9e2d2d3d6
+Patch0:                unresolved_tfsxml.patch
 URL:           https://github.com/MediaArea/MediaInfoLib
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11
 %{?with_curl:BuildRequires:    curl-devel}
 BuildRequires: doxygen
+%{?with_graphviz:BuildRequires:        graphviz-devel}
 %{?with_mms:BuildRequires:     libmms-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
@@ -134,6 +137,7 @@ Dokumentacja API biblioteki MediaInfo.
 
 %prep
 %setup -q -n MediaInfoLib-%{version}
+%patch0 -p1
 cp -p Release/ReadMe_DLL_Linux.txt ReadMe.txt
 %{__mv} History_DLL.txt History.txt
 %undos *.txt *.html Source/Doc/*.html
@@ -147,6 +151,7 @@ cd Project/GNU/Library
 %{__automake}
 %configure \
        %{?with_static_libs:--enable-static} \
+       %{?with_graphviz:--with-graphviz} \
        %{?with_curl:--with-libcurl} \
        %{?with_mms:--with-libmms} \
        --with-libtinyxml2

diff --git a/unresolved_tfsxml.patch b/unresolved_tfsxml.patch
new file mode 100644 (file)
index 0000000..4986e1f
--- /dev/null
+++ b/unresolved_tfsxml.patch
@@ -0,0 +1,36 @@
+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 ffa05219..7cf20067 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
+ 
+-- 
+2.33.0
+