CVS commit: pkgsrc/devel/libgphoto2

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 19 09:58:13 UTC 2024

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

Log Message:
libgphoto2: add workaround for PR 56666 and PR 58048

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/devel/libgphoto2/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/libgphoto2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_libusb1_libusb1.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.82 pkgsrc/devel/libgphoto2/Makefile:1.83
--- pkgsrc/devel/libgphoto2/Makefile:1.82       Wed Nov  8 13:18:54 2023
+++ pkgsrc/devel/libgphoto2/Makefile    Tue Mar 19 09:58:13 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2023/11/08 13:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2024/03/19 09:58:13 wiz Exp $
 
 DISTNAME=      libgphoto2-2.5.27
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    devel graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/libgphoto2/distinfo
diff -u pkgsrc/devel/libgphoto2/distinfo:1.34 pkgsrc/devel/libgphoto2/distinfo:1.35
--- pkgsrc/devel/libgphoto2/distinfo:1.34       Mon Apr 25 22:23:00 2022
+++ pkgsrc/devel/libgphoto2/distinfo    Tue Mar 19 09:58:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2022/04/25 22:23:00 tnn Exp $
+$NetBSD: distinfo,v 1.35 2024/03/19 09:58:13 wiz Exp $
 
 BLAKE2s (libgphoto2-2.5.27.tar.bz2) = 72792ee75469585fd918c8e2f2430f0523889a9e5340d8e11118aab4e2c636f1
 SHA512 (libgphoto2-2.5.27.tar.bz2) = 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
@@ -17,4 +17,5 @@ SHA1 (patch-camlibs_panasonic_coolshot_l
 SHA1 (patch-camlibs_sipix_blink2.c) = 746f857e30bf5d97b47c9a2b36b91f4ee54fe04a
 SHA1 (patch-camlibs_st2205_st2205.c) = c4830f6ce5ec44fae7493349e5cb5cd3d934ec4e
 SHA1 (patch-libgphoto2__port_gphoto2_gphoto2-port-portability.h) = 9f62a7c4213f8be273b6da7b2cbbd1f68e697631
+SHA1 (patch-libgphoto2__port_libusb1_libusb1.c) = a10439da771c2d8e74297787fadc18712487fea2
 SHA1 (patch-libgphoto2_gphoto2-file.c) = b0be6988f8452836cd79798fd7c65376f2c7c0e0

Added files:

Index: pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_libusb1_libusb1.c
diff -u /dev/null pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_libusb1_libusb1.c:1.1
--- /dev/null   Tue Mar 19 09:58:13 2024
+++ pkgsrc/devel/libgphoto2/patches/patch-libgphoto2__port_libusb1_libusb1.c    Tue Mar 19 09:58:13 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgphoto2__port_libusb1_libusb1.c,v 1.1 2024/03/19 09:58:13 wiz Exp $
+
+Workaround for PR 56666 and PR 58048.
+"gp_port_set_error [gphoto2-port.c:1190](0): Could not query kernel driver of device."
+
+--- libgphoto2_port/libusb1/libusb1.c.orig     2024-03-19 09:54:46.384960053 +0000
++++ libgphoto2_port/libusb1/libusb1.c
+@@ -699,6 +699,10 @@ gp_libusb1_queue_interrupt_urbs (GPPort 
+       unsigned int i;
+       int ret = 0;
+ 
++#ifdef __NetBSD__
++      return 0; /* not working yet */
++#endif
++
+       /* no interrupt endpoint */
+       if (port->settings.usb.intep == -1)
+               return GP_OK;