cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to libgphoto2-2.4.1

Browse Source 
tested by landry@ (i386) and myself (macppc)
"go for it if it works" espie@
This commit is contained in:
ajacoutot 2008-06-18 11:43:39 +00:00
parent 2d423dc45d
commit 88cc8ec721
10 changed files with 39 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/libgphoto2/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2007/10/19 12:57:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2008/06/18 11:43:39 ajacoutot Exp $
COMMENT= digital camera library
CATEGORIES= graphics devel
MAINTAINER= Marc Espie <espie@openbsd.org>
VERSION= 2.4.0
VERSION= 2.4.1
DISTNAME= libgphoto2-${VERSION}
PKGNAME= libgphoto-${VERSION}
SHARED_LIBS+= gphoto2 3.0 # 5.0
@ -15,7 +15,7 @@ HOMEPAGE= http://www.gphoto.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
# GPL
# LGPLv2
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes

10
graphics/libgphoto2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libgphoto2-2.4.0.tar.gz) = re8aVk09GkjhwT7ONLERtg==
RMD160 (libgphoto2-2.4.0.tar.gz) = 8yU/CIssA9NsLw0w8s/F4M/IZOQ=
SHA1 (libgphoto2-2.4.0.tar.gz) = cTASJWXMqPCo2OIJI88KGjhCNbU=
SHA256 (libgphoto2-2.4.0.tar.gz) = 37MhZpIZPzPD7wJGFNoERvjl2vQbtzSqaOdCGREcgLM=
SIZE (libgphoto2-2.4.0.tar.gz) = 4257979
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

8
graphics/libgphoto2/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/10/19 12:57:51 ajacoutot Exp $
--- Makefile.in.orig Thu Oct 11 13:22:12 2007
+++ Makefile.in Thu Oct 11 13:22:27 2007
@@ -299,7 +299,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.
$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
pkgconfig_DATA = libgphoto2.pc
noinst_DATA = libgphoto2-uninstalled.pc

8
graphics/libgphoto2/patches/patch-camlibs_canon_usb_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-camlibs_canon_usb_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- camlibs/canon/usb.c.orig Sun Oct 14 12:14:21 2007
+++ camlibs/canon/usb.c Sun Oct 14 12:14:35 2007
$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
@@ -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 75
-#define CANON_FAST_TIMEOUT 150
+#define CANON_FAST_TIMEOUT 750
/* WARNING: This destroys reentrancy of the code. Better to put this

35
graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-camlibs_ptp2_library_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- camlibs/ptp2/library.c.orig Fri Jul 27 02:35:37 2007
+++ camlibs/ptp2/library.c Mon Oct 15 12:34:45 2007
@@ -26,7 +26,11 @@
#include <string.h>
#include <stdio.h>
#include <time.h>
+#ifndef __OpenBSD__
+/* nl_langinfo(CODESET) returns 646, not usable by iconv_open() */
+#define HAVE_NL_LANGINFO
#include <langinfo.h>
+#endif
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
@@ -683,6 +687,7 @@ static struct {
{"Canon:PowerShot A710 IS (PTP mode)", 0x04a9, 0x3138, PTPBUG_DELETE_SENDS_EVENT},
{"Canon:PowerShot A640 (PTP mode)", 0x04a9, 0x3139, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW},
{"Canon:PowerShot A630 (PTP mode)", 0x04a9, 0x313a, PTPBUG_DELETE_SENDS_EVENT},
+ {"Canon:EOS 40D (PTP mode)", 0x04a9, 0x3146, 0},
{"Canon:PowerShot S5 IS (PTP mode)", 0x04a9, 0x3148, PTP_CAP|PTP_CAP_PREVIEW},
{"Canon:PowerShot A570 IS (PTP mode)", 0x04a9, 0x314c, PTPBUG_DELETE_SENDS_EVENT},
{"Canon:PowerShot A560 (PTP mode)", 0x04a9, 0x314d, PTPBUG_DELETE_SENDS_EVENT},
@@ -4203,7 +4208,11 @@ camera_init (Camera *camera, GPContext *context)
break;
}
+#ifdef HAVE_NL_LANGINFO
curloc = nl_langinfo (CODESET);
+#else
+ curloc="ISO-8859-1";
+#endif
if (!curloc) curloc="UTF-8";
camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, camloc);
camera->pl->params.cd_locale_to_ucs2 = iconv_open(camloc, curloc);

8
graphics/libgphoto2/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- configure.orig Tue Oct 16 16:48:32 2007
+++ configure Tue Oct 16 16:49:17 2007
@@ -28442,10 +28442,10 @@ MSGFMT!$MSGFMT$ac_delim
$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
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim

8
graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- libgphoto2_port/Makefile.in.orig Thu Oct 11 13:24:02 2007
+++ libgphoto2_port/Makefile.in Thu Oct 11 13:25:14 2007
@@ -759,7 +759,7 @@ info: info-recursive
$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
info-am:

8
graphics/libgphoto2/patches/patch-libgphoto2_port_configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_configure,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- libgphoto2_port/configure.orig Tue Oct 16 17:04:24 2007
+++ libgphoto2_port/configure Tue Oct 16 17:04:49 2007
@@ -27528,10 +27528,10 @@ MSGFMT!$MSGFMT$ac_delim
$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
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim

8
graphics/libgphoto2/patches/patch-tests_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
--- tests/Makefile.in.orig Thu Oct 11 13:22:39 2007
+++ tests/Makefile.in Thu Oct 11 13:22:56 2007
@@ -351,9 +351,9 @@ test_camera_list_LDADD = \
$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 = \
$(INTLLIBS)
@HAVE_GCC_FALSE@PEDANTIC_CFLAGS =

11
graphics/libgphoto2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2007/10/19 12:57:52 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.8 2008/06/18 11:43:39 ajacoutot Exp $
bin/gphoto2-config
bin/gphoto2-port-config
include/gphoto2/
@ -139,7 +139,7 @@ lib/libgphoto2/${VERSION}/sx330z.a
lib/libgphoto2/${VERSION}/sx330z.la
lib/libgphoto2/${VERSION}/toshiba_pdrm11.a
lib/libgphoto2/${VERSION}/toshiba_pdrm11.la
lib/libgphoto2/print-camera-list
@bin lib/libgphoto2/print-camera-list
lib/libgphoto2_port/
lib/libgphoto2_port.a
lib/libgphoto2_port.la
@ -156,20 +156,22 @@ lib/pkgconfig/
lib/pkgconfig/libgphoto2.pc
lib/pkgconfig/libgphoto2_port.pc
@comment lib/udev/
@comment lib/udev/check-mtp-device
@comment @bin lib/udev/check-mtp-device
@comment lib/udev/check-ptp-camera
@man man/man3/libgphoto2.3
@man man/man3/libgphoto2_port.3
share/doc/libgphoto2/
share/doc/libgphoto2/README
share/doc/libgphoto2/camlibs/
share/doc/libgphoto2/camlibs/README.9050
share/doc/libgphoto2/camlibs/README.905C
share/doc/libgphoto2/camlibs/README.913C
share/doc/libgphoto2/camlibs/README.913D
share/doc/libgphoto2/camlibs/README.adc65
share/doc/libgphoto2/camlibs/README.agfa-cl20
share/doc/libgphoto2/camlibs/README.aox
share/doc/libgphoto2/camlibs/README.canon
share/doc/libgphoto2/camlibs/README.clicksmart310
share/doc/libgphoto2/camlibs/README.digigr8
share/doc/libgphoto2/camlibs/README.enigma13
share/doc/libgphoto2/camlibs/README.gsmart300
share/doc/libgphoto2/camlibs/README.iclick
@ -235,6 +237,7 @@ share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/vi/LC_MESSAGES/libgphoto2-2.mo
share/locale/vi/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo