commit: a64cf032d8e980dd59aa48f0abc62b986498093f Author: Matija Skala <mskala <AT> gmx <DOT> com> AuthorDate: Wed Dec 24 17:06:34 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 5 03:32:19 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64cf032
media-video/guvcview: bump version to 2.2.2 [sam: Tweak commit message.] Signed-off-by: Matija Skala <mskala <AT> gmx.com> Part-of: https://github.com/gentoo/gentoo/pull/45150 Closes: https://github.com/gentoo/gentoo/pull/45150 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/guvcview/Manifest | 1 + .../guvcview/files/guvcview-2.2.2-musl.patch | 92 ++++++++++++++++++++++ media-video/guvcview/guvcview-2.2.2.ebuild | 78 ++++++++++++++++++ 3 files changed, 171 insertions(+) diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest index e0377bd04f83..abbdb981e325 100644 --- a/media-video/guvcview/Manifest +++ b/media-video/guvcview/Manifest @@ -1 +1,2 @@ DIST guvcview-src-2.2.1.tar.bz2 355747 BLAKE2B 57b1ea3a38ce4dbd68220b3a5caacf2f0b3e4b8cd880667988ea13bf50f495cb761249df2fc7ddf24fcdea19b6b4317b5ec1fc63202987bc7820d6095913233f SHA512 3757ff41306c6c02b3a0fcb7f9a4499e90271e47a2dd97f75a2a809caf32a0a0ceaf28c2475bf707017009f8bf9aa7fcef36cb4386b08311998b51d7122cefea +DIST guvcview-src-2.2.2.tar.bz2 363756 BLAKE2B dbd0459f44482fd06cdb79dc2433df4a9401968ca62875e90b9ac37d461fa23eb3ddb0fe3d8b072768b72bbccbc371bcf9e3bde5c780d2a4aadef9d72c034559 SHA512 2d4e8d4dbf4d8135b8977bcd524e373e99dea4df1ffbe8f258952809c8d84473ae7dd6c37dd11552c89f6db72d43802972088ae6568290cae8d7fc287c1e0491 diff --git a/media-video/guvcview/files/guvcview-2.2.2-musl.patch b/media-video/guvcview/files/guvcview-2.2.2-musl.patch new file mode 100644 index 000000000000..ee7df3de0421 --- /dev/null +++ b/media-video/guvcview/files/guvcview-2.2.2-musl.patch @@ -0,0 +1,92 @@ +--- a/gview_audio/gviewaudio.h ++++ b/gview_audio/gviewaudio.h +@@ -39,7 +39,9 @@ + #include <sys/types.h> + + /*make sure we support c++*/ +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /*Audio API*/ + #define AUDIO_NONE (0) +@@ -369,6 +371,8 @@ int audio_stop(audio_context_t *audio_ctx); + */ + void audio_close(audio_context_t *audio_ctx); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif +--- a/gview_encoder/gviewencoder.h ++++ b/gview_encoder/gviewencoder.h +@@ -38,7 +38,9 @@ + #include <sys/types.h> + + /*make sure we support c++*/ +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /*encoder modes*/ + #define ENCODER_MODE_NONE (0) +@@ -717,6 +719,8 @@ int encoder_write_audio_data(encoder_context_t *encoder_ctx); + */ + int encoder_disk_supervisor(int treshold, const char *path); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif +--- a/gview_render/gviewrender.h ++++ b/gview_render/gviewrender.h +@@ -38,7 +38,9 @@ + #include <sys/types.h> + + /*make sure we support c++*/ +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + #define RENDER_NONE (0) + #define RENDER_SDL (1) +@@ -361,6 +363,8 @@ void render_clean_fx(); + */ + void render_close(); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif +--- a/gview_v4l2core/gviewv4l2core.h ++++ b/gview_v4l2core/gviewv4l2core.h +@@ -33,7 +33,9 @@ + #include <sys/types.h> + + /*make sure we support c++*/ +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /* + * LOGITECH Dynamic controls defs +@@ -1416,6 +1418,8 @@ int v4l2core_save_image(v4l2_frame_buff_t *frame, const char *filename, + */ + uint64_t v4l2core_time_get_timestamp(); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif diff --git a/media-video/guvcview/guvcview-2.2.2.ebuild b/media-video/guvcview/guvcview-2.2.2.ebuild new file mode 100644 index 000000000000..fd75b3541c5d --- /dev/null +++ b/media-video/guvcview/guvcview-2.2.2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Simple Qt6 or GTK+3 interface for capturing and viewing video from v4l2 devices" +HOMEPAGE="https://guvcview.sourceforge.net/"; +SRC_URI="https://downloads.sourceforge.net/project/${PN}/source/${PN}-src-${PV}.tar.bz2"; +S="${WORKDIR}/${PN}-src-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gsl pulseaudio qt6 sfml" + +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + media-libs/libpng:= + media-libs/libv4l + media-libs/portaudio + media-video/ffmpeg:= + virtual/libusb:1 + virtual/udev + gsl? ( sci-libs/gsl:= ) + pulseaudio? ( media-libs/libpulse ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + !qt6? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + sfml? ( + media-libs/libglvnd + >=media-libs/libsfml-3:= + ) + !sfml? ( media-libs/libsdl2 ) +" +# linux-headers: bug 448260 +DEPEND=" + ${RDEPEND} + virtual/os-headers + !qt6? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-set-metainfo-dir.patch + "${FILESDIR}"/${PN}-2.2.2-musl.patch +) + +src_prepare() { + use gsl || sed -i /pkg.check.modules.GSL/d gview_render/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_DEVKIT=ON + -DUSE_DEBIANMENU=OFF + -DUSE_PULSE=$(usex pulseaudio) + -DUSE_GTK3=$(usex !qt6) + -DUSE_QT6=$(usex qt6) + -DUSE_SDL2=$(usex !sfml) + -DUSE_SFML=$(usex sfml) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + gunzip "${ED}"/usr/share/man/man1/guvcview.1.gz || die +}
