gentoo auto-resync : 17:08:2023 - 09:31:54

4 files changed, 99 insertions, 8 deletions

diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 8f862b1d7534..ad57f210f814 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,4 +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-9999.ebuild 2097 BLAKE2B d625e52623bac58cdbac9dc46ba75d7caa5aa795121334cee87562aecc3f3e6b66a7a46db4b0f93ed7a22f1674778aedc50e5ce6947c7e03f6e067bdd88d70d6 SHA512 de1d51e7c404060d36c9a2cb2bf198c463cc7a947ec13c927d7315281f3c5ce1cc83607d4f52bac247885d2186dfae1dff6b84aa9af26585b909121e3e2a3945
-MISC metadata.xml 586 BLAKE2B 55df36c3b4fd6319354c699e5e789b47dfd6f223068721ae842cdfae1dd158b3765e5796deabe8ca63a50da450f541e37f194c8665c7a7a1a6c2272677159d5d SHA512 729ba6c451fcc437d71c0c379179913b22e169368695daaf3452313d061641d647697f47a76684fd4bfcac318c5c7126a5214d5e0e1474c6685cbbc29fd8d0e8
+EBUILD webcamoid-9.1.1.ebuild 2242 BLAKE2B de99d3c90f6a5f025d393d8ab2944131259667cf9b3ff82e531f370ef7411075c0495ce99142579f400a4b67347e9b234ab2233cb217a1d93a9a5beb7cedfabe SHA512 58d34e96d62245c9621d4aee99b970286854abc187307b398abefe9ed300c129255bac208e8f2811b1f9873963cef35b5ebd8448552603f877049fe15fa296c3
+EBUILD webcamoid-9999.ebuild 2242 BLAKE2B de99d3c90f6a5f025d393d8ab2944131259667cf9b3ff82e531f370ef7411075c0495ce99142579f400a4b67347e9b234ab2233cb217a1d93a9a5beb7cedfabe SHA512 58d34e96d62245c9621d4aee99b970286854abc187307b398abefe9ed300c129255bac208e8f2811b1f9873963cef35b5ebd8448552603f877049fe15fa296c3
+MISC metadata.xml 678 BLAKE2B 028401bc59fc788005dc114d893c2331d0ab12c26bc86492ea35285152e101e85ef6f51f500e870af5ffba6c5e35cf7fc31a2a70b5f060f326018e7c66a58e75 SHA512 73020b100d9863e747d9b8666c220768e850bb208ff1b4b258d6604cc3b00257bcb71b216d3276f747de14580bc5cd4515c93a097bffbe057ab26eeece0fae34
diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml
index 2d85ce468c6c..41c3bc23a2d0 100644
--- a/media-video/webcamoid/metadata.xml
+++ b/media-video/webcamoid/metadata.xml
@@ -9,6 +9,7 @@
 		<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>
 	</use>
diff --git a/media-video/webcamoid/webcamoid-9.1.1.ebuild b/media-video/webcamoid/webcamoid-9.1.1.ebuild
new file mode 100644
index 000000000000..c539d8831d38
--- /dev/null
+++ b/media-video/webcamoid/webcamoid-9.1.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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() {
+	#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-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild
index 1459f4bc426a..c539d8831d38 100644
--- a/media-video/webcamoid/webcamoid-9999.ebuild
+++ b/media-video/webcamoid/webcamoid-9999.ebuild
@@ -11,6 +11,7 @@ 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"
@@ -18,10 +19,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
+IUSE="alsa ffmpeg gstreamer jack libuvc oss portaudio pulseaudio qtaudio qtcamera sdl v4lutils videoeffects debug headers v4l"
 
 REQUIRED_USE="v4lutils? ( v4l )"
-RESTRICT="mirror"
 
 COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
@@ -40,6 +40,8 @@ COMMON_DEPEND="
 	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}
@@ -50,23 +52,25 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_configure() {
-	#Disable git in package source. If not disabled the cmake configure process will show a lot of "fatal not a git repository" errors
+	#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"
-		"-DNOAVFOUNDATION=1"
 		"-DNODSHOW=1"
 		"-DNOWASAPI=1"
 		"-DNOVLC=1"
 		"-DNOPIPEWIRE=1"
+		"-DNOPORTAUDIO=1" # PortAudio not packaged for gentoo
 		"-DNOALSA=$(usex alsa 0 1)"
-		"-DNOCOREAUDIO=$(usex coreaudio 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)"
@@ -75,6 +79,6 @@ src_configure() {
 }
 
 src_install() {
-	docompress -x /usr/share/man1/${PN}.1.gz
+	docompress -x /usr/share/man/man1/${PN}.1.gz
 	cmake_src_install
 }