gentoo Easter resync : 12.04.2020

4 files changed, 156 insertions, 14 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index d02afc6b7dab..076a9a03994e 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,4 +1,7 @@
+AUX simplescreenrecorder-0.4.0-metainfo.patch 1332 BLAKE2B 717e54de67f5fb8d535351adea928dce5c3645ed721bdb3b297d675d8d5628c4125f54ed8f25672fe18908c360efc938f04a4d16928d98a5397bbc353407dece SHA512 3746d9d693849927f9c79365d4014aa36145aaeced2dc6be7b47222b5651fc500ebf747ae64b79eaa125d60e536b7152ac43659524a9d058c8f4a5b6d8ea4e25
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
+DIST simplescreenrecorder-0.4.0.tar.gz 1867593 BLAKE2B 0997c4e72c142ebfa74658c1fd27d8d01ceb3810f659df0bf899004224d3944a58476fd6b54b318d712fa4d284684a221f387c7e3e63d4b397312ab9e0786988 SHA512 aa4970aba010884153c9d3155a0869288a5b9b8723cf617471148ad875f1af29f594403c1682303345c578cc0dc3f0a4b3596e4937d3afa949a652b83dcd0b36
 EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3085 BLAKE2B 457b037bd45f41207985b9df2de80de39e022097a58ca81864a8c31c919c8b9005a08c6ae359a307df1814c74912df2e4b4848b4912544227a2351331ce61f19 SHA512 fc94fc80c7a11afaa4df84e5f7f3d052c14df33c05ec0c41ef8ce0ff6cc6d8dfe3da931131a6ba153fa3b0e86a4d9e88d71f4007a7ee1b56660b19e6c209e4ba
-EBUILD simplescreenrecorder-9999.ebuild 3085 BLAKE2B 457b037bd45f41207985b9df2de80de39e022097a58ca81864a8c31c919c8b9005a08c6ae359a307df1814c74912df2e4b4848b4912544227a2351331ce61f19 SHA512 fc94fc80c7a11afaa4df84e5f7f3d052c14df33c05ec0c41ef8ce0ff6cc6d8dfe3da931131a6ba153fa3b0e86a4d9e88d71f4007a7ee1b56660b19e6c209e4ba
+EBUILD simplescreenrecorder-0.4.0.ebuild 3032 BLAKE2B e715ee6f78f9d4646944fbcfe65f18f31c52e30444d7c7a56293030e27108d12e4455b44557718eda8332251576f4975c4d81eb87602813ba44ecf7eef26de4b SHA512 4dc50901fa0c0dd715ee8842bb0bc348ce1632f0191529f50f392af8ec19a4772811d31db6c953516b415baa97d1483bdad03681efc3a7845359bf7d485846c8
+EBUILD simplescreenrecorder-9999.ebuild 2977 BLAKE2B 87c06c03fa23b8313c1d79ecc9e2128d92c8bcca8f6996509f2b4775be4868fbdc7176a7170680f6c8a9f78aa3c2b4f4020f6d1afa264a15da465fd4b297b8ba SHA512 9f42d007bc25569976f97af89b7b90785e50da365a107735be7e919096edeb0650f72b6c3630279bba10cfa630b255e82971480d27bcdb2d1a7d6a4e9dd1b3fd
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch
new file mode 100644
index 000000000000..799afe23e264
--- /dev/null
+++ b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.0-metainfo.patch
@@ -0,0 +1,37 @@
+From 47078d2790e8c2f982dacfe27f998b7307b600c9 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 9 Apr 2020 13:06:54 +0200
+Subject: [PATCH] Rename appdata to metainfo
+
+See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+chapter 2.1.2 "Filesystem locations"
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ CMakeLists.txt                                                | 4 ++--
+ ...recorder.appdata.xml => simplescreenrecorder.metainfo.xml} | 0
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename data/{simplescreenrecorder.appdata.xml => simplescreenrecorder.metainfo.xml} (100%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d7167b..760c889 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,8 +86,8 @@ if(WITH_SIMPLESCREENRECORDER)
+ 		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications
+ 	)
+ 	install(
+-		FILES data/simplescreenrecorder.appdata.xml
+-		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/appdata
++		FILES data/simplescreenrecorder.metainfo.xml
++		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo
+ 	)
+ 
+ 	# icons
+diff --git a/data/simplescreenrecorder.appdata.xml b/data/simplescreenrecorder.metainfo.xml
+similarity index 100%
+rename from data/simplescreenrecorder.appdata.xml
+rename to data/simplescreenrecorder.metainfo.xml
+-- 
+2.26.0
+
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
new file mode 100644
index 000000000000..4edd7070ece7
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
@@ -0,0 +1,114 @@
+# 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
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+if [[ ${PV} = 9999 ]] ; then
+	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 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/mesa[${MULTILIB_USEDEP},X(+)]
+	|| (
+		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-metainfo.patch"
+)
+
+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-video/libav[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_X86_ASM="$(usex asm)"
+		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+		-DWITH_JACK="$(multilib_native_usex jack)"
+		-DWITH_GLINJECT="true"
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav ; then
+		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
+	fi
+
+	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 54eeceee53ad..099655b743d9 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -108,15 +108,3 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}