- update libgphoto to version 2.4.3

this is a maintenance release

ok espie@
This commit is contained in:
ajacoutot 2008-12-08 14:20:10 +00:00
parent f7075f6136
commit 74c1c98557
11 changed files with 52 additions and 43 deletions

View File

@ -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 COMMENT= digital camera library
CATEGORIES= graphics devel CATEGORIES= graphics devel
MAINTAINER= Marc Espie <espie@openbsd.org> MAINTAINER= Marc Espie <espie@openbsd.org>
VERSION= 2.4.1 VERSION= 2.4.3
DISTNAME= libgphoto2-${VERSION} DISTNAME= libgphoto2-${VERSION}
PKGNAME= libgphoto-${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 SHARED_LIBS+= gphoto2_port 6.0 # 8.0
HOMEPAGE= http://www.gphoto.org/ HOMEPAGE= http://www.gphoto.org/
@ -20,6 +20,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
WANTLIB= c m WANTLIB= c m
USE_LIBTOOL= Yes USE_LIBTOOL= Yes

View File

@ -1,5 +1,5 @@
MD5 (libgphoto2-2.4.1.tar.gz) = ScEsUgMdpQFT1/vXW0kSTQ== MD5 (libgphoto2-2.4.3.tar.gz) = 67x/aC4Z8s2fOrtIb3tW+g==
RMD160 (libgphoto2-2.4.1.tar.gz) = iW2rt69DJ27Nfi6LtQueT/PmvGg= RMD160 (libgphoto2-2.4.3.tar.gz) = 0nFt6LIwcIN+yUzS60eTpQAc1Cc=
SHA1 (libgphoto2-2.4.1.tar.gz) = aVcs5xNvQjNIxBKfQtZnT4xhDkA= SHA1 (libgphoto2-2.4.3.tar.gz) = VR4f5PE13EfhKshOlnZAEfKpeVQ=
SHA256 (libgphoto2-2.4.1.tar.gz) = 6NaxL8rrQvcJ6WsfmVG8zeaRqUa1/tXw3KFY9lt3W7M= SHA256 (libgphoto2-2.4.3.tar.gz) = uRmalw5ekt1S8LBCeORTHcV902r1k/0xQ7aMKoDww9A=
SIZE (libgphoto2-2.4.1.tar.gz) = 4605742 SIZE (libgphoto2-2.4.3.tar.gz) = 6324500

View File

@ -1,11 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- Makefile.in.orig Fri Mar 28 21:52:06 2008 --- Makefile.in.orig Tue Nov 11 14:57:04 2008
+++ Makefile.in Sat Jun 14 18:43:46 2008 +++ Makefile.in Tue Nov 11 14:57:24 2008
@@ -300,7 +300,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck. @@ -304,8 +304,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.
SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc
pkgconfig_DATA = libgphoto2.pc pkgconfig_DATA = libgphoto2.pc
noinst_DATA = libgphoto2-uninstalled.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 +doc_DATA = README
nobase_include_HEADERS = \ nobase_include_HEADERS = \
gphoto2/gphoto2.h \ gphoto2/gphoto2.h \

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-camlibs_canon_usb_c,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-camlibs_canon_usb_c,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- camlibs/canon/usb.c.orig Sat Jun 14 18:41:27 2008 --- camlibs/canon/usb.c.orig Tue Nov 11 14:57:31 2008
+++ camlibs/canon/usb.c Sat Jun 14 18:41:38 2008 +++ camlibs/canon/usb.c Tue Nov 11 14:57:46 2008
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
/* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
* an URB to come back on an interrupt endpoint */ * an URB to come back on an interrupt endpoint */
-#define CANON_FAST_TIMEOUT 150 -#define CANON_FAST_TIMEOUT 175
+#define CANON_FAST_TIMEOUT 750 +#define CANON_FAST_TIMEOUT 750
/* WARNING: This destroys reentrancy of the code. Better to put this /* WARNING: This destroys reentrancy of the code. Better to put this

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- configure.orig Fri Mar 28 21:52:10 2008 --- configure.orig Sun Oct 19 14:06:47 2008
+++ configure Sat Jun 14 18:43:46 2008 +++ configure Tue Nov 11 14:58:35 2008
@@ -28649,10 +28649,10 @@ MSGFMT!$MSGFMT$ac_delim @@ -29174,10 +29174,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim MSGMERGE!$MSGMERGE$ac_delim

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- libgphoto2_port/Makefile.in.orig Mon Mar 24 14:14:13 2008 --- libgphoto2_port/Makefile.in.orig Sat Oct 4 20:25:18 2008
+++ libgphoto2_port/Makefile.in Sat Jun 14 18:43:46 2008 +++ libgphoto2_port/Makefile.in Tue Nov 11 14:58:36 2008
@@ -760,7 +760,7 @@ info: info-recursive @@ -768,7 +768,7 @@ info: info-recursive
info-am: info-am:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_configure,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-libgphoto2_port_configure,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- libgphoto2_port/configure.orig Mon Mar 24 14:14:14 2008 --- libgphoto2_port/configure.orig Sat Oct 4 20:25:14 2008
+++ libgphoto2_port/configure Sat Jun 14 18:43:47 2008 +++ libgphoto2_port/configure Tue Nov 11 14:58:37 2008
@@ -27735,10 +27735,10 @@ MSGFMT!$MSGFMT$ac_delim @@ -28127,10 +28127,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim MSGMERGE!$MSGMERGE$ac_delim

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ $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 Thu Oct 11 12:31:39 2007 --- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig Sun Jul 13 22:11:11 2008
+++ libgphoto2_port/gphoto2/gphoto2-port-portability.h Thu Oct 11 12:33:11 2007 +++ libgphoto2_port/gphoto2/gphoto2-port-portability.h Tue Nov 11 14:58:37 2008
@@ -151,6 +151,7 @@ typedef struct { @@ -153,6 +153,7 @@ typedef struct {
/* yummy. :) */ /* yummy. :) */
/* XOPEN needed for usleep */ /* 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 #ifndef _XOPEN_SOURCE
# define _XOPEN_SOURCE 500 # define _XOPEN_SOURCE 500
#else #else
@@ -159,11 +160,14 @@ typedef struct { @@ -161,11 +162,14 @@ typedef struct {
# define _XOPEN_SOURCE 500 # define _XOPEN_SOURCE 500
# endif # endif
#endif #endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.2 2008/06/18 11:43:39 ajacoutot Exp $ $OpenBSD: patch-tests_Makefile_in,v 1.3 2008/12/08 14:20:10 ajacoutot Exp $
--- tests/Makefile.in.orig Fri Mar 28 21:52:06 2008 --- tests/Makefile.in.orig Sun Oct 19 14:06:45 2008
+++ tests/Makefile.in Sat Jun 14 18:43:47 2008 +++ tests/Makefile.in Tue Nov 11 14:58:37 2008
@@ -352,9 +352,9 @@ test_camera_list_LDADD = \ @@ -355,9 +355,9 @@ test_camera_list_LDADD = \
$(INTLLIBS) $(INTLLIBS)
@HAVE_GCC_FALSE@PEDANTIC_CFLAGS = @HAVE_GCC_FALSE@PEDANTIC_CFLAGS =

View File

@ -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 lib/libgphoto2.so.${LIBgphoto2_VERSION}
lib/libgphoto2/${VERSION}/adc65.so lib/libgphoto2/${VERSION}/adc65.so
lib/libgphoto2/${VERSION}/agfa_cl20.so lib/libgphoto2/${VERSION}/agfa_cl20.so
@ -19,6 +19,7 @@ lib/libgphoto2/${VERSION}/hp215.so
lib/libgphoto2/${VERSION}/iclick.so lib/libgphoto2/${VERSION}/iclick.so
lib/libgphoto2/${VERSION}/jamcam.so lib/libgphoto2/${VERSION}/jamcam.so
lib/libgphoto2/${VERSION}/jd11.so lib/libgphoto2/${VERSION}/jd11.so
lib/libgphoto2/${VERSION}/jl2005a.so
lib/libgphoto2/${VERSION}/kodak_dc120.so lib/libgphoto2/${VERSION}/kodak_dc120.so
lib/libgphoto2/${VERSION}/kodak_dc210.so lib/libgphoto2/${VERSION}/kodak_dc210.so
lib/libgphoto2/${VERSION}/kodak_dc240.so lib/libgphoto2/${VERSION}/kodak_dc240.so
@ -56,6 +57,7 @@ lib/libgphoto2/${VERSION}/sq905.so
lib/libgphoto2/${VERSION}/stv0674.so lib/libgphoto2/${VERSION}/stv0674.so
lib/libgphoto2/${VERSION}/stv0680.so lib/libgphoto2/${VERSION}/stv0680.so
lib/libgphoto2/${VERSION}/sx330z.so lib/libgphoto2/${VERSION}/sx330z.so
lib/libgphoto2/${VERSION}/topfield.so
lib/libgphoto2/${VERSION}/toshiba_pdrm11.so lib/libgphoto2/${VERSION}/toshiba_pdrm11.so
@lib lib/libgphoto2_port.so.${LIBgphoto2_port_VERSION} @lib lib/libgphoto2_port.so.${LIBgphoto2_port_VERSION}
lib/libgphoto2_port/0.8.0/disk.so lib/libgphoto2_port/0.8.0/disk.so

View File

@ -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-config
bin/gphoto2-port-config bin/gphoto2-port-config
include/gphoto2/ include/gphoto2/
@ -63,6 +63,8 @@ lib/libgphoto2/${VERSION}/jamcam.a
lib/libgphoto2/${VERSION}/jamcam.la lib/libgphoto2/${VERSION}/jamcam.la
lib/libgphoto2/${VERSION}/jd11.a lib/libgphoto2/${VERSION}/jd11.a
lib/libgphoto2/${VERSION}/jd11.la 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.a
lib/libgphoto2/${VERSION}/kodak_dc120.la lib/libgphoto2/${VERSION}/kodak_dc120.la
lib/libgphoto2/${VERSION}/kodak_dc210.a lib/libgphoto2/${VERSION}/kodak_dc210.a
@ -137,6 +139,8 @@ lib/libgphoto2/${VERSION}/stv0680.a
lib/libgphoto2/${VERSION}/stv0680.la lib/libgphoto2/${VERSION}/stv0680.la
lib/libgphoto2/${VERSION}/sx330z.a lib/libgphoto2/${VERSION}/sx330z.a
lib/libgphoto2/${VERSION}/sx330z.la 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.a
lib/libgphoto2/${VERSION}/toshiba_pdrm11.la lib/libgphoto2/${VERSION}/toshiba_pdrm11.la
@bin lib/libgphoto2/print-camera-list @bin lib/libgphoto2/print-camera-list
@ -155,9 +159,9 @@ lib/libgphoto2_port/0.8.0/usb.la
lib/pkgconfig/ lib/pkgconfig/
lib/pkgconfig/libgphoto2.pc lib/pkgconfig/libgphoto2.pc
lib/pkgconfig/libgphoto2_port.pc lib/pkgconfig/libgphoto2_port.pc
@comment lib/udev/
@comment @bin lib/udev/check-mtp-device @comment @bin lib/udev/check-mtp-device
@comment lib/udev/check-ptp-camera @comment lib/udev/check-ptp-camera
@comment lib/udev/
@man man/man3/libgphoto2.3 @man man/man3/libgphoto2.3
@man man/man3/libgphoto2_port.3 @man man/man3/libgphoto2_port.3
share/doc/libgphoto2/ share/doc/libgphoto2/
@ -176,6 +180,7 @@ share/doc/libgphoto2/camlibs/README.enigma13
share/doc/libgphoto2/camlibs/README.gsmart300 share/doc/libgphoto2/camlibs/README.gsmart300
share/doc/libgphoto2/camlibs/README.iclick share/doc/libgphoto2/camlibs/README.iclick
share/doc/libgphoto2/camlibs/README.jamcam share/doc/libgphoto2/camlibs/README.jamcam
share/doc/libgphoto2/camlibs/README.jl2005a
share/doc/libgphoto2/camlibs/README.konica share/doc/libgphoto2/camlibs/README.konica
share/doc/libgphoto2/camlibs/README.largan-lmini share/doc/libgphoto2/camlibs/README.largan-lmini
share/doc/libgphoto2/camlibs/README.lg_gsm 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/de/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/es/LC_MESSAGES/libgphoto2-2.mo share/locale/es/LC_MESSAGES/libgphoto2-2.mo
share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/libgphoto2-2.mo share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
share/locale/eu/LC_MESSAGES/libgphoto2_port-0.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/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/ru/LC_MESSAGES/libgphoto2-2.mo share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
share/locale/ru/LC_MESSAGES/libgphoto2_port-0.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-2.mo
share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/sv/LC_MESSAGES/libgphoto2-2.mo share/locale/sv/LC_MESSAGES/libgphoto2-2.mo