gentoo auto-resync : 18:02:2025 - 00:14:44

6 files changed, 175 insertions, 127 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index adfcb02c2cb8..e43931dd09a5 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 4887ebe25f94..e20f40f79a14 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,4 +1,5 @@
-DIST webcamoid-9.1.1.tar.gz 9288681 BLAKE2B 2444240c6ed90eac761c26860c2aabf2467578fec7eca1d488dad3adff63b1638525ff677c9f7d8a49971c9158f245b826390c45251697c7310fde32787998b4 SHA512 aebf413a358ee3397712d0a0935da0b4a8ae595019197450e1c2cd4ac33f9afc16e174ab06d0f8ca9c7fba25c6d71de14cbbdf36ad8f7bfb55428a432e06bb90
-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
+DIST webcamoid-9.2.3-nocheckupdates.patch.xz 4776 BLAKE2B ec79194f8d7da42661743e392b218e0c3c4bbbfe6c93ef780a5f2a21bddb417a9c51ebbb3ebd078763eeda7c499d139f362fa7a3ca6149ac558030a42d2b5f24 SHA512 b0410d173efe3975b68a9d32db8277c69f9cd41c960405a359bfea9f13e6821b114fcef6ab8e522dadfda5bcd31be60a1b4254493a3967d198ebafb641e47a92
+DIST webcamoid-9.2.3.tar.gz 9403068 BLAKE2B f7ada9845c7cadd0a6c5773c60bd656798863d47222f8304c8c71285b1e170eabc93e1a067c3e026aa2c1f86575be1c20a3a2f87fe27396c93583f7a59fd1cd2 SHA512 8deca1285ddb1e53167edd2d8b806abc511a7906c7d561dbb3b2f109d94decdafe441bfab6d9b08c79b6486e6f97b42d19d4b36c11811ac29344b3e4111671ab
+EBUILD webcamoid-9.2.3.ebuild 2633 BLAKE2B c759b138509ead6ef305c0dbf51c8744bb1494a9e72eb48caac5c225cbf311de00dd655a7657f2b7d258eafd226073eabeac20afc52baf479f9f3aef7f136c59 SHA512 98fafb77910d3b09d063a037e7d061989e17499ecdfc6db25890cdfaee0f23d9bf3b63172b8d69889000760a9f9ddd01043a04a91eff5d0da842c5f5822abca1
+EBUILD webcamoid-9999.ebuild 3236 BLAKE2B d0912e999ff3c7ac7c6a621e93a348d7cec47aa564cd772d3abb09b29b263f4d5cf4b37ec6046f82d9de8155ff71eb4f80bcbc5b79f35a729e5f05af5edc33d8 SHA512 49eef9312cca2f58e69ece9508b39710148220cb47701128fcfdc4934ed48c408d24d0efdea35a42b5437322e390a5f008f0b6874d1dc2947f529f97f98df8b1
+MISC metadata.xml 1219 BLAKE2B be6fbd41d585b542339ac831b6ca565629f76a27fb107bd39b7aaf57dedeae65661b3a5885ca1015b2eb38d52d82e1123b6f9b74c75714d01670d7164bb0312e SHA512 98e35ff8766d217119ad2ade73383f013446e35ec808f0c5a169f7588d0b4a1e5435f730f5e95061aa20baf3e0e0b415d6cbb5eb7a54a217d6da078f9b7a441e
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
index 41c3bc23a2d0..ead51d71fed1 100644
--- a/media-video/webcamoid/metadata.xml
+++ b/media-video/webcamoid/metadata.xml
@@ -6,11 +6,16 @@
 		<remote-id type="github">webcamoid/webcamoid</remote-id>
 	</upstream>
 	<use>
+		<flag name="aom">Enable <pkg>media-libs/libaom</pkg> audio codec support</flag>
+		<flag name="faac">Enable <pkg>media-libs/faac</pkg> audio codec support</flag>
+		<flag name="fdk-aac">Enable <pkg>media-libs/fdk-aac</pkg> audio codec support</flag>
 		<flag name="headers">Install development headers</flag>
-		<flag name="libuvc">Build with libuvc support</flag>
-		<flag name="qtaudio">Enable audio capture/play via <pkg>dev-qt/qtmultimedia</pkg></flag>
-		<flag name="qtcamera">Enable video capture/play via <pkg>dev-qt/qtmultimedia</pkg></flag>
-		<flag name="v4lutils">Build with V4L-utils support</flag>
-		<flag name="videoeffects">Build video effects</flag>
+		<flag name="libusb">Enable video capturing from USB devices using <pkg>dev-libs/libusb</pkg></flag>
+		<flag name="libuvc">Enable video capturing from USB devices using <pkg>media-libs/libuvc</pkg></flag>
+		<flag name="qtmedia">Enable audio/video/screen capture/play via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="rav1e">Enable <pkg>media-video/rav1e</pkg> audio codec support</flag>
+		<flag name="svt-av1">Enable <pkg>media-libs/svt-av1</pkg> video codec support</flag>
+		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> video backend support</flag>
+		<flag name="X">Enable <pkg>x11-libs/libX11</pkg> screen capture support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/webcamoid/webcamoid-9.1.1.ebuild b/media-video/webcamoid/webcamoid-9.1.1.ebuild
deleted file mode 100644
index 012242abe5a0..000000000000
--- a/media-video/webcamoid/webcamoid-9.1.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Full featured webcam capture application"
-HOMEPAGE="https://webcamoid.github.io"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/webcamoid/webcamoid.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	RESTRICT="mirror"
-else
-	SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="alsa ffmpeg gstreamer jack libuvc oss portaudio pulseaudio qtaudio qtcamera sdl v4lutils videoeffects debug headers v4l"
-
-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
-	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 )
-	sdl? ( media-libs/libsdl2 )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.6
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/opengl
-"
-
-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
-
-	local mycmakeargs=(
-		"-DNOMEDIAFOUNDATION=1"
-		"-DNODSHOW=1"
-		"-DNOWASAPI=1"
-		"-DNOVLC=1"
-		"-DNOPIPEWIRE=1"
-		"-DNOPORTAUDIO=1" # PortAudio not packaged for gentoo
-		"-DNOALSA=$(usex alsa 0 1)"
-		"-DNOQTCAMERA=$(usex qtcamera 0 1)"
-		"-DNOFFMPEG=$(usex ffmpeg 0 1)"
-		"-DNOGSTREAMER=$(usex gstreamer 0 1)"
-		"-DNOJACK=$(usex jack 0 1)"
-		"-DNOLIBUVC=$(usex libuvc 0 1)"
-		"-DNOPULSEAUDIO=$(usex pulseaudio 0 1)"
-		"-DNOSDL=$(usex sdl 0 1)"
-		"-DNOV4L2=$(usex v4l 0 1)"
-		"-DNOV4LUTILS=$(usex v4lutils 0 1)"
-		"-DNOVIDEOEFFECTS=$(usex videoeffects 0 1)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	docompress -x /usr/share/man/man1/${PN}.1.gz
-	cmake_src_install
-}
diff --git a/media-video/webcamoid/webcamoid-9.2.3.ebuild b/media-video/webcamoid/webcamoid-9.2.3.ebuild
new file mode 100644
index 000000000000..4488a9f133b8
--- /dev/null
+++ b/media-video/webcamoid/webcamoid-9.2.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Full featured webcam capture application"
+HOMEPAGE="https://webcamoid.github.io"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/webcamoid/webcamoid.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-nocheckupdates.patch.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa debug ffmpeg gstreamer headers jack libusb libuvc portaudio
+	pulseaudio qtmedia screencast sdl v4l vlc X"
+
+COMMON_DEPEND="
+	media-libs/libmikmod
+	dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets]
+	dev-qt/qtdeclarative:6
+	dev-qt/qtsvg:6
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
+	jack? ( virtual/jack )
+	libusb? ( dev-libs/libusb:1 )
+	libuvc? ( >=media-libs/libuvc-0.0.7 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-libs/libpulse )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
+	screencast? ( media-video/pipewire:= )
+	sdl? ( media-libs/libsdl2 )
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.6
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/opengl
+"
+
+PATCHES=( "${WORKDIR}/${P}-nocheckupdates.patch" )
+
+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
+
+	local mycmakeargs=(
+		-DNOVIDEOEFFECTS=0 # no extra deps, no IUSE
+		-DNOCHECKUPDATES=1
+		-DNOMEDIAFOUNDATION=1
+		-DNODSHOW=1
+		-DNOWASAPI=1
+		-DNOALSA=$(usex !alsa)
+		-DNOFFMPEG=$(usex !ffmpeg)
+		-DNOGSTREAMER=$(usex !gstreamer)
+		-DNOJACK=$(usex !jack)
+		-DNOLIBUSB=$(usex !libusb)
+		-DNOLIBUVC=$(usex !libuvc)
+		-DNOPORTAUDIO=$(usex !portaudio)
+		-DNOPULSEAUDIO=$(usex !pulseaudio)
+		-DNOQTAUDIO=$(usex !qtmedia)
+		-DNOQTCAMERA=$(usex !qtmedia)
+		-DNOQTSCREENCAPTURE=$(usex !qtmedia)
+		-DNOPIPEWIRE=$(usex !screencast)
+		-DNOSDL=$(usex !sdl)
+		-DNOV4L2=$(usex !v4l)
+		-DNOV4LUTILS=$(usex !v4l)
+		-DNOVLC=$(usex !vlc)
+		-DNOXLIBSCREENCAP=$(usex !X)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	docompress -x /usr/share/man/man1/${PN}.1.gz
+	cmake_src_install
+}
diff --git a/media-video/webcamoid/webcamoid-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild
index 2bcfa8ebd343..b96e7ba420e3 100644
--- a/media-video/webcamoid/webcamoid-9999.ebuild
+++ b/media-video/webcamoid/webcamoid-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,9 @@ inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/webcamoid/webcamoid.git"
-	EGIT_BRANCH="master"
 	inherit git-r3
