diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index bf89ae384ee0..126433a421f4 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,50 +1,50 @@ PORTNAME= gphoto2 -PORTVERSION= 2.5.28 +PORTVERSION= 2.5.32 CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} \ https://github.com/gphoto/gphoto2/releases/download/v${PORTVERSION}/ MAINTAINER= danfe@FreeBSD.org COMMENT= Command-line frontend to libgphoto2 WWW= http://www.gphoto.org/proj/gphoto2/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexif.so:graphics/libexif \ libgphoto2.so:graphics/libgphoto2 \ libpopt.so:devel/popt TEST_DEPENDS= gsed:textproc/gsed USES= jpeg pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-cdk TEST_TARGET= check PORTDOCS= AUTHORS ChangeLog NEWS README TODO OPTIONS_DEFINE= AALIB DOCS NLS READLINE THREADS OPTIONS_DEFAULT= AALIB READLINE THREADS OPTIONS_SUB= yes AALIB_DESC= Text mode capture preview support AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_ON= --with-aalib NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls READLINE_USES= readline READLINE_CONFIGURE_OFF= --without-readline THREADS_CONFIGURE_OFF= --without-pthread post-patch: @${REINPLACE_CMD} -e '1s,bash,sh,; /SEDCOMMAND/s,sed,g&,' \ ${WRKSRC}/tests/testsuite post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo index e038f24da397..34aecc2a9f8d 100644 --- a/graphics/gphoto2/distinfo +++ b/graphics/gphoto2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641209289 -SHA256 (gphoto2-2.5.28.tar.xz) = ff3e32c7bd2a129d817dcd9e75ce51834409b1966e1f20e74c427c32ae732afa -SIZE (gphoto2-2.5.28.tar.xz) = 575816 +TIMESTAMP = 1754905186 +SHA256 (gphoto2-2.5.32.tar.xz) = be08a449bbed9613bc9db105997c4ba71410d41870496420359a99b37502c406 +SIZE (gphoto2-2.5.32.tar.xz) = 607452 diff --git a/graphics/gphoto2/files/patch-configure b/graphics/gphoto2/files/patch-configure deleted file mode 100644 index cf6bc47962e0..000000000000 --- a/graphics/gphoto2/files/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.orig 2015-07-05 20:43:09 UTC -+++ configure -@@ -13459,13 +13459,11 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include --extern int _nl_msg_cat_cntr; --extern int *_nl_domain_bindings; - int - main () - { - bindtextdomain ("", ""); --return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings -+return (int) gettext (""); - ; - return 0; - } diff --git a/graphics/gphoto2/files/patch-gphoto2_main.c b/graphics/gphoto2/files/patch-gphoto2_main.c index aba416d2d3a7..58f87b134a24 100644 --- a/graphics/gphoto2/files/patch-gphoto2_main.c +++ b/graphics/gphoto2/files/patch-gphoto2_main.c @@ -1,19 +1,19 @@ ---- gphoto2/main.c.orig 2020-07-02 06:39:33 UTC +--- gphoto2/main.c.orig 2023-12-06 16:21:01 UTC +++ gphoto2/main.c -@@ -1211,14 +1211,14 @@ start_timeout_func (Camera *camera, unsigned int timeo +@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeo pthread_create (&tid, NULL, thread_func, td); -- return (tid); +- return (unsigned int)tid; + return (intptr_t)tid; } static void stop_timeout_func (Camera __unused__ *camera, unsigned int id, void __unused__ *data) { -- pthread_t tid = id; +- pthread_t tid = (pthread_t)id; + pthread_t tid = (pthread_t)(intptr_t)id; pthread_cancel (tid); pthread_join (tid, NULL);