Attachment #268418 for bug #293503

View | Details | Raw Unified | Return to bug 293503
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/multimedia/guvcview/Makefile (-2 / +2 lines)
1	PORTNAME= guvcview	1	PORTNAME= guvcview
2	DISTVERSION= 2.2.1	2	DISTVERSION= 2.2.2
3	PORTREVISION= 1	3	PORTREVISION= 1
4	CATEGORIES= multimedia	4	CATEGORIES= multimedia
5	MASTER_SITES= SOURCEFORGE/guvcview/source	5	MASTER_SITES= SOURCEFORGE/guvcview/source
Lines 39-44 PULSEAUDIO_CMAKE_BOOL= USE_PULSE Link Here
39		39
40	post-patch:	40	post-patch:
41	${REINPLACE_CMD} -e 's/FF_/AV_/g' \	41	${REINPLACE_CMD} -e 's/FF_/AV_/g' \
42	${WRKDIR}/guvcview-src-2.2.1/gview_encoder/audio_codecs.c	42	${WRKDIR}/guvcview-src-${DISTVERSION}/gview_encoder/audio_codecs.c
43		43
44	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/guvcview/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1748610514	1	TIMESTAMP = 1772216407
2	SHA256 (guvcview-src-2.2.1.tar.bz2) = d2adc7ce762961e853c3e16b511bad61504492d12f3e2eb7e30da4a2f7ade5af	2	SHA256 (guvcview-src-2.2.2.tar.bz2) = 6a1b1348b99e79da957a0d9e237395a54757a09db7e0c0809f6c30668b69da3b
3	SIZE (guvcview-src-2.2.1.tar.bz2) = 355747	3	SIZE (guvcview-src-2.2.2.tar.bz2) = 363756




--- guvcview/video_capture.c.orig	2024-11-02 13:15:33 UTC
+++ guvcview/video_capture.c
@@ -34,6 +34,7 @@
 /* support for internationalization - i18n */

 
 #include "config.h"
 #include "core_io.h"
@@ -622,8 +623,8 @@ static void *audio_processing_loop(void *data) {
 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) {
   encoder_context_t *encoder_ctx = (encoder_context_t *)data;
 
   if (debug_level > 1)

 
   audio_context_t *audio_ctx = get_audio_context();
   if (!audio_ctx) {
@@ -717,8 +718,8 @@ static void *encoder_loop(void *data) {
   my_encoder_status = 1;
 
   if (debug_level > 1)

 
   /*get the audio context*/
   audio_context_t *audio_ctx = get_audio_context();
@@ -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)

   }
 
   while (video_capture_get_save_video()) {
@@ -914,8 +914,8 @@ void *capture_loop(void *data) {
   quit = 0;
 
   if (debug_level > 1)

 
   int ret = 0;
 
@@ -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)

Lines 1-6 Link Here

(-)b/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c (-2 / +1 lines)
1	--- gview_v4l2core/v4l2_core.c.orig 2024-11-02 13:15:33 UTC	1	--- gview_v4l2core/v4l2_core.c.orig 2024-11-02 13:15:33 UTC
2	+++ gview_v4l2core/v4l2_core.c	2	+++ gview_v4l2core/v4l2_core.c
3	@@ -96,9 +96,9 @@ int xioctl(int fd, int IOCTL_X, void *arg) {	3	@@ -97,9 +97,9 @@ int xioctl(int fd, int IOCTL_X, void *arg) {
4	int ret = 0;	4	int ret = 0;
5	int tries = IOCTL_RETRY;	5	int tries = IOCTL_RETRY;
6	do {	6	do {
7	-

Return to bug 293503

Lines 1-4 Link Here

(-)b/multimedia/guvcview/files/patch-guvcview_video__capture.c (-14 / +6 lines)
1	i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC	1	--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC
2	+++ guvcview/video_capture.c	2	+++ guvcview/video_capture.c
3	@@ -34,6 +34,7 @@	3	@@ -34,6 +34,7 @@
4	/* support for internationalization - i18n */	4	/* support for internationalization - i18n */
Lines 8-22 i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC Link Here
8		8
9	#include "config.h"	9	#include "config.h"
10	#include "core_io.h"	10	#include "core_io.h"
11	@@ -82,6 +83,7 @@ static __THREAD_TYPE encoder_thread;	11	@@ -622,8 +623,8 @@ static void audio_processing_loop(void data) {
12	static v4l2_dev_t *my_vd = NULL;
13
14	static __THREAD_TYPE encoder_thread;
15	+static __THREAD_TYPE encoder_audio_thread;
16
17	static int my_encoder_status = 0;
18
19	@@ -622,8 +624,8 @@ static void audio_processing_loop(void data) {
20	encoder_context_t encoder_ctx = (encoder_context_t )data;	12	encoder_context_t encoder_ctx = (encoder_context_t )data;
21		13
22	if (debug_level > 1)	14	if (debug_level > 1)
Lines 27-33 i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC Link Here
27		19
28	audio_context_t *audio_ctx = get_audio_context();	20	audio_context_t *audio_ctx = get_audio_context();
29	if (!audio_ctx) {	21	if (!audio_ctx) {
30	@@ -717,8 +719,8 @@ static void encoder_loop(void data) {	22	@@ -717,8 +718,8 @@ static void encoder_loop(void data) {
31	my_encoder_status = 1;	23	my_encoder_status = 1;
32		24
33	if (debug_level > 1)	25	if (debug_level > 1)
Lines 38-44 i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC Link Here
38		30
39	/get the audio context/	31	/get the audio context/
40	audio_context_t *audio_ctx = get_audio_context();	32	audio_context_t *audio_ctx = get_audio_context();
41	@@ -830,8 +832,7 @@ static void encoder_loop(void data) {	33	@@ -830,8 +831,7 @@ static void encoder_loop(void data) {
42	fprintf(stderr, "GUVCVIEW: encoder audio thread creation failed (%i)\n",	34	fprintf(stderr, "GUVCVIEW: encoder audio thread creation failed (%i)\n",
43	ret);	35	ret);
44	else if (debug_level > 2)	36	else if (debug_level > 2)
Lines 48-54 i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC Link Here
48	}	40	}
49		41
50	while (video_capture_get_save_video()) {	42	while (video_capture_get_save_video()) {
51	@@ -914,8 +915,8 @@ void capture_loop(void data) {	43	@@ -914,8 +914,8 @@ void capture_loop(void data) {
52	quit = 0;	44	quit = 0;
53		45
54	if (debug_level > 1)	46	if (debug_level > 1)
Lines 59-65 i+--- guvcview/video_capture.c.orig 2024-11-02 13:15:33 UTC Link Here
59		51
60	int ret = 0;	52	int ret = 0;
61		53
62	@@ -1210,8 +1211,7 @@ int start_encoder_thread() {	54	@@ -1209,8 +1209,7 @@ int start_encoder_thread() {
63	if (ret)	55	if (ret)
64	fprintf(stderr, "GUVCVIEW: encoder thread creation failed (%i)\n", ret);	56	fprintf(stderr, "GUVCVIEW: encoder thread creation failed (%i)\n", ret);
65	else if (debug_level > 2)	57	else if (debug_level > 2)