-	RESTRICT="mirror"
 else
 	SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -19,23 +17,43 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="alsa ffmpeg gstreamer jack libuvc oss portaudio pulseaudio qtaudio qtcamera sdl v4lutils videoeffects debug headers v4l"
-
-REQUIRED_USE="v4lutils? ( v4l )"
+IUSE="alsa aom debug faac fdk-aac ffmpeg gstreamer headers jack lame libusb libuvc mp4
+opus portaudio pulseaudio qtmedia rav1e screencast sdl svt-av1 v4l vlc vorbis vpx X x264"
 
 COMMON_DEPEND="
+	media-libs/libmikmod
 	dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets]
 	dev-qt/qtdeclarative:6
 	dev-qt/qtsvg:6
-	ffmpeg?	( media-video/ffmpeg:= )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	faac? ( media-libs/faac )
+	fdk-aac? ( media-libs/fdk-aac:= )
+	ffmpeg? ( media-video/ffmpeg:= )
 	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
 	jack? ( virtual/jack )
-	libuvc? ( media-libs/libuvc )
+	lame? ( media-sound/lame )
+	libusb? ( dev-libs/libusb:1 )
+	libuvc? ( >=media-libs/libuvc-0.0.7 )
+	mp4? ( media-libs/libmp4v2 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-libs/libpulse )
-	qtaudio? ( dev-qt/qtmultimedia:6 )
-	qtcamera? ( dev-qt/qtmultimedia:6 )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
+	rav1e? ( media-video/rav1e:= )
+	screencast? ( media-video/pipewire:= )
 	sdl? ( media-libs/libsdl2 )
+	svt-av1? ( media-libs/svt-av1:= )
 	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
+	x264? ( media-libs/x264:= )
 "
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-3.6
@@ -55,24 +73,40 @@ src_configure() {
 	sed -i 's|find_program(GIT_BIN git)|#find_program(GIT_BIN git)|' libAvKys/cmake/ProjectCommons.cmake || die
 
 	local mycmakeargs=(
-		"-DNOMEDIAFOUNDATION=1"
-		"-DNODSHOW=1"
-		"-DNOWASAPI=1"
-		"-DNOVLC=1"
-		"-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)"
-		"-DNOJACK=$(usex jack 0 1)"
-		"-DNOLIBUVC=$(usex libuvc 0 1)"
-		"-DNOPULSEAUDIO=$(usex pulseaudio 0 1)"
-		"-DNOSDL=$(usex sdl 0 1)"
-		"-DNOV4L2=$(usex v4l 0 1)"
-		"-DNOV4LUTILS=$(usex v4lutils 0 1)"
-		"-DNOVIDEOEFFECTS=$(usex videoeffects 0 1)"
+		-DNOVIDEOEFFECTS=0 # no extra deps, no IUSE
+		-DNOCHECKUPDATES=1
+		-DNOMEDIAFOUNDATION=1
+		-DNODSHOW=1
+		-DNOWASAPI=1
+		-DNOALSA=$(usex !alsa)
+		-DNOAOMAV1=$(usex !aom)
+		-DNOFAAC=$(usex !faac)
+		-DNOFDKAAC=$(usex !fdk-aac)
+		-DNOFFMPEG=$(usex !ffmpeg)
+		-DNOGSTREAMER=$(usex !gstreamer)
+		-DNOJACK=$(usex !jack)
+		-DNOLAME=$(usex !lame)
+		-DNOLIBUSB=$(usex !libusb)
+		-DNOLIBUVC=$(usex !libuvc)
+		-DNOLIBMP4V2=$(usex !mp4)
+		-DNOLIBOPUS=$(usex !opus)
+		-DNOPORTAUDIO=$(usex !portaudio)
+		-DNOPULSEAUDIO=$(usex !pulseaudio)
+		-DNOQTAUDIO=$(usex !qtmedia)
+		-DNOQTCAMERA=$(usex !qtmedia)
+		-DNOQTSCREENCAPTURE=$(usex !qtmedia)
+		-DNORAVIE=$(usex !rav1e)
+		-DNOPIPEWIRE=$(usex !screencast)
+		-DNOSDL=$(usex !sdl)
+		-DNOSVTAV1=$(usex !svt-av1)
+		-DNOV4L2=$(usex !v4l)
+		-DNOV4LUTILS=$(usex !v4l)
+		-DNOVLC=$(usex !vlc)
+		-DNOLIBVORBIS=$(usex !vorbis)
+		-DNOLIBWEBM=$(usex !vpx)
+		-DNOLIBVPX=$(usex !vpx)
+		-DNOXLIBSCREENCAP=$(usex !X)
+		-DNOX264=$(usex !x264)
 	)
 	cmake_src_configure
 }