multimedia/guvcview: Update 2.2.1 => 2.2.2

Changelog:
 * Apply ffmpeg8 and musl patches by Paul Zander <negril.nx+gentoo@...>;
   add sfml3 fixes
 * update to SFML 3.0
 * Fix some spelling errors
 * Add support for OBSMEET4K by Sam Liddicott
https://sourceforge.net/p/guvcview/git-master/ci/v2.2.2/tree/ChangeLog

- Remove workaround for ffmpeg8 support - upstream implemented it.
- Refresh patches.

PR:	293503

4 files changed, 12 insertions, 25 deletions

diff --git a/multimedia/guvcview/Makefile b/multimedia/guvcview/Makefile
index 80248e7e9779..8e99c739c8a4 100644
--- a/multimedia/guvcview/Makefile
+++ b/multimedia/guvcview/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	guvcview
-DISTVERSION=	2.2.1
-PORTREVISION=	2
+DISTVERSION=	2.2.2
 CATEGORIES=	multimedia
 MASTER_SITES=	SOURCEFORGE/guvcview/source
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
@@ -37,8 +36,4 @@ PULSEAUDIO_BROKEN=	Doesn't show up as an audio backend at runtime
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
-post-patch:
-	${REINPLACE_CMD} -e 's/FF_/AV_/g' \
-		${WRKDIR}/guvcview-src-2.2.1/gview_encoder/audio_codecs.c
-
 .include <bsd.port.mk>
diff --git a/multimedia/guvcview/distinfo b/multimedia/guvcview/distinfo
index 890ef8dda756..5d05dfa704e0 100644
--- a/multimedia/guvcview/distinfo
+++ b/multimedia/guvcview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748610514
-SHA256 (guvcview-src-2.2.1.tar.bz2) = d2adc7ce762961e853c3e16b511bad61504492d12f3e2eb7e30da4a2f7ade5af
-SIZE (guvcview-src-2.2.1.tar.bz2) = 355747
+TIMESTAMP = 1772216407
+SHA256 (guvcview-src-2.2.2.tar.bz2) = 6a1b1348b99e79da957a0d9e237395a54757a09db7e0c0809f6c30668b69da3b
+SIZE (guvcview-src-2.2.2.tar.bz2) = 363756
diff --git a/multimedia/guvcview/files/patch-guvcview_video__capture.c b/multimedia/guvcview/files/patch-guvcview_video__capture.c
index 2effe5e75b70..08509c32886a 100644
--- a/multimedia/guvcview/files/patch-guvcview_video__capture.c
+++ b/multimedia/guvcview/files/patch-guvcview_video__capture.c
@@ -1,4 +1,4 @@
-i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
+--- guvcview/video_capture.c.orig	2025-11-09 18:30:53 UTC
 +++ guvcview/video_capture.c
 @@ -34,6 +34,7 @@
  /* support for internationalization - i18n */
@@ -8,15 +8,7 @@ i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
  
  #include "config.h"
  #include "core_io.h"
-@@ -82,6 +83,7 @@ static __THREAD_TYPE encoder_thread;
- static v4l2_dev_t *my_vd = NULL;
- 
- static __THREAD_TYPE encoder_thread;
-+static __THREAD_TYPE encoder_audio_thread;
- 
- static int my_encoder_status = 0;
- 
-@@ -622,8 +624,8 @@ static void *audio_processing_loop(void *data) {
+@@ -622,8 +623,8 @@ static void *audio_processing_loop(void *data) {
    encoder_context_t *encoder_ctx = (encoder_context_t *)data;
  
    if (debug_level > 1)
@@ -27,7 +19,7 @@ i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
  
    audio_context_t *audio_ctx = get_audio_context();
    if (!audio_ctx) {
-@@ -717,8 +719,8 @@ static void *encoder_loop(void *data) {
+@@ -717,8 +718,8 @@ static void *encoder_loop(void *data) {
    my_encoder_status = 1;
  
    if (debug_level > 1)
@@ -38,7 +30,7 @@ i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
  
    /*get the audio context*/
    audio_context_t *audio_ctx = get_audio_context();
-@@ -830,8 +832,7 @@ static void *encoder_loop(void *data) {
+@@ -830,8 +831,7 @@ static void *encoder_loop(void *data) {
        fprintf(stderr, "GUVCVIEW: encoder audio thread creation failed (%i)\n",
                ret);
      else if (debug_level > 2)
@@ -48,7 +40,7 @@ i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
    }
  
    while (video_capture_get_save_video()) {
-@@ -914,8 +915,8 @@ void *capture_loop(void *data) {
+@@ -914,8 +914,8 @@ void *capture_loop(void *data) {
    quit = 0;
  
    if (debug_level > 1)
@@ -59,7 +51,7 @@ i+--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
  
    int ret = 0;
  
-@@ -1210,8 +1211,7 @@ int start_encoder_thread() {
+@@ -1209,8 +1209,7 @@ int start_encoder_thread() {
    if (ret)
      fprintf(stderr, "GUVCVIEW: encoder thread creation failed (%i)\n", ret);
    else if (debug_level > 2)
diff --git a/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c b/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c
index dd263d52b42f..78680db04ed2 100644
--- a/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c
+++ b/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c
@@ -1,6 +1,6 @@
---- gview_v4l2core/v4l2_core.c.orig	2024-11-02 13:15:33 UTC
+--- gview_v4l2core/v4l2_core.c.orig	2025-11-09 18:30:53 UTC
 +++ gview_v4l2core/v4l2_core.c
-@@ -96,9 +96,9 @@ int xioctl(int fd, int IOCTL_X, void *arg) {
+@@ -97,9 +97,9 @@ int xioctl(int fd, int IOCTL_X, void *arg) {
    int ret = 0;
    int tries = IOCTL_RETRY;
    do {