gentoo resync : 15.01.2020

3 files changed, 78 insertions, 0 deletions

diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index e05d3ea98fc4..5730839d13bf 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -1,7 +1,9 @@
 AUX qtav-1.12.0-ffmpeg4-1.patch 1225 BLAKE2B 392c7290067aef2132e7024e268af250221b4138942c882b3c6955616f66561a067520f389731b53cc689e96cbbd43d1294a25efcdb4bdd61275f5d067a92014 SHA512 a46d37f00f92860d0b4e9d7c0bb2ec2aabf9517b39876b0ade58081955005eb8be7b4c18d16abcdaf98441c6179924b0bd1974041ede04467e7b7f5953a4fe8b
 AUX qtav-1.12.0-ffmpeg4-2.patch 5467 BLAKE2B b638548b1b66aeef0d10f381a2484528c93be1b14e6eb1099c36b77d9667ae4c20dd69279ba7e182da95be1e76048edac3e221f7a545563b2fe860d58814e0a0 SHA512 cc1c57444cae170498e2eff713c68106e3b829db3334f40a63530466a7a8c92532b41ee47a58e10676b8515929e6d3b5b1865c7842e3eaa676d7f89d820137c8
 AUX qtav-1.12.0-multilib.patch 716 BLAKE2B 4cb5518cb14e91963e5371eafdf3f02452fb32add562a54e9d5eb17d3da603e6bdbcf2544ef60667390de0a44475d9b0457c8664f40b982162a569846b511adf SHA512 0b9db739ab6b4a23d653de56d993f44a6e8d108df3a635a2ebc822bdcc2ac1006643f31ceda8a94626a84aa8556b45ab5aa72aec20d990cf09e7396191bac3bb
+AUX qtav-1.12.0-qt5.14.patch 443 BLAKE2B 80f2e2da6ef67cdd300257aba988dcdcb0a6a5215b806c862cf0a7d2fba7652aae27f5aa568f0bfbb1067b768be4c4d1a1458dab3e468cb7f55a1938e1c63b81 SHA512 1976e312bad83d0493be3af8652d537cca8905a1559d6dd021e4a3c234ac3e65e5743db6f2ac28bfd69ef8c2e0021b7d2144c8a4efea72dcc718bfc53e6d2370
 DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
 DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
+EBUILD qtav-1.12.0-r1.ebuild 1468 BLAKE2B 916ed84118e1164614ffaff4e5f4c755227f295f6618ea0a9bb6a145b6c5a31fdf168bdbf75dc79fdfd5aa4146cac4426508740a060b347110f546a0c08c319e SHA512 37daa499a74172264e47a7f9eeaf8a27898472eea56270dccdb2f89d0e0682c74f3156812190d6583ab7d7d3c46b6720fe12e075e7708b081409da447c9bf5c7
 EBUILD qtav-1.12.0.ebuild 1452 BLAKE2B 9002c43be94e25f31e50f8ad5d081cc6cbc824c245d84fe4fe843f2d8a21484c904b64f07b0d236a9f5d9aba18989e233d555f70d000547bc6a7f570411e6d5f SHA512 4c176409df4009c3b73d2461f738e8c7808906671b4628edebe598662631766b26a776cabec06104e6b3359c2c302a2a0ff7670dec8e1c438a1cc7f82f397ac1
 MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
diff --git a/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
new file mode 100644
index 000000000000..bf546c9e068d
--- /dev/null
+++ b/media-libs/qtav/files/qtav-1.12.0-qt5.14.patch
@@ -0,0 +1,12 @@
+diff -ub -purN -x '*~' a/qml/SGVideoNode.cpp b/qml/SGVideoNode.cpp
+--- a/qml/SGVideoNode.cpp	2017-06-21 03:47:15.000000000 +0200
++++ b/qml/SGVideoNode.cpp	2020-01-07 05:37:05.304897727 +0100
+@@ -25,6 +25,8 @@
+ #include "QtAV/VideoFrame.h"
+ #include <QtCore/QScopedPointer>
+ #include <QtGui/QOpenGLFunctions>
++#include <QtQuick/QSGMaterialType>
++#include <QtQuick/QSGMaterial>
+ #include <QtQuick/QSGMaterialShader>
+ 
+ // all in QSGRenderThread
diff --git a/media-libs/qtav/qtav-1.12.0-r1.ebuild b/media-libs/qtav/qtav-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..cac2cb204608
--- /dev/null
+++ b/media-libs/qtav/qtav-1.12.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="QtAV"
+CAPI_HASH="b43aa93"
+inherit cmake
+
+DESCRIPTION="Multimedia playback framework based on Qt + FFmpeg"
+HOMEPAGE="https://www.qtav.org"
+SRC_URI="https://github.com/wang-bin/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="gui libav opengl portaudio pulseaudio vaapi"
+REQUIRED_USE="gui? ( opengl )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	gui? ( dev-qt/qtsql:5 )
+	libav? (
+		media-video/libav:=
+		x11-libs/libX11
+	)
+	!libav? ( media-video/ffmpeg:= )
+	opengl? ( dev-qt/qtopengl:5 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-ffmpeg4-{1,2}.patch # bugs 660852, 670765
+	"${FILESDIR}"/${P}-qt5.14.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	cp "${WORKDIR}/${P}-capi.h-${CAPI_HASH}" contrib/capi/capi.h \
+		|| die "Failed to add missing header"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_PLAYERS=$(usex gui)
+		-DBUILD_QT5OPENGL=$(usex opengl)
+		-DHAVE_PORTAUDIO=$(usex portaudio)
+		-DHAVE_PULSE=$(usex pulseaudio)
+		-DHAVE_VAAPI=$(usex vaapi)
+	)
+
+	cmake_src_configure
+}