gentoo resync : 29.01.2021

3 files changed, 69 insertions, 3 deletions

diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index 14b96e24ec34..7ab3bea9344c 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,4 +1,5 @@
-AUX 1.4.0-x32.diff 755 BLAKE2B 87ec22ce9c53c49788b12f82797f876e207c07dec95a7229a4117cb9bf8b5be988e98b78dc13f7d62079c43ce0d5a6ecf894590ee6dad2f2071541a43b221411 SHA512 c143704ef537a1a151a7778f84c51ca2e098648c7c50f8c17ed0e2ee625acdfa95d9d3462ebd1323fe1be1fa4b72524c219becab320bdb9f2eaa06ad2744d581
+AUX 1.4.0-x32.diff 759 BLAKE2B f122756759da4cb2a122ff702b688c63bf878801e75080d0482bd8583a935448bee42fe00f50bbd99679e5cc5a3e96b01854dad2882a12a64432782b368750c6 SHA512 4c4408ec7d42e81f4e5913ec4d97cc88290a3729d5990910f0c7d2a86da511cd496bd20574f340ff8786e533f09687c0788ba790746cba56a43403e11b638a3f
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
 EBUILD gavl-1.4.0-r1.ebuild 1090 BLAKE2B 09ecaa97c26e2fd046c6cb35eabcffa67f768977409e57c13103e452964afaaf20125689006a766f507af0ca3fd7d57624492de492a7a531624ca5236608d5f7 SHA512 33408ccd8f78d4e2c4d6dfbfda3fbd350bdc65ad5ab5836feb7cad9453ce51fd20b4c5ce8669bb5c040f5951eb7fd9157012dccd8ee853414f7859896fb979ba
+EBUILD gavl-1.4.0-r2.ebuild 1365 BLAKE2B 8ca3082c11cf88f7aca766ba98fcd0f6920e3e7a21d501a5c80aa01fae03102bdb6b76ea760ad41d90f489a15811e9c7b80fb1d52f5d3f9d49996e4bd0989046 SHA512 1d09dbfb300546447139d8e130704a107b973339c25b9b9bd3204196b43cd84b87871e2b683e4634255d2eb692acd09255fec7ba0fac1ef69bd2f67d5dfd4bfa
 MISC metadata.xml 300 BLAKE2B f5a360e6d1615f750c91512bcb7ddeefd0e0e43c7f682931fecda80e3ba489175786e759d5566077248efe3a2f45d6f8da4277fd97b886e6a4421390ed06dea7 SHA512 d7d3c4fda38db5a9b9496c557891d6c9f620d614a2d17b166b21426356d0c431c484c25909db20d619ff43d948b67719a240245254d89ff03447be53ada09ead
diff --git a/media-libs/gavl/files/1.4.0-x32.diff b/media-libs/gavl/files/1.4.0-x32.diff
index 4b510a550699..5c742779cdbb 100644
--- a/media-libs/gavl/files/1.4.0-x32.diff
+++ b/media-libs/gavl/files/1.4.0-x32.diff
@@ -6,8 +6,8 @@ r4209 | gmerlin | 2014-06-02 16:38:33 +0200 (Mon, 02 Jun 2014) | 2 lines
 
 Index: gavl/cputest.c
 ===================================================================
---- gavl/cputest.c	(revision 4208)
-+++ gavl/cputest.c	(revision 4209)
+--- a/gavl/cputest.c	(revision 4208)
++++ b/gavl/cputest.c	(revision 4209)
 @@ -69,6 +69,8 @@
       int rval = 0;
      int eax, ebx, ecx, edx;
diff --git a/media-libs/gavl/gavl-1.4.0-r2.ebuild b/media-libs/gavl/gavl-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..c314b13cff40
--- /dev/null
+++ b/media-libs/gavl/gavl-1.4.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for handling uncompressed audio and video data"
+HOMEPAGE="http://gmerlin.sourceforge.net"
+SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${PV}-x32.diff" )
+
+src_prepare() {
+	default
+
+	# AC_CONFIG_HEADERS, bug #467736
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:-mfpmath=387::g' \
+		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
+		-e '/LDFLAGS=/d' \
+		configure.ac || die
+
+	export AT_M4DIR="m4"
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# --disable-libpng because it's only used for tests
+	local myeconfargs=(
+		--without-doxygen # does nothing.
+		--disable-libpng
+		--disable-static
+		--without-cpuflags
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r apiref/.
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}