commit: ec28b696c1f1ddd38a86a1f7d0c78c0f47afe901 Author: Joakim Tjernlund <Joakim.Tjernlund <AT> infinera <DOT> com> AuthorDate: Sat Jul 29 16:39:57 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Aug 17 07:39:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec28b696
media-video/webcamoid: add 9.1.1 Update webcamoid-9999 as well. Closes: https://bugs.gentoo.org/911344 Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund <AT> infinera.com> Closes: https://github.com/gentoo/gentoo/pull/32094 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-video/webcamoid/Manifest | 1 + media-video/webcamoid/metadata.xml | 1 + .../{webcamoid-9999.ebuild => webcamoid-9.1.1.ebuild} | 14 +++++++++----- media-video/webcamoid/webcamoid-9999.ebuild | 14 +++++++++----- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest index 67d8a366d6a3..d11a0b3cbcc2 100644 --- a/media-video/webcamoid/Manifest +++ b/media-video/webcamoid/Manifest @@ -1 +1,2 @@ DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4 +DIST webcamoid-9.1.1.tar.gz 9288681 BLAKE2B 2444240c6ed90eac761c26860c2aabf2467578fec7eca1d488dad3adff63b1638525ff677c9f7d8a49971c9158f245b826390c45251697c7310fde32787998b4 SHA512 aebf413a358ee3397712d0a0935da0b4a8ae595019197450e1c2cd4ac33f9afc16e174ab06d0f8ca9c7fba25c6d71de14cbbdf36ad8f7bfb55428a432e06bb90 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-9999.ebuild b/media-video/webcamoid/webcamoid-9.1.1.ebuild similarity index 81% copy from media-video/webcamoid/webcamoid-9999.ebuild copy to media-video/webcamoid/webcamoid-9.1.1.ebuild index 1459f4bc426a..918140623ade 100644 --- a/media-video/webcamoid/webcamoid-9999.ebuild +++ b/media-video/webcamoid/webcamoid-9.1.1.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)" diff --git a/media-video/webcamoid/webcamoid-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild index 1459f4bc426a..918140623ade 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)"
