gentoo resync : 06.04.2022

4 files changed, 32 insertions, 54 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index e619e8d24572..29e61444bc17 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,7 +1,6 @@
-AUX simplescreenrecorder-0.4.2-cmake.patch 968 BLAKE2B d5d750a4ce9520b6c48f6661865d6c18a253d4af00839d42954f690a690d7a3eeadab48c09d5fcc3b391f68cfac31d75606d7e3cc4dad01144804ed7a28c7296 SHA512 6c91ad4faaa9afa3077d6ac12d9e1015ba858a8b2d629d4a1fb9f2a2dd871c2c8126364b10af3cda79fee9c9929b5eb34d98fb674d01f0fb4beed504a4efb646
-DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
 DIST simplescreenrecorder-0.4.3.tar.gz 1918958 BLAKE2B 9d0e07255c7345d8752a8f49fd2e7947db4058c6e6bdbe1239955f96f06543eff24b207bcd049d07eb7d3d5815ad5f1c77721e1fa139f940b1deb3b3da7a46e0 SHA512 c930045d6763bdb026cee80fe82aa0e973de7a1bd92bce9650c5cae627f5d8f8d913f260024410a41170081c8eda61c1aea346bc2d9740b8dc169a3952b3bfd0
-EBUILD simplescreenrecorder-0.4.2.ebuild 2745 BLAKE2B cf20147685ba950c89c5cb20ae81b2d9d42d73010c002662caa3481814f2c2c387095e2e173fd75c67c884a01e92eae24edd61d474a6ef5379c4dab5257a5d88 SHA512 88d683a6185c7b3bc20930eddc1c000ba4521766e543055d5b01a9b7dadabbdf946e2deb0e8f8ac03abfeb0fe86dffb3ec7ceef5be5ba01b9b19ee3b6bc36fb1
+DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525
 EBUILD simplescreenrecorder-0.4.3.ebuild 2804 BLAKE2B a126ce612b02720d487f3cee881bb0def3244f538d14a789ecdab0920e795801a88888f9df5570ca3a0588099cce56e8c93c8d64b78efedfa0c7ad66eb21fa27 SHA512 b9d8e773d680a2bb2f40ce19c0b8781009f8d1734f8f14bc22e891dd8582befb941bc5e358425151b5ed7d51f5c323f3bfef2ff6589a1198f9b97e24dc97a38e
-EBUILD simplescreenrecorder-9999.ebuild 2806 BLAKE2B 3ea243a40385742049abd81cb976d836f497486b8b9c68e816d9844d9920fbb2a94d7e64fb99679397a1e57b9b4473a85efdbb1931bc58ed805dd7c18d5de34b SHA512 c74b87b3bc53b1292cccd416870648bcf76eb6b7ca181a6a7e16e3974235b1823dadfda3dd296a413b00ca6f0afc31c0cd99e6be90324acaf90af6454eb1df6f
+EBUILD simplescreenrecorder-0.4.4.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0
+EBUILD simplescreenrecorder-9999.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0
 MISC metadata.xml 509 BLAKE2B 7a7186a614ad537259b0478e457918c9ed4f06f6e69f3b6c71ddfe31d019cfb44cf9c73171deca2949f7279e6f9baf7100f843beaf8eaac0cc3066ba3ea21e45 SHA512 714073a20e3acb9e903891a96097b5963e8ef01f39c7a98fe1d18b8b3c1f25f525cbd07dcbac05f090948253113182be4813b6336baa297b2d3c99c8b190377e
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch
deleted file mode 100644
index 9f8bc408331e..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.2-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5330a3d65b7877f5f3691c20df35fbb7856d6f38 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:28:15 +0100
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Available since >= Qt-5.3.1 which is well below the current minimum version.
----
- src/translations/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt
-index d9afded..174acea 100644
---- a/src/translations/CMakeLists.txt
-+++ b/src/translations/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # translations for 'simplescreenrecorder' executable
- 
- if(WITH_QT5)
--	find_program(LRELEASE NAMES lrelease-qt5 lrelease)
-+	find_package(Qt5LinguistTools REQUIRED)
-+	set(LRELEASE Qt5::lrelease)
- else()
- 	find_program(LRELEASE NAMES lrelease-qt4 lrelease)
- endif()
--- 
-2.29.2
-
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
index f0ac1589ed52..5c2e985195d7 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
@@ -16,12 +16,12 @@ if [[ ${PV} = 9999 ]] ; then
 	EGIT_BOOTSTRAP=""
 else
 	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PKGNAME}-${PV}"
 fi
 
 SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
+IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/libglvnd[${MULTILIB_USEDEP},X]
 	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
@@ -37,20 +36,22 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
+	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
+	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
 	pulseaudio? ( media-sound/pulseaudio )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug #624480, in git master
+REQUIRED_USE="abi_x86_32? ( opengl )"
 
 pkg_pretend() {
-	if [[ "${ABI}" == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
+	if [[ "${ABI}" == amd64 ]] ; then
+		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		einfo "When added 32bit GLInject libraries are also included. This is"
+		einfo "required if you want to use OpenGL recording on 32bit applications."
+		einfo
 	fi
 
 	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
@@ -77,10 +78,13 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
 		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_OPENGL_RECORDING="$(usex opengl)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
+		-DWITH_GLINJECT="$(usex opengl)"
+		-DWITH_V4L2="$(multilib_native_usex v4l)"
 	)
 
 	if multilib_is_native_abi ; then
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 337ba993d166..5c2e985195d7 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
@@ -21,7 +21,7 @@ else
 fi
 
 SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora v4l vorbis vpx x264"
+IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/libglvnd[${MULTILIB_USEDEP},X]
 	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
@@ -39,17 +38,20 @@ RDEPEND="
 	virtual/glu[${MULTILIB_USEDEP}]
 	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
+	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
 	pulseaudio? ( media-sound/pulseaudio )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
 pkg_pretend() {
-	if [[ "${ABI}" == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
+	if [[ "${ABI}" == amd64 ]] ; then
+		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		einfo "When added 32bit GLInject libraries are also included. This is"
+		einfo "required if you want to use OpenGL recording on 32bit applications."
+		einfo
 	fi
 
 	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
@@ -78,9 +80,10 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
 		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_OPENGL_RECORDING="$(usex opengl)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
+		-DWITH_GLINJECT="$(usex opengl)"
 		-DWITH_V4L2="$(multilib_native_usex v4l)"
 	)