gentoo resync : 25.09.2021

3 files changed, 87 insertions, 0 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index dc6944c1e3b9..e1e0313ef428 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,3 +1,5 @@
+AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
 EBUILD qtmultimedia-5.15.2-r1.ebuild 1505 BLAKE2B 7e9049970a904dbec7accd0db053faa8e6755f93296cc3f2a67ab15b28c35814ab31f218abbbe1f21c0be7bbcee6b13731fa962137ca80597517c0088245586d SHA512 fd943e28d689fea3af9cc1dbbb66fc1c5a101201e2b79bf7be72491038c3e5c33b8628c99334d75a7b2714ca7c0b3de76100023d41eca95ceba3af6b3eab9414
+EBUILD qtmultimedia-5.15.2-r2.ebuild 1561 BLAKE2B 56234e911eecafeb404ea2169d4bf5c6d3efed4499b1ff66dcd5cc22a96cec010214c6383fe2b2d7f29abbc44170bd73379371229034cd05543f44330e905194 SHA512 fbfb974306297bedfc281117abe5938423ee618bd4c95eb188696d65eaefef1cf202be988db2060f59f9915d4e52f3fb8ba53a340587e0028eecf24bc9c93db8
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
new file mode 100644
index 000000000000..471bfabcce8e
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.15.2-no-qtopengl.patch
@@ -0,0 +1,14 @@
+Widgets were ported away from QtOpenGL in 5.15.0 but bogus dependency
+remained: https://bugreports.qt.io/browse/QTBUG-81902
+
+--- a/src/multimediawidgets/multimediawidgets.pro
++++ b/src/multimediawidgets/multimediawidgets.pro
+@@ -2,8 +2,6 @@
+ TARGET = QtMultimediaWidgets
+ QT = core gui multimedia widgets-private
+ QT_PRIVATE += multimedia-private
+-qtHaveModule(opengl): \
+-   QT_PRIVATE += opengl
+ 
+ PRIVATE_HEADERS += \
+     qvideowidget_p.h \
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
new file mode 100644
index 000000000000..8148aa4f31be
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	qml? (
+		=dev-qt/qtdeclarative-${QT5_PV}*
+		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+		media-libs/libglvnd
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}