gentoo resync : 04.01.2022

3 files changed, 120 insertions, 0 deletions

diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 80e5d8b40ab9..65cb5c3e6769 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,4 +1,7 @@
 AUX libmediainfo-20.09-pkgconfig.patch 229 BLAKE2B 98a35093f464be14204ab1f722eb6a0a227cc8224f325227c05b19233723c03c1aae4b13c7f57293c7a75052c7e0f9110a01b5d144e2d1056c1c9f36f6533b96 SHA512 809af5bb16d558504b7abcbab7012101f5723fe08e0020fe4d91b558c04941a943384d5be8e076d672ba62e31aaeb0ae2fafd6fb2d31c7072939dd940feab12a
+AUX libmediainfo-21.09-link-fix.patch 1209 BLAKE2B d9e6662f594cca7166f01334e431bab0ceb51055d021ee918a3d63648fbd72fd01e9a2f192b77e57d99a36f16e60193d944d0d9e5c3f0f881441d6e774520ba4 SHA512 123362d1f8db82cb4954091c3929b488d808e150fc022ad05bb86517fa53ec1fd8e05d505d7376960f21f60c7aa1768c5eb690349cae391dd8a0a76cda041d5a
 DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
+DIST libmediainfo_21.09.tar.xz 1850688 BLAKE2B ac6b32a23a82f0c5f0901ef9b6a22b850a59efab80952fcc7cbcbd28951a43d0abb7065ca19adde4715e06f1798ac2992e3f3e82c16c9cf152ff95c42f15b27d SHA512 a0b5ea9c6fce3f5551176d411b8c227927f579c3f09442316f6c380926acc545ea346e044f808b66403b1f0aac6f88ed4413c8231e792256d3cd7676133ef3be
 EBUILD libmediainfo-20.09-r1.ebuild 1795 BLAKE2B ebc2af15dffb2639a0074e57e0f0c822e7931fa85170412b919dd5ba36924cb971a1c337e80402eb97766537a1d2c389c22ef0e9ec4c9be7693af377c65afe68 SHA512 2df425e3944cd74d61f4eaa0b0e189ff58b78595052472fdac0532c73b736563f96dd551cbfbea07b2b26376bcd104c6309dbef9427d3cd961665152cae9ac75
+EBUILD libmediainfo-21.09.ebuild 1834 BLAKE2B 5e05537b31d6a3b62c18096495c16daa94576e73b5eca52e9fd2086de5c97570e48c37c47f74d15cdd3778f0634b71d58d41f9a5b05dda35cc3836e6a87af1c0 SHA512 aeeb6b3bb76a069b8456c634fc67f298a36cc8e658291a6ac6c9cb2708e1c6bad8a0fd449f52a630db77b30784911fd668f1071172e75b64939d749e44bbf600
 MISC metadata.xml 347 BLAKE2B 66f84361f792efe1817c3427292038fd8dc244aea4263c2e2b571b7c5adfc9bd3fd4801cfc3154512a1892590f91c8248f603273d3e1c8d241285a7d863871fb SHA512 b33309009eb8ce3104f5995a4baf050ffe93d53e5a9e422e58abdfbc5c3c4c32406b126b9e1d0421656a73ed42ee662a1b5cec052f73e85ce16d4d278669b607
diff --git a/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch b/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch
new file mode 100644
index 000000000000..2b87839a762b
--- /dev/null
+++ b/media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch
@@ -0,0 +1,29 @@
+https://github.com/MediaArea/MediaInfoLib/pull/1434
+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1823029.html
+
+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.
+--- a/Makefile.am
++++ b/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
+ 
diff --git a/media-libs/libmediainfo/libmediainfo-21.09.ebuild b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
new file mode 100644
index 000000000000..d3f8394fc420
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-21.09.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with media-video/mediainfo!
+
+MY_PN="MediaInfo"
+inherit autotools edos2unix flag-o-matic
+
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms"
+
+# Tests try to fetch data from online sources
+RESTRICT="test"
+
+RDEPEND="dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-link-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i 's:-O2::' configure.ac || die
+
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		--disable-staticlibs \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}