commit dea4038694a4cb1d371cb0847a7d35aa94f0e76e
Author: Jan Palus <[email protected]>
Date: Thu Apr 7 19:12:59 2022 +0200
up to 22.03
libmediainfo.spec | 6 ++----
unresolved_tfsxml.patch | 36 ------------------------------------
2 files changed, 2 insertions(+), 40 deletions(-)
---
diff --git a/libmediainfo.spec b/libmediainfo.spec
index 44300a9..4c3f7c8 100644
--- a/libmediainfo.spec
+++ b/libmediainfo.spec
@@ -16,13 +16,12 @@
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.09
+Version: 22.03
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: 6ef1978110a1bbca86aff7b9e2d2d3d6
-Patch0: unresolved_tfsxml.patch
+# Source0-md5: 07cc1c8a62942946015c2069079a8593
URL: https://github.com/MediaArea/MediaInfoLib
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.11
@@ -137,7 +136,6 @@ 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
diff --git a/unresolved_tfsxml.patch b/unresolved_tfsxml.patch
deleted file mode 100644
index 4986e1f..0000000
--- a/unresolved_tfsxml.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 038dff8433053aada3e8bf34655e2cec67305c5c Mon Sep 17 00:00:00 2001
-From: Jan Palus <[email protected]>
-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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmediainfo.git/commitdiff/597b1c79d65538b289e6a9f767019f05c63ec7f4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
