4 files changed, 74 insertions, 13 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 54f99ee4cc7d..fdc9c10d7c58 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 318dfac5fac0..39f7370cd6ab 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,6 +1,6 @@
-DIST simplescreenrecorder-0.4.3.tar.gz 1918958 BLAKE2B 9d0e07255c7345d8752a8f49fd2e7947db4058c6e6bdbe1239955f96f06543eff24b207bcd049d07eb7d3d5815ad5f1c77721e1fa139f940b1deb3b3da7a46e0 SHA512 c930045d6763bdb026cee80fe82aa0e973de7a1bd92bce9650c5cae627f5d8f8d913f260024410a41170081c8eda61c1aea346bc2d9740b8dc169a3952b3bfd0
+AUX simplescreenrecorder-0.4.4-ffmpeg5.patch 2540 BLAKE2B 5551255312733fca5641ffbed46e332181d02147dafaa9f6831df967b38cb0d6f05fa2d0d910f78fce1cecb40e1db24e1913b8ec71a7e05a3a7ef0ee761e0427 SHA512 823bfdb35b49bd63a7a2f294695f3adb986d1d018d892db68ada0f08cb9d917ddac86cc258ed7520c44ca53b1194164f58e7e4d4ffdd58a5cfeda4590dff5ec0
 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-0.4.4-r1.ebuild 2969 BLAKE2B c2c0e135d7e7f8f43d633218620396adf71afe0e41bc1224270dff87c7a86e512336a46d0ff94004a445ad0eae844275b8906120a6285aa3dbee1a5c574bbd16 SHA512 ad6cb749a3c93d236bb294134003bc429a9ed6dec953e226e893ce95211632e930a4803df72f4ef1ed765713cb281a5dc1d0c1cf98556ececc1d22fb2b7a1d8a
 EBUILD simplescreenrecorder-0.4.4.ebuild 2920 BLAKE2B 8e2abfb3f1203cd32bacc17845a0c76d6a3d57d7eafdd21ea8d3129d515a47fdb9d3478db8e902e654884ef72341e35007db3395fb33e0096d224e4f7b93322d SHA512 b4b30ea9d81838cea8530074abdcb2701aac3bb5f5526e7c282cdfca346a61fb26c6ea093ff7e4977946c2bc276363d5a723de71ef9fc1658572a4c7ba427d6e
 EBUILD simplescreenrecorder-9999.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0
 MISC metadata.xml 420 BLAKE2B 2a645626005a1656fb4365970626c8b936ad6c8bfe501bd16fb2fc0a3450b56691ea69cf67ddeb3a5bc4aef2f544ddd300a5a8ae7801c2e71724f1e4d361d70b SHA512 68b6a0da9153a989618fbb7249d04e9d92cda87be16f8ecbdf3dbfc1af65d48ff7b15472087904e2dce47087eb6dc73cc1ebee6b49fcc63d492a5583c273830f
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4-ffmpeg5.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4-ffmpeg5.patch
new file mode 100644
index 000000000000..b86966410edb
--- /dev/null
+++ b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4-ffmpeg5.patch
@@ -0,0 +1,54 @@
+https://github.com/MaartenBaert/ssr/commit/768957a8de1534f0aa91bfc5d7af3c32f222beb8
+https://bugs.gentoo.org/834415
+
+From: Maarten Baert <maarten-baert@hotmail.com>
+Date: Sun, 20 Mar 2022 22:52:43 +0100
+Subject: [PATCH] Fix for compatibility with newer FFmpeg versions
+
+--- a/src/AV/Output/AudioEncoder.cpp
++++ b/src/AV/Output/AudioEncoder.cpp
+@@ -77,7 +77,8 @@ unsigned int AudioEncoder::GetSampleRate() {
+ }
+ 
+ bool AudioEncoder::AVCodecIsSupported(const QString& codec_name) {
+-	AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
++	// we have to break const correctness for compatibility with older ffmpeg versions
++	AVCodec *codec = (AVCodec*) avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ 	if(codec == NULL)
+ 		return false;
+ 	if(!av_codec_is_encoder(codec))
+--- a/src/AV/Output/Muxer.cpp
++++ b/src/AV/Output/Muxer.cpp
+@@ -194,7 +194,8 @@ unsigned int Muxer::GetQueuedPacketCount(unsigned int stream_index) {
+ void Muxer::Init() {
+ 
+ 	// get the format we want (this is just a pointer, we don't have to free this)
+-	AVOutputFormat *format = av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
++	// we have to break const correctness for compatibility with older ffmpeg versions
++	AVOutputFormat *format = (AVOutputFormat*) av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
+ 	if(format == NULL) {
+ 		Logger::LogError("[Muxer::Init] " + Logger::tr("Error: Can't find chosen output format!"));
+ 		throw LibavException();
+@@ -262,7 +263,8 @@ void Muxer::Free() {
+ }
+ 
+ AVCodec* Muxer::FindCodec(const QString& codec_name) {
+-	AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
++	// we have to break const correctness for compatibility with older ffmpeg versions
++	AVCodec *codec = (AVCodec*) avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ 	if(codec == NULL) {
+ 		Logger::LogError("[Muxer::FindCodec] " + Logger::tr("Error: Can't find codec!"));
+ 		throw LibavException();
+--- a/src/AV/Output/VideoEncoder.cpp
++++ b/src/AV/Output/VideoEncoder.cpp
+@@ -95,7 +95,8 @@ unsigned int VideoEncoder::GetFrameRate() {
+ }
+ 
+ bool VideoEncoder::AVCodecIsSupported(const QString& codec_name) {
+-	AVCodec *codec = avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
++	// we have to break const correctness for compatibility with older ffmpeg versions
++	AVCodec *codec = (AVCodec*) avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ 	if(codec == NULL)
+ 		return false;
+ 	if(!av_codec_is_encoder(codec))
+
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.3.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild
index b62619102fed..667f701f5639 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.3.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 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 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,24 @@ 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 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ffmpeg5.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
+	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 +84,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)"
 	)