From 74c1c9855729e92cfc1eed4fca26ba25fb843aed Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 8 Dec 2008 14:20:10 +0000 Subject: [PATCH] - update libgphoto to version 2.4.3 this is a maintenance release ok espie@ --- graphics/libgphoto2/Makefile | 7 ++++--- graphics/libgphoto2/distinfo | 10 +++++----- graphics/libgphoto2/patches/patch-Makefile_in | 13 +++++++------ .../libgphoto2/patches/patch-camlibs_canon_usb_c | 8 ++++---- graphics/libgphoto2/patches/patch-configure | 8 ++++---- .../patches/patch-libgphoto2_port_Makefile_in | 8 ++++---- .../patches/patch-libgphoto2_port_configure | 8 ++++---- ...bgphoto2_port_gphoto2_gphoto2-port-portability_h | 10 +++++----- graphics/libgphoto2/patches/patch-tests_Makefile_in | 8 ++++---- graphics/libgphoto2/pkg/PFRAG.shared | 4 +++- graphics/libgphoto2/pkg/PLIST | 11 ++++++++--- 11 files changed, 52 insertions(+), 43 deletions(-) diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 33a564cc34f..6cea92de8b5 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.14 2008/06/18 11:43:39 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2008/12/08 14:20:10 ajacoutot Exp $ COMMENT= digital camera library CATEGORIES= graphics devel MAINTAINER= Marc Espie -VERSION= 2.4.1 +VERSION= 2.4.3 DISTNAME= libgphoto2-${VERSION} PKGNAME= libgphoto-${VERSION} -SHARED_LIBS+= gphoto2 3.0 # 5.0 +SHARED_LIBS+= gphoto2 3.1 # 6.0 SHARED_LIBS+= gphoto2_port 6.0 # 8.0 HOMEPAGE= http://www.gphoto.org/ @@ -20,6 +20,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes + WANTLIB= c m USE_LIBTOOL= Yes diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index 595025c1156..0b03017c304 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,5 +1,5 @@ -MD5 (libgphoto2-2.4.1.tar.gz) = ScEsUgMdpQFT1/vXW0kSTQ== -RMD160 (libgphoto2-2.4.1.tar.gz) = iW2rt69DJ27Nfi6LtQueT/PmvGg= -SHA1 (libgphoto2-2.4.1.tar.gz) = aVcs5xNvQjNIxBKfQtZnT4xhDkA= -SHA256 (libgphoto2-2.4.1.tar.gz) = 6NaxL8rrQvcJ6WsfmVG8zeaRqUa1/tXw3KFY9lt3W7M= -SIZE (libgphoto2-2.4.1.tar.gz) = 4605742 +MD5 (libgphoto2-2.4.3.tar.gz) = 67x/aC4Z8s2fOrtIb3tW+g== +RMD160 (libgphoto2-2.4.3.tar.gz) = 0nFt6LIwcIN+yUzS60eTpQAc1Cc= +SHA1 (libgphoto2-2.4.3.tar.gz) = VR4f5PE13EfhKshOlnZAEfKpeVQ= +SHA256 (libgphoto2-2.4.3.tar.gz) = uRmalw5ekt1S8LBCeORTHcV902r1k/0xQ7aMKoDww9A= +SIZE (libgphoto2-2.4.3.tar.gz) = 6324500 diff --git a/graphics/libgphoto2/patches/patch-Makefile_in b/graphics/libgphoto2/patches/patch-Makefile_in index f4aa84cdd5d..479d7c1f67e 100644 --- a/graphics/libgphoto2/patches/patch-Makefile_in +++ b/graphics/libgphoto2/patches/patch-Makefile_in @@ -1,11 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- Makefile.in.orig Fri Mar 28 21:52:06 2008 -+++ Makefile.in Sat Jun 14 18:43:46 2008 -@@ -300,7 +300,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck. - SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc +$OpenBSD: patch-Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- Makefile.in.orig Tue Nov 11 14:57:04 2008 ++++ Makefile.in Tue Nov 11 14:57:24 2008 +@@ -304,8 +304,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck. + SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc pkgconfig_DATA = libgphoto2.pc noinst_DATA = libgphoto2-uninstalled.pc --doc_DATA = AUTHORS COPYING README NEWS +-doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ +- README.packaging +doc_DATA = README nobase_include_HEADERS = \ gphoto2/gphoto2.h \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c b/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c index 5899cda8c82..73f063aed9a 100644 --- a/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c +++ b/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-camlibs_canon_usb_c,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- camlibs/canon/usb.c.orig Sat Jun 14 18:41:27 2008 -+++ camlibs/canon/usb.c Sat Jun 14 18:41:38 2008 +$OpenBSD: patch-camlibs_canon_usb_c,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- camlibs/canon/usb.c.orig Tue Nov 11 14:57:31 2008 ++++ camlibs/canon/usb.c Tue Nov 11 14:57:46 2008 @@ -72,7 +72,7 @@ /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for * an URB to come back on an interrupt endpoint */ --#define CANON_FAST_TIMEOUT 150 +-#define CANON_FAST_TIMEOUT 175 +#define CANON_FAST_TIMEOUT 750 /* WARNING: This destroys reentrancy of the code. Better to put this diff --git a/graphics/libgphoto2/patches/patch-configure b/graphics/libgphoto2/patches/patch-configure index 5d24d00c1b9..279465f781f 100644 --- a/graphics/libgphoto2/patches/patch-configure +++ b/graphics/libgphoto2/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- configure.orig Fri Mar 28 21:52:10 2008 -+++ configure Sat Jun 14 18:43:46 2008 -@@ -28649,10 +28649,10 @@ MSGFMT!$MSGFMT$ac_delim +$OpenBSD: patch-configure,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- configure.orig Sun Oct 19 14:06:47 2008 ++++ configure Tue Nov 11 14:58:35 2008 +@@ -29174,10 +29174,10 @@ MSGFMT!$MSGFMT$ac_delim GMSGFMT!$GMSGFMT$ac_delim XGETTEXT!$XGETTEXT$ac_delim MSGMERGE!$MSGMERGE$ac_delim diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in index 59a83794ccb..293f611c1c7 100644 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- libgphoto2_port/Makefile.in.orig Mon Mar 24 14:14:13 2008 -+++ libgphoto2_port/Makefile.in Sat Jun 14 18:43:46 2008 -@@ -760,7 +760,7 @@ info: info-recursive +$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- libgphoto2_port/Makefile.in.orig Sat Oct 4 20:25:18 2008 ++++ libgphoto2_port/Makefile.in Tue Nov 11 14:58:36 2008 +@@ -768,7 +768,7 @@ info: info-recursive info-am: diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_configure b/graphics/libgphoto2/patches/patch-libgphoto2_port_configure index 79c5591d169..97decf212cd 100644 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_configure +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-libgphoto2_port_configure,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- libgphoto2_port/configure.orig Mon Mar 24 14:14:14 2008 -+++ libgphoto2_port/configure Sat Jun 14 18:43:47 2008 -@@ -27735,10 +27735,10 @@ MSGFMT!$MSGFMT$ac_delim +$OpenBSD: patch-libgphoto2_port_configure,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- libgphoto2_port/configure.orig Sat Oct 4 20:25:14 2008 ++++ libgphoto2_port/configure Tue Nov 11 14:58:37 2008 +@@ -28127,10 +28127,10 @@ MSGFMT!$MSGFMT$ac_delim GMSGFMT!$GMSGFMT$ac_delim XGETTEXT!$XGETTEXT$ac_delim MSGMERGE!$MSGMERGE$ac_delim diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h b/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h index ef1f47a1daf..eeb08a0d122 100644 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ ---- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig Thu Oct 11 12:31:39 2007 -+++ libgphoto2_port/gphoto2/gphoto2-port-portability.h Thu Oct 11 12:33:11 2007 -@@ -151,6 +151,7 @@ typedef struct { +$OpenBSD: patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h,v 1.2 2008/12/08 14:20:10 ajacoutot Exp $ +--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig Sun Jul 13 22:11:11 2008 ++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h Tue Nov 11 14:58:37 2008 +@@ -153,6 +153,7 @@ typedef struct { /* yummy. :) */ /* XOPEN needed for usleep */ @@ -9,7 +9,7 @@ $OpenBSD: patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h,v 1.1 2007/10 #ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 500 #else -@@ -159,11 +160,14 @@ typedef struct { +@@ -161,11 +162,14 @@ typedef struct { # define _XOPEN_SOURCE 500 # endif #endif diff --git a/graphics/libgphoto2/patches/patch-tests_Makefile_in b/graphics/libgphoto2/patches/patch-tests_Makefile_in index 4621b777631..595592c6089 100644 --- a/graphics/libgphoto2/patches/patch-tests_Makefile_in +++ b/graphics/libgphoto2/patches/patch-tests_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tests_Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ ---- tests/Makefile.in.orig Fri Mar 28 21:52:06 2008 -+++ tests/Makefile.in Sat Jun 14 18:43:47 2008 -@@ -352,9 +352,9 @@ test_camera_list_LDADD = \ +$OpenBSD: patch-tests_Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $ +--- tests/Makefile.in.orig Sun Oct 19 14:06:45 2008 ++++ tests/Makefile.in Tue Nov 11 14:58:37 2008 +@@ -355,9 +355,9 @@ test_camera_list_LDADD = \ $(INTLLIBS) @HAVE_GCC_FALSE@PEDANTIC_CFLAGS = diff --git a/graphics/libgphoto2/pkg/PFRAG.shared b/graphics/libgphoto2/pkg/PFRAG.shared index 5fc20050480..848e7d3809d 100644 --- a/graphics/libgphoto2/pkg/PFRAG.shared +++ b/graphics/libgphoto2/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2007/10/19 12:57:52 ajacoutot Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.8 2008/12/08 14:20:10 ajacoutot Exp $ @lib lib/libgphoto2.so.${LIBgphoto2_VERSION} lib/libgphoto2/${VERSION}/adc65.so lib/libgphoto2/${VERSION}/agfa_cl20.so @@ -19,6 +19,7 @@ lib/libgphoto2/${VERSION}/hp215.so lib/libgphoto2/${VERSION}/iclick.so lib/libgphoto2/${VERSION}/jamcam.so lib/libgphoto2/${VERSION}/jd11.so +lib/libgphoto2/${VERSION}/jl2005a.so lib/libgphoto2/${VERSION}/kodak_dc120.so lib/libgphoto2/${VERSION}/kodak_dc210.so lib/libgphoto2/${VERSION}/kodak_dc240.so @@ -56,6 +57,7 @@ lib/libgphoto2/${VERSION}/sq905.so lib/libgphoto2/${VERSION}/stv0674.so lib/libgphoto2/${VERSION}/stv0680.so lib/libgphoto2/${VERSION}/sx330z.so +lib/libgphoto2/${VERSION}/topfield.so lib/libgphoto2/${VERSION}/toshiba_pdrm11.so @lib lib/libgphoto2_port.so.${LIBgphoto2_port_VERSION} lib/libgphoto2_port/0.8.0/disk.so diff --git a/graphics/libgphoto2/pkg/PLIST b/graphics/libgphoto2/pkg/PLIST index 593b5d91bcf..52271a344de 100644 --- a/graphics/libgphoto2/pkg/PLIST +++ b/graphics/libgphoto2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2008/06/18 11:43:39 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.9 2008/12/08 14:20:10 ajacoutot Exp $ bin/gphoto2-config bin/gphoto2-port-config include/gphoto2/ @@ -63,6 +63,8 @@ lib/libgphoto2/${VERSION}/jamcam.a lib/libgphoto2/${VERSION}/jamcam.la lib/libgphoto2/${VERSION}/jd11.a lib/libgphoto2/${VERSION}/jd11.la +lib/libgphoto2/${VERSION}/jl2005a.a +lib/libgphoto2/${VERSION}/jl2005a.la lib/libgphoto2/${VERSION}/kodak_dc120.a lib/libgphoto2/${VERSION}/kodak_dc120.la lib/libgphoto2/${VERSION}/kodak_dc210.a @@ -137,6 +139,8 @@ lib/libgphoto2/${VERSION}/stv0680.a lib/libgphoto2/${VERSION}/stv0680.la lib/libgphoto2/${VERSION}/sx330z.a lib/libgphoto2/${VERSION}/sx330z.la +lib/libgphoto2/${VERSION}/topfield.a +lib/libgphoto2/${VERSION}/topfield.la lib/libgphoto2/${VERSION}/toshiba_pdrm11.a lib/libgphoto2/${VERSION}/toshiba_pdrm11.la @bin lib/libgphoto2/print-camera-list @@ -155,9 +159,9 @@ lib/libgphoto2_port/0.8.0/usb.la lib/pkgconfig/ lib/pkgconfig/libgphoto2.pc lib/pkgconfig/libgphoto2_port.pc -@comment lib/udev/ @comment @bin lib/udev/check-mtp-device @comment lib/udev/check-ptp-camera +@comment lib/udev/ @man man/man3/libgphoto2.3 @man man/man3/libgphoto2_port.3 share/doc/libgphoto2/ @@ -176,6 +180,7 @@ share/doc/libgphoto2/camlibs/README.enigma13 share/doc/libgphoto2/camlibs/README.gsmart300 share/doc/libgphoto2/camlibs/README.iclick share/doc/libgphoto2/camlibs/README.jamcam +share/doc/libgphoto2/camlibs/README.jl2005a share/doc/libgphoto2/camlibs/README.konica share/doc/libgphoto2/camlibs/README.largan-lmini share/doc/libgphoto2/camlibs/README.lg_gsm @@ -211,7 +216,6 @@ share/locale/de/LC_MESSAGES/libgphoto2-2.mo share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo share/locale/es/LC_MESSAGES/libgphoto2-2.mo share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo -share/locale/eu/ share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/libgphoto2-2.mo share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo @@ -231,6 +235,7 @@ share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo share/locale/ru/LC_MESSAGES/libgphoto2-2.mo share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/sk/LC_MESSAGES/libgphoto2_port-0.mo share/locale/sl/LC_MESSAGES/libgphoto2-2.mo share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo share/locale/sv/LC_MESSAGES/libgphoto2-2.mo