From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F6461582EF for ; Mon, 17 Feb 2025 20:21:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 785BB34317E for ; Mon, 17 Feb 2025 20:20:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7EC7D1103A8; Mon, 17 Feb 2025 20:20:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 74BB41103A8 for ; Mon, 17 Feb 2025 20:20:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2081E34317E for ; Mon, 17 Feb 2025 20:20:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 844BB175A for ; Mon, 17 Feb 2025 20:20:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1739823609.08c754eb05921c72bc429afeb56e724c6bbe5d74.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/webcamoid/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/webcamoid/metadata.xml media-video/webcamoid/webcamoid-9999.ebuild X-VCS-Directories: media-video/webcamoid/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 08c754eb05921c72bc429afeb56e724c6bbe5d74 X-VCS-Branch: master Date: Mon, 17 Feb 2025 20:20:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3fa88c5a-faa5-4fa1-9b8b-c42017945bb5 X-Archives-Hash: 98a35a6ec62f1626946ba87b2b5b1bd4 commit: 08c754eb05921c72bc429afeb56e724c6bbe5d74 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 17 18:49:47 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 17 20:20:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c754eb media-video/webcamoid: Sanitise and add many, many IUSE Add IUSE aom, faac, fdk-aac, lame, libusb, mp4, opus, rav1e, screencast, svt-av1, vlc, vorbis, vpx, X, x264 Add missing media-libs/alsa-lib for IUSE alsa Better describe IUSE libuvc (at all) Drop no-op IUSE oss Drop IUSE v4lutils (duplicates v4l without good explanation) Drop IUSE videoeffects (no deps) Merge IUSE qtaudio and qtcamera into qtmedia (same dep, prior use) Drop puzzling use of RESTRICT="mirror" in live ebuild switch Sort IUSE Fix stray tab in DEPENDs Wire up IUSE portaudio (at all) Bug: https://bugs.gentoo.org/935774 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/webcamoid/metadata.xml | 11 +++- media-video/webcamoid/webcamoid-9999.ebuild | 92 ++++++++++++++++++++--------- 2 files changed, 73 insertions(+), 30 deletions(-) diff --git a/media-video/webcamoid/metadata.xml b/media-video/webcamoid/metadata.xml index 41c3bc23a2d0..c08daa047538 100644 --- a/media-video/webcamoid/metadata.xml +++ b/media-video/webcamoid/metadata.xml @@ -6,11 +6,20 @@ webcamoid/webcamoid + Enable media-libs/libaom audio codec support + Enable media-libs/faac audio codec support + Enable media-libs/fdk-aac audio codec support Install development headers - Build with libuvc support + Enable video capturing from USB devices using dev-libs/libusb + Enable video capturing from USB devices using media-libs/libuvc Enable audio capture/play via dev-qt/qtmultimedia Enable video capture/play via dev-qt/qtmultimedia + Enable audio/video/screen capture/play via dev-qt/qtmultimedia + Enable media-video/rav1e audio codec support + Enable media-libs/svt-av1 video codec support Build with V4L-utils support Build video effects + Enable media-video/vlc video backend support + Enable x11-libs/libX11 screen capture support 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 }