Monday, January 30, 2023

Re: LLVM 15 patch: gphoto2

On Mon, Jan 30, 2023 at 03:07:53PM +0000, Stuart Henderson wrote:
> > https://wxcvbn.org/~jca/build-failures/amd64-clang/2023-01-24/graphics/gphoto2.txt
>
> https://github.com/gphoto/gphoto2/commit/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e
>
> ok?

OK, thanks.

> Index: patches/patch-gphoto2_main_c
> ===================================================================
> RCS file: patches/patch-gphoto2_main_c
> diff -N patches/patch-gphoto2_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-gphoto2_main_c 30 Jan 2023 15:05:34 -0000
> @@ -0,0 +1,26 @@
> +From ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Fri, 2 Sep 2022 12:59:46 -0700
> +Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs
> +
> +Index: gphoto2/main.c
> +--- gphoto2/main.c.orig
> ++++ gphoto2/main.c
> +@@ -1198,7 +1198,7 @@ thread_func (void *data)
> + pthread_cleanup_pop (1);
> + }
> +
> +-static unsigned int
> ++static pthread_t
> + start_timeout_func (Camera *camera, unsigned int timeout,
> + CameraTimeoutFunc func, void __unused__ *data)
> + {
> +@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeo
> + }
> +
> + static void
> +-stop_timeout_func (Camera __unused__ *camera, unsigned int id,
> ++stop_timeout_func (Camera __unused__ *camera, pthread_t id,
> + void __unused__ *data)
> + {
> + pthread_t tid = id;

--
Antoine

No comments:

Post a Comment