diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch deleted file mode 100644 index e0c3de469a..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 1 Mar 2023 22:58:37 -0800 -Subject: [PATCH] Match prototypes of callbacks with libgphoto - -In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e -we tried to fix by using pthread_t but it also needs to make changes in -libgphoto and these changes can be invasive, therefore lets revert to -older types and to fix musl problem fix it via type casts - -Upstream-Status: Backport [https://github.com/gphoto/gphoto2/pull/569] -Signed-off-by: Khem Raj ---- - gphoto2/main.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gphoto2/main.c b/gphoto2/main.c -index 0dac947..cd3c990 100644 ---- a/gphoto2/main.c -+++ b/gphoto2/main.c -@@ -1198,7 +1198,7 @@ thread_func (void *data) - pthread_cleanup_pop (1); - } - --static pthread_t -+static unsigned int - start_timeout_func (Camera *camera, unsigned int timeout, - CameraTimeoutFunc func, void __unused__ *data) - { -@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, - - pthread_create (&tid, NULL, thread_func, td); - -- return (tid); -+ return (unsigned int)tid; - } - - static void --stop_timeout_func (Camera __unused__ *camera, pthread_t id, -+stop_timeout_func (Camera __unused__ *camera, unsigned int id, - void __unused__ *data) - { -- pthread_t tid = id; -+ pthread_t tid = (pthread_t)id; - - pthread_cancel (tid); - pthread_join (tid, NULL); --- -2.39.2 - diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch index 3d54d58e18..bd916e339a 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch @@ -14,13 +14,13 @@ Signed-off-by: Khem Raj --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,9 @@ AC_PROG_INSTALL - AC_SYS_LARGEFILE + ]) - GP_CONFIG_MSG([Compiler],[${CC}]) --AC_DEFINE_UNQUOTED([HAVE_CC],"$CC",[The C compiler we're using]) + GP_CONFIG_MSG([Compiler], [${CC}]) +-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], [The C compiler we are using]) +CC_NO_SYSROOT=`echo $CC | sed -e \ + 's|--sysroot=.*\b||g'` -+AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we're using]) ++AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], [The C compiler we are using]) dnl AC_STRUCT_TIMEZONE diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 14976ffb72..358dbbb51a 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -14,10 +14,10 @@ Upstream-Status: Pending --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ dnl i18n support - dnl --------------------------------------------------------------------------- - GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) - ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" + GP_GETTEXT_SETUP([GETTEXT_PACKAGE_GPHOTO2], + [gphoto2], + [po]) -AM_PO_SUBDIRS() - AM_GNU_GETTEXT_VERSION([0.14.1]) + AM_GNU_GETTEXT_VERSION([0.19.1]) AM_GNU_GETTEXT([external]) AM_ICONV() diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch deleted file mode 100644 index a27c02cefc..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 2 Sep 2022 12:59:46 -0700 -Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs - -This is not a plain old datatype in every libc, e.g. with musl this -would fail in type conversion - -Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535] -Signed-off-by: Khem Raj ---- - gphoto2/main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gphoto2/main.c b/gphoto2/main.c -index 2bf5964..9a6b05d 100644 ---- a/gphoto2/main.c -+++ b/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 timeout, - } - - 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; --- -2.37.3 - diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb similarity index 70% rename from meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb rename to meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb index 40409ed388..e5e7c6926f 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.32.bb @@ -8,11 +8,9 @@ RDEPENDS:gphoto2 = "libgphoto2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.bz2;name=gphoto2 \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ - file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \ - file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \ file://0001-configure-Filter-out-buildpaths-from-CC.patch \ " -SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375" +SRC_URI[gphoto2.sha256sum] = "4e379a0f12f72b49ee5ee2283ffd806b5d12d099939d75197a3f4bbc7f27a1a1" inherit autotools pkgconfig gettext