diff options
Diffstat (limited to 'multimedia/guvcview/files')
8 files changed, 171 insertions, 0 deletions
diff --git a/multimedia/guvcview/files/patch-guvcview_guvcview.c b/multimedia/guvcview/files/patch-guvcview_guvcview.c new file mode 100644 index 000000000000..6a77e654b7ae --- /dev/null +++ b/multimedia/guvcview/files/patch-guvcview_guvcview.c @@ -0,0 +1,31 @@ +--- guvcview/guvcview.c.orig 2024-11-02 13:15:33 UTC ++++ guvcview/guvcview.c +@@ -28,6 +28,7 @@ + #include <sys/resource.h> + #include <sys/stat.h> + #include <sys/syscall.h> ++#include <pthread_np.h> + #include <unistd.h> + + #include "config.h" +@@ -226,8 +227,8 @@ int main(int argc, char *argv[]) { + #endif + + if (debug_level > 1) +- printf("GUVCVIEW: main thread (tid: %u)\n", +- (unsigned int)syscall(SYS_gettid)); ++ printf("GUVCVIEW: main thread (tid: %d)\n", ++ pthread_getthreadid_np()); + + /*set the v4l2 core verbosity*/ + v4l2core_set_verbosity(debug_level); +@@ -393,8 +394,7 @@ int main(int argc, char *argv[]) { + gui_error("Guvcview error", "could not start the video capture thread", + 1); + } else if (debug_level > 2) +- printf("GUVCVIEW: created capture thread with tid: %u\n", +- (unsigned int)capture_thread); ++ printf("GUVCVIEW: created capture thread\n"); + + struct timespec now; + clock_gettime(CLOCK_REALTIME, &now); diff --git a/multimedia/guvcview/files/patch-guvcview_video__capture.c b/multimedia/guvcview/files/patch-guvcview_video__capture.c new file mode 100644 index 000000000000..2effe5e75b70 --- /dev/null +++ b/multimedia/guvcview/files/patch-guvcview_video__capture.c @@ -0,0 +1,71 @@ +i+--- 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 <libintl.h> + #include <locale.h> ++#include <pthread_np.h> + + #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) { + encoder_context_t *encoder_ctx = (encoder_context_t *)data; + + if (debug_level > 1) +- printf("GUVCVIEW: audio thread (tid: %u)\n", +- (unsigned int)syscall(SYS_gettid)); ++ printf("GUVCVIEW: audio thread (tid: %d)\n", ++ pthread_getthreadid_np()); + + audio_context_t *audio_ctx = get_audio_context(); + if (!audio_ctx) { +@@ -717,8 +719,8 @@ static void *encoder_loop(void *data) { + my_encoder_status = 1; + + if (debug_level > 1) +- printf("GUVCVIEW: encoder thread (tid: %u)\n", +- (unsigned int)syscall(SYS_gettid)); ++ printf("GUVCVIEW: encoder thread (tid: %d)\n", ++ pthread_getthreadid_np()); + + /*get the audio context*/ + audio_context_t *audio_ctx = get_audio_context(); +@@ -830,8 +832,7 @@ static void *encoder_loop(void *data) { + fprintf(stderr, "GUVCVIEW: encoder audio thread creation failed (%i)\n", + ret); + else if (debug_level > 2) +- printf("GUVCVIEW: created audio encoder thread with tid: %u\n", +- (unsigned int)encoder_audio_thread); ++ printf("GUVCVIEW: created audio encoder thread\n"); + } + + while (video_capture_get_save_video()) { +@@ -914,8 +915,8 @@ void *capture_loop(void *data) { + quit = 0; + + if (debug_level > 1) +- printf("GUVCVIEW: capture thread (tid: %u)\n", +- (unsigned int)syscall(SYS_gettid)); ++ printf("GUVCVIEW: capture thread (tid: %d)\n", ++ pthread_getthreadid_np()); + + int ret = 0; + +@@ -1210,8 +1211,7 @@ int start_encoder_thread() { + if (ret) + fprintf(stderr, "GUVCVIEW: encoder thread creation failed (%i)\n", ret); + else if (debug_level > 2) +- printf("GUVCVIEW: created encoder thread with tid: %u\n", +- (unsigned int)encoder_thread); ++ printf("GUVCVIEW: created encoder thread\n"); + + return ret; + } diff --git a/multimedia/guvcview/files/patch-gview__audio_gviewaudio.h b/multimedia/guvcview/files/patch-gview__audio_gviewaudio.h new file mode 100644 index 000000000000..c4832a643fbf --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__audio_gviewaudio.h @@ -0,0 +1,11 @@ +--- gview_audio/gviewaudio.h.orig 2025-05-30 18:37:32 UTC ++++ gview_audio/gviewaudio.h +@@ -32,8 +32,6 @@ + #ifndef GVIEWAUDIO_H + #define GVIEWAUDIO_H + +-#include <features.h> +- + #include <inttypes.h> + #include <pthread.h> + #include <sys/types.h> diff --git a/multimedia/guvcview/files/patch-gview__encoder_gviewencoder.h b/multimedia/guvcview/files/patch-gview__encoder_gviewencoder.h new file mode 100644 index 000000000000..4539de241cd4 --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__encoder_gviewencoder.h @@ -0,0 +1,11 @@ +--- gview_encoder/gviewencoder.h.orig 2025-05-30 18:38:22 UTC ++++ gview_encoder/gviewencoder.h +@@ -32,8 +32,6 @@ + #ifndef GVIEWENCODER_H + #define GVIEWENCODER_H + +-#include <features.h> +- + #include <inttypes.h> + #include <sys/types.h> + diff --git a/multimedia/guvcview/files/patch-gview__encoder_muxer.c b/multimedia/guvcview/files/patch-gview__encoder_muxer.c new file mode 100644 index 000000000000..ecb8e788bcb1 --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__encoder_muxer.c @@ -0,0 +1,11 @@ +--- gview_encoder/muxer.c.orig 2024-11-02 13:15:33 UTC ++++ gview_encoder/muxer.c +@@ -30,7 +30,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13 + #include <unistd.h> + // #include <errno.h> + #include <assert.h> +-#include <sys/statfs.h> ++#include <sys/mount.h> + /* support for internationalization - i18n */ + #include <libintl.h> + #include <locale.h> diff --git a/multimedia/guvcview/files/patch-gview__render_gviewrender.h b/multimedia/guvcview/files/patch-gview__render_gviewrender.h new file mode 100644 index 000000000000..7b740ffd3b57 --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__render_gviewrender.h @@ -0,0 +1,11 @@ +--- gview_render/gviewrender.h.orig 2025-05-30 18:38:11 UTC ++++ gview_render/gviewrender.h +@@ -32,8 +32,6 @@ + #ifndef GVIEWRENDER_H + #define GVIEWRENDER_H + +-#include <features.h> +- + #include <inttypes.h> + #include <sys/types.h> + diff --git a/multimedia/guvcview/files/patch-gview__v4l2core_gviewv4l2core.h b/multimedia/guvcview/files/patch-gview__v4l2core_gviewv4l2core.h new file mode 100644 index 000000000000..92109f29a5e9 --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__v4l2core_gviewv4l2core.h @@ -0,0 +1,11 @@ +--- gview_v4l2core/gviewv4l2core.h.orig 2025-05-30 18:37:59 UTC ++++ gview_v4l2core/gviewv4l2core.h +@@ -22,8 +22,6 @@ + #ifndef GVIEWV4L2CORE_H + #define GVIEWV4L2CORE_H + +-#include <features.h> +- + #include <inttypes.h> + #include <libudev.h> + #include <linux/media.h> diff --git a/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c b/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c new file mode 100644 index 000000000000..dd263d52b42f --- /dev/null +++ b/multimedia/guvcview/files/patch-gview__v4l2core_v4l2__core.c @@ -0,0 +1,14 @@ +--- gview_v4l2core/v4l2_core.c.orig 2024-11-02 13:15:33 UTC ++++ gview_v4l2core/v4l2_core.c +@@ -96,9 +96,9 @@ int xioctl(int fd, int IOCTL_X, void *arg) { + int ret = 0; + int tries = IOCTL_RETRY; + do { +- if (!disable_libv4l2) ++/* if (!disable_libv4l2) + ret = v4l2_ioctl(fd, IOCTL_X, arg); +- else ++ else*/ + ret = ioctl(fd, IOCTL_X, arg); + } while (ret && tries-- && + ((errno == EINTR) || (errno == EAGAIN) || (errno == ETIMEDOUT))); |