gentoo new year resync : 01.01.2021

4 files changed, 111 insertions, 4 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index d8b2ccecadfa..b91811b4d89f 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,5 +1,7 @@
 AUX simplescreenrecorder-0.4.2-cmake.patch 968 BLAKE2B d5d750a4ce9520b6c48f6661865d6c18a253d4af00839d42954f690a690d7a3eeadab48c09d5fcc3b391f68cfac31d75606d7e3cc4dad01144804ed7a28c7296 SHA512 6c91ad4faaa9afa3077d6ac12d9e1015ba858a8b2d629d4a1fb9f2a2dd871c2c8126364b10af3cda79fee9c9929b5eb34d98fb674d01f0fb4beed504a4efb646
 DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
-EBUILD simplescreenrecorder-0.4.2.ebuild 2747 BLAKE2B a6e77d3793d74348efa91e82eb9d9e3c85cb1fa46259253007d5dffe33b1e0dc4baef446a2c96f4cea7cf12cd4f98365288c09e873aca65121510b2ae838c0ce SHA512 d05f247e5d810833ea4ddb489362a33eed832e53c2f5c3ae8174b94aef1730c2150f06fcd9c7b717ee3b1f026b003382a4baedbe69abc7a5f906ce661743f1e9
-EBUILD simplescreenrecorder-9999.ebuild 2674 BLAKE2B 1729b241c93e49765e3a065db2b429315df4dfacb5afe2dfc9dca02d815ae9b34a6222b00d093ecc822d6d3f4bf2d9af47dc19e5fe1d82d43cdb09bca04af2a6 SHA512 fecf50bece888992989f99621b6bf8b946fbd0e47a90310d2d7103bc7bca7f53afa137b77103c8281056fb38c12ed17c61b6744f51b705559ef1cad7b82aa8ad
+DIST simplescreenrecorder-0.4.3.tar.gz 1918958 BLAKE2B 9d0e07255c7345d8752a8f49fd2e7947db4058c6e6bdbe1239955f96f06543eff24b207bcd049d07eb7d3d5815ad5f1c77721e1fa139f940b1deb3b3da7a46e0 SHA512 c930045d6763bdb026cee80fe82aa0e973de7a1bd92bce9650c5cae627f5d8f8d913f260024410a41170081c8eda61c1aea346bc2d9740b8dc169a3952b3bfd0
+EBUILD simplescreenrecorder-0.4.2.ebuild 2745 BLAKE2B cf20147685ba950c89c5cb20ae81b2d9d42d73010c002662caa3481814f2c2c387095e2e173fd75c67c884a01e92eae24edd61d474a6ef5379c4dab5257a5d88 SHA512 88d683a6185c7b3bc20930eddc1c000ba4521766e543055d5b01a9b7dadabbdf946e2deb0e8f8ac03abfeb0fe86dffb3ec7ceef5be5ba01b9b19ee3b6bc36fb1
+EBUILD simplescreenrecorder-0.4.3.ebuild 2806 BLAKE2B 3ea243a40385742049abd81cb976d836f497486b8b9c68e816d9844d9920fbb2a94d7e64fb99679397a1e57b9b4473a85efdbb1931bc58ed805dd7c18d5de34b SHA512 c74b87b3bc53b1292cccd416870648bcf76eb6b7ca181a6a7e16e3974235b1823dadfda3dd296a413b00ca6f0afc31c0cd99e6be90324acaf90af6454eb1df6f
+EBUILD simplescreenrecorder-9999.ebuild 2806 BLAKE2B 3ea243a40385742049abd81cb976d836f497486b8b9c68e816d9844d9920fbb2a94d7e64fb99679397a1e57b9b4473a85efdbb1931bc58ed805dd7c18d5de34b SHA512 c74b87b3bc53b1292cccd416870648bcf76eb6b7ca181a6a7e16e3974235b1823dadfda3dd296a413b00ca6f0afc31c0cd99e6be90324acaf90af6454eb1df6f
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
index 949f13a88fe1..f0ac1589ed52 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
@@ -16,7 +16,7 @@ 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
 
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.3.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.3.ebuild
new file mode 100644
index 000000000000..337ba993d166
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic xdg
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+SLOT="0"
+IUSE="+asm jack mp3 pulseaudio theora v4l vorbis vpx x264"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	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
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi
+	x11-libs/libXinerama
+	virtual/glu[${MULTILIB_USEDEP}]
+	v4l? ( media-libs/libv4l )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+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
+	fi
+
+	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+src_prepare() {
+	# required because xdg.eclass overrides default cmake_src_prepare
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
+		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+		-DWITH_JACK="$(multilib_native_usex jack)"
+		-DWITH_GLINJECT="true"
+		-DWITH_V4L2="$(multilib_native_usex v4l)"
+	)
+
+	if multilib_is_native_abi ; then
+		mycmakeargs+=(
+			-DENABLE_32BIT_GLINJECT="false"
+			-DWITH_QT5="true"
+		)
+	else
+		mycmakeargs+=(
+			# https://bugs.gentoo.org/660438
+			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
+			-DENABLE_32BIT_GLINJECT="true"
+			-DWITH_SIMPLESCREENRECORDER="false"
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 6a8445ffb2fa..337ba993d166 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
+IUSE="+asm jack mp3 pulseaudio theora v4l vorbis vpx x264"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -37,6 +37,7 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
+	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )
 "
@@ -75,10 +76,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
 		-DENABLE_X86_ASM="$(usex asm)"
 		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
 		-DWITH_JACK="$(multilib_native_usex jack)"
 		-DWITH_GLINJECT="true"
+		-DWITH_V4L2="$(multilib_native_usex v4l)"
 	)
 
 	if multilib_is_native_abi ; then