gentoo auto-resync : 08:07:2024 - 12:25:03

3 files changed, 22 insertions, 18 deletions

diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index ad57f210f814..0de73a37e10d 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,6 +1,6 @@
 DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4
 DIST webcamoid-9.1.1.tar.gz 9288681 BLAKE2B 2444240c6ed90eac761c26860c2aabf2467578fec7eca1d488dad3adff63b1638525ff677c9f7d8a49971c9158f245b826390c45251697c7310fde32787998b4 SHA512 aebf413a358ee3397712d0a0935da0b4a8ae595019197450e1c2cd4ac33f9afc16e174ab06d0f8ca9c7fba25c6d71de14cbbdf36ad8f7bfb55428a432e06bb90
 EBUILD webcamoid-9.0.0-r1.ebuild 1942 BLAKE2B 88c603e7ae76ac807729c680205698ec7eafb25dfe3b79c52c6d5d5c000b32d5ecedaa0aa4f2473083226b52e3819659ee74807a61420d7c8b5b754cf8216645 SHA512 1dc39423350cf0cbcfefa98fab112715375d53946c2e448c88df900a5ac1849c5df2abde8c6677c2263caabfd90716a7b18a491e82b2903bee925ae730d9c8b7
-EBUILD webcamoid-9.1.1.ebuild 2242 BLAKE2B de99d3c90f6a5f025d393d8ab2944131259667cf9b3ff82e531f370ef7411075c0495ce99142579f400a4b67347e9b234ab2233cb217a1d93a9a5beb7cedfabe SHA512 58d34e96d62245c9621d4aee99b970286854abc187307b398abefe9ed300c129255bac208e8f2811b1f9873963cef35b5ebd8448552603f877049fe15fa296c3
-EBUILD webcamoid-9999.ebuild 2242 BLAKE2B de99d3c90f6a5f025d393d8ab2944131259667cf9b3ff82e531f370ef7411075c0495ce99142579f400a4b67347e9b234ab2233cb217a1d93a9a5beb7cedfabe SHA512 58d34e96d62245c9621d4aee99b970286854abc187307b398abefe9ed300c129255bac208e8f2811b1f9873963cef35b5ebd8448552603f877049fe15fa296c3
+EBUILD webcamoid-9.1.1.ebuild 2370 BLAKE2B bab09ef659dc8b388bcda1e824767cefeac22a85c605e4b95c4977404a52765cfd64822e97dd3cb949a6c7a9a0a660ee68c58558d7ca4fc94a5fa8afdb64f037 SHA512 3a13460753f3da633b6d2dd9dca4e0ed618578abb9e298b6924175db89e1d9d001c12724002cef9c570551a4b2bf9ed2ed3a75c0a0cd3a85f587e129f251298b
+EBUILD webcamoid-9999.ebuild 2308 BLAKE2B 75204087fa0ed5370d587cf56400cf5241dc2dac9b348317001c0eda44c7585ffaf3d91069b553d4c7bbd3eb67d111a641bfda2ad56bba82b8149c5f2e203719 SHA512 a0ac94014bf839f2feed51c7a7c8581d36d33809e48751bcc4b5f9c5ebf1c7b0bb2a70b7ac7418734d0c47a26c1c26fb2371c3e4823f7c6e60d1735711610738
 MISC metadata.xml 678 BLAKE2B 028401bc59fc788005dc114d893c2331d0ab12c26bc86492ea35285152e101e85ef6f51f500e870af5ffba6c5e35cf7fc31a2a70b5f060f326018e7c66a58e75 SHA512 73020b100d9863e747d9b8666c220768e850bb208ff1b4b258d6604cc3b00257bcb71b216d3276f747de14580bc5cd4515c93a097bffbe057ab26eeece0fae34
diff --git a/media-video/webcamoid/webcamoid-9.1.1.ebuild b/media-video/webcamoid/webcamoid-9.1.1.ebuild
index c539d8831d38..012242abe5a0 100644
--- a/media-video/webcamoid/webcamoid-9.1.1.ebuild
+++ b/media-video/webcamoid/webcamoid-9.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
@@ -52,6 +52,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927104
+	# https://github.com/webcamoid/webcamoid/issues/702
+	filter-lto
+
 	#Disable git in package source. If not disabled the cmake configure process will show
 	#a lot of "fatal not a git repository" errors
 	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
diff --git a/media-video/webcamoid/webcamoid-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild
index c539d8831d38..2bcfa8ebd343 100644
--- a/media-video/webcamoid/webcamoid-9999.ebuild
+++ b/media-video/webcamoid/webcamoid-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
@@ -24,23 +24,16 @@ IUSE="alsa ffmpeg gstreamer jack libuvc oss portaudio pulseaudio qtaudio qtcamer
 REQUIRED_USE="v4lutils? ( v4l )"
 
 COMMON_DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
+	dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
 	ffmpeg?	( media-video/ffmpeg:= )
 	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
 	jack? ( virtual/jack )
 	libuvc? ( media-libs/libuvc )
 	pulseaudio? ( media-libs/libpulse )
-	qtaudio? ( dev-qt/qtmultimedia:5 )
-	qtcamera? ( dev-qt/qtmultimedia:5 )
+	qtaudio? ( dev-qt/qtmultimedia:6 )
+	qtcamera? ( dev-qt/qtmultimedia:6 )
 	sdl? ( media-libs/libsdl2 )
 	v4l? ( media-libs/libv4l )
 "
@@ -52,6 +45,11 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/927104
+	# https://github.com/webcamoid/webcamoid/issues/702
+	filter-lto
+
 	#Disable git in package source. If not disabled the cmake configure process will show
 	#a lot of "fatal not a git repository" errors
 	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
@@ -64,6 +62,7 @@ src_configure() {
 		"-DNOPIPEWIRE=1"
 		"-DNOPORTAUDIO=1" # PortAudio not packaged for gentoo
 		"-DNOALSA=$(usex alsa 0 1)"
+		"-DNOQTAUDIO=$(usex qtaudio 0 1)"
 		"-DNOQTCAMERA=$(usex qtcamera 0 1)"
 		"-DNOFFMPEG=$(usex ffmpeg 0 1)"
 		"-DNOGSTREAMER=$(usex gstreamer 0 1)"