[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/

["Jimi Huotari" <chiitoo@gentoo.org>]

commit:     3557fa0afc8d1dd8af01f346aa73dd1ffc267e0a
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 21:24:39 2024 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 19:42:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3557fa0a

media-video/obs-studio: add version 30.1.1

Add 'NATIVE_NVENC' (9999 only) CMake switch controlled via
USE="nvenc", which was automagically enabled otherwise,
leading into configure errors if ffmpeg was not built with
nvenc support.

Also add USE="X" on the 'media-libs/libglvnd' dependency.

Also also use 'filter-lto' to filter LTO issues when USE="wayland"
for the time being.

Closes: https://bugs.gentoo.org/867250
Closes: https://bugs.gentoo.org/923805
Closes: https://bugs.gentoo.org/927964
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 media-video/obs-studio/Manifest                                   | 1 +
 .../{obs-studio-9999.ebuild => obs-studio-30.1.1.ebuild}          | 7 ++++++-
 media-video/obs-studio/obs-studio-9999.ebuild                     | 8 +++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index ab93d39e6a89..7d716d1a5e70 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -6,6 +6,7 @@ DIST obs-browser-a3ae78b5c6ce6d4ddb29d49b29f2f60014d554e1.tar.gz 109427 BLAKE2B
 DIST obs-studio-29.1.3.tar.gz 26315797 BLAKE2B c8d7824ca280a9be566c075a6238141b00ad8a2efbd5d010ff5c92c7c12c225f473fd331a9654e23924ffb0d883734dc2d2afad5065f8c9b1486298dbe2c5a0a SHA512 563a9b71ebe273b604807b9c43be8bde58fb326e8a0b741afb84a481a99176c96bf63da2aa26b6dcc026573b7fb0bf53e0a296e2db0b93c28f0d4710cd7cf019
 DIST obs-studio-30.0.2.tar.gz 15861643 BLAKE2B d21e990d116e304af0a47f0f9523928723acb939114666fab66250aea98f8dce9b7c216710f695f806947c3390e8bfa9411f4cbca466a6db679294ff1e48fe73 SHA512 04a9944a0c008033368cb833f847464caa8aeea6157ed07c2ecf2d1a85ca8bbbd6fe8729dd8d7f6bec2f7b9706fd631ae649d0782526b3036f1011b244b84819
 DIST obs-studio-30.1.0.tar.gz 16023246 BLAKE2B 7e1caa214501a23c6a99b64ec5254d620836b190f98417763419b894e72b33b79cf6893000b70ef725845463e78cd0f3a32808043c08dba16ed88962ddee0efd SHA512 68ec8665399539846d5759414c07de3ce8005318a9bb433f170cd013d3974cb7686f15e079ec97af51ebda773475b0a1d958bbaf986646f9c88e931557457571
+DIST obs-studio-30.1.1.tar.gz 16023779 BLAKE2B d3a723cd83b1287b0cf24b3b3d7a34a391f6c2699955ba7351cd31c117168fb8643dd9d810697ad4cfde61e4e066761e6f23ce49a837b445c9a7d000b2658ac0 SHA512 31aba14cf9db6b6c41d87ea0b814d38e1ba2794d07f1aff025c810e9dda32b0915d3f6d2679383755d0a4e47fc26c2aef981e26a80b792cf7fb893e672b6609a
 DIST obs-websocket-6fd18a7ef1ecb149e8444154af1daab61d4241a9.tar.gz 245070 BLAKE2B 311037960ec230b76dfe2ae796d1897d42a2dc96cda7e9962209edfcd210e2af5d20a1ddfcffd8d4e6c9f7ac7d5cbb6818b864d53ce53acf2c6515f7dd2d33bf SHA512 94defd55e4a4dc65b4366d2e92c9604cff67cba2b24ed67d53fbd492605f339201e4d3896789c0ccb84b6fbff4b37be70475524fec5ca2b42f7b59b8596ce828
 DIST obs-websocket-d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32.tar.gz 246888 BLAKE2B 6e06c85ee47cb088a50b9d5eae9a8d68441989c1f76fdcd7806d59597062af5eb36e1722600b1a8d544e5f11533985b9bac243f7ca1002eed616e2f5c11a9a3f SHA512 31d5e1817aab341e55cbc5c759f28509f442695afb90d08a235c07359a65d2c2d3dfae2bf9c8a5086db310bb127dc59945ebe23fb219fda7408ee82d05b43938
 DIST obs-websocket-ede66a68cbc043a6fc7c8af683ae0924d4068941.tar.gz 241053 BLAKE2B 58d79d17ad20271f831dacd7bb251286d4ba91f62a7848bc9866deddc9ad7c1924fb54cce513d3e1f240eee0d9d87c63ad3898b44910a7b207503989b366e42a SHA512 30e5f9ab940cb5c9ff38cdfd2484a59d8440c3670999521fd6d856911e04a1fd718cbb1d6243343884143274485630e96cd6e2f5e8f6ef8f070c0b4e4036971a

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-30.1.1.ebuild
similarity index 97%
copy from media-video/obs-studio/obs-studio-9999.ebuild
copy to media-video/obs-studio/obs-studio-30.1.1.ebuild
index 7878bb19a448..3167406edec2 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-30.1.1.ebuild
@@ -57,7 +57,7 @@ DEPEND="
 	dev-libs/jansson:=
 	dev-qt/qtbase:6[network,widgets,xml(+)]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libva
 	media-libs/rnnoise
 	media-libs/x264:=
@@ -173,6 +173,11 @@ src_prepare() {
 
 	sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
 
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/867250
+	# https://github.com/obsproject/obs-studio/issues/8988
+	use wayland && filter-lto
+
 	cmake_src_prepare
 }
 

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 7878bb19a448..500f590efc68 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -57,7 +57,7 @@ DEPEND="
 	dev-libs/jansson:=
 	dev-qt/qtbase:6[network,widgets,xml(+)]
 	dev-qt/qtsvg:6
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	media-libs/libva
 	media-libs/rnnoise
 	media-libs/x264:=
@@ -173,6 +173,11 @@ src_prepare() {
 
 	sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die
 
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/867250
+	# https://github.com/obsproject/obs-studio/issues/8988
+	use wayland && filter-lto
+
 	cmake_src_prepare
 }
 
@@ -189,6 +194,7 @@ src_configure() {
 		-DENABLE_FREETYPE=$(usex truetype)
 		-DENABLE_JACK=$(usex jack)
 		-DENABLE_LIBFDK=$(usex fdk)
+		-DENABLE_NATIVE_NVENC=$(usex nvenc)
 		-DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts)
 		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)