From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2123B158086 for ; Sun, 2 Jan 2022 06:16:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 140342BC08A; Sun, 2 Jan 2022 06:16:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 324FD2BC111 for ; Sun, 2 Jan 2022 06:16:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49AAF342C51 for ; Sun, 2 Jan 2022 06:16:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C41E239 for ; Sun, 2 Jan 2022 06:16:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1641104151.9e24798c7cb22306b5c806bd3eb444047c891af5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmediainfo/files/, media-libs/libmediainfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libmediainfo/Manifest media-libs/libmediainfo/files/libmediainfo-21.09-link-fix.patch media-libs/libmediainfo/libmediainfo-21.09.ebuild X-VCS-Directories: media-libs/libmediainfo/ media-libs/libmediainfo/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e24798c7cb22306b5c806bd3eb444047c891af5 X-VCS-Branch: master Date: Sun, 2 Jan 2022 06:16:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd705553-19b6-4375-87dc-2243f04ff2a5 X-Archives-Hash: 9f01d55df13f63c05d2fbd21c6d90ca6 commit: 9e24798c7cb22306b5c806bd3eb444047c891af5 Author: Sam James gentoo org> AuthorDate: Sun Jan 2 06:03:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 2 06:15:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e24798c media-libs/libmediainfo: add 21.09 Bug: https://bugs.gentoo.org/778992 Closes: https://bugs.gentoo.org/794925 Signed-off-by: Sam James gentoo.org> media-libs/libmediainfo/Manifest | 1 + .../files/libmediainfo-21.09-link-fix.patch | 29 +++++++ media-libs/libmediainfo/libmediainfo-21.09.ebuild | 88 ++++++++++++++++++++++ 3 files changed, 118 insertions(+) diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest index 0e07fe11b3c0..b6292ef46270 100644 --- a/media-libs/libmediainfo/Manifest +++ b/media-libs/libmediainfo/Manifest @@ -1 +1,2 @@ DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354 +DIST libmediainfo_21.09.tar.xz 1850688 BLAKE2B ac6b32a23a82f0c5f0901ef9b6a22b850a59efab80952fcc7cbcbd28951a43d0abb7065ca19adde4715e06f1798ac2992e3f3e82c16c9cf152ff95c42f15b27d SHA512 a0b5ea9c6fce3f5551176d411b8c227927f579c3f09442316f6c380926acc545ea346e044f808b66403b1f0aac6f88ed4413c8231e792256d3cd7676133ef3be 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 +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 +}