CVS commit: pkgsrc/devel/libgphoto2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct  7 11:36:53 UTC 2025

Modified Files:
        pkgsrc/devel/libgphoto2: Makefile distinfo
Added Files:
        pkgsrc/devel/libgphoto2/patches: patch-camlibs_ptp2_fujiptpip.c
            patch-camlibs_ptp2_ptpip.c

Log Message:
libgphoto2: fix build with gcc 14.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/devel/libgphoto2/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/libgphoto2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_fujiptpip.c \
    pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_ptpip.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libgphoto2/Makefile
diff -u pkgsrc/devel/libgphoto2/Makefile:1.93 pkgsrc/devel/libgphoto2/Makefile:1.94
--- pkgsrc/devel/libgphoto2/Makefile:1.93       Sun Oct  5 19:25:50 2025
+++ pkgsrc/devel/libgphoto2/Makefile    Tue Oct  7 11:36:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2025/10/05 19:25:50 js Exp $
+# $NetBSD: Makefile,v 1.94 2025/10/07 11:36:53 wiz Exp $
 
 DISTNAME=      libgphoto2-2.5.31
 PKGREVISION=   7
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=      --with-gdlib=no
 CONFIGURE_ARGS+=       --with-camlibs=standard,outdated
 PKGCONFIG_OVERRIDE+=   libgphoto2.pc.in libgphoto2_port/libgphoto2_port.pc.in
 TEST_TARGET=           check
+CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
 REPLACE_SH=            packaging/generic/check-ptp-camera
 

Index: pkgsrc/devel/libgphoto2/distinfo
diff -u pkgsrc/devel/libgphoto2/distinfo:1.36 pkgsrc/devel/libgphoto2/distinfo:1.37
--- pkgsrc/devel/libgphoto2/distinfo:1.36       Mon Jul 22 11:11:45 2024
+++ pkgsrc/devel/libgphoto2/distinfo    Tue Oct  7 11:36:53 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2024/07/22 11:11:45 adam Exp $
+$NetBSD: distinfo,v 1.37 2025/10/07 11:36:53 wiz Exp $
 
 BLAKE2s (libgphoto2-2.5.31.tar.xz) = c2c721259aff18017ec3e24362a33a30094d10d0c7e618ad5e51b66c1f936cfe
 SHA512 (libgphoto2-2.5.31.tar.xz) = 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f
@@ -14,6 +14,8 @@ SHA1 (patch-camlibs_jl2005c_jpeg__memsrc
 SHA1 (patch-camlibs_kodak_dc120_dc120.c) = b49d935069ae5c23fb9cedc8bde58c679e59d774
 SHA1 (patch-camlibs_kodak_dc120_library.c) = d68a378bb2c6973d9a05a5fef563527bcefdfe33
 SHA1 (patch-camlibs_panasonic_coolshot_library.c) = ec11dfa52d994d9f0590b8bbc3d747af7213f012
+SHA1 (patch-camlibs_ptp2_fujiptpip.c) = 00372e637b68d3963811ad3e25967852db9cdea3
+SHA1 (patch-camlibs_ptp2_ptpip.c) = 57d8aa998c715c4ebec8ecfb4d4eb74601349a75
 SHA1 (patch-camlibs_sipix_blink2.c) = 746f857e30bf5d97b47c9a2b36b91f4ee54fe04a
 SHA1 (patch-camlibs_st2205_st2205.c) = c4830f6ce5ec44fae7493349e5cb5cd3d934ec4e
 SHA1 (patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h) = 9f62a7c4213f8be273b6da7b2cbbd1f68e697631

Added files:

Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_fujiptpip.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_fujiptpip.c:1.1
--- /dev/null   Tue Oct  7 11:36:54 2025
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_fujiptpip.c      Tue Oct  7 11:36:53 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-camlibs_ptp2_fujiptpip.c,v 1.1 2025/10/07 11:36:53 wiz Exp $
+
+Add header for inet_aton().
+
+--- camlibs/ptp2/fujiptpip.c.orig      2025-10-07 11:32:25.277585586 +0000
++++ camlibs/ptp2/fujiptpip.c
+@@ -59,6 +59,7 @@
+ # include <winsock2.h>
+ # include <ws2tcpip.h>
+ #else
++# include <arpa/inet.h>
+ # include <sys/socket.h>
+ # include <netinet/in.h>
+ #endif
Index: pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_ptpip.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_ptpip.c:1.1
--- /dev/null   Tue Oct  7 11:36:54 2025
+++ pkgsrc/devel/libgphoto2/patches/patch-camlibs_ptp2_ptpip.c  Tue Oct  7 11:36:53 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-camlibs_ptp2_ptpip.c,v 1.1 2025/10/07 11:36:53 wiz Exp $
+
+Add header for inet_aton().
+
+--- camlibs/ptp2/ptpip.c.orig  2025-10-07 11:31:46.519566717 +0000
++++ camlibs/ptp2/ptpip.c
+@@ -49,6 +49,7 @@
+ # include <ws2tcpip.h>
+ #else
+ # include <sys/socket.h>
++# include <arpa/inet.h>
+ # include <netinet/in.h>
+ # include <fcntl.h>
+ #endif