pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libgphoto2 Changes:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7e513629a4c8
branches: trunk
changeset: 541975:7e513629a4c8
user: sborrill <sborrill%pkgsrc.org@localhost>
date: Tue Apr 29 09:31:09 2008 +0000
description:
Changes:
libgphoto2 2.4.1
This is a 2.4 release branch update.
Package / System integration:
* HAL FDI files now use "info.subsystem" instead of "info.bus", required
by hal after March 2008.
* Suppress another Olympus camera in FDI file that is better of done
using Mass Storage only.
libgphoto2_port:
* Suppress more known network filesystems in "disk" autodetection
* disabled usb_reset for Canon cameras in "usb", broke EOS cameras.
PTP2 driver:
* Merged all new Camera IDs from TRUNK.
* Configuration bugfix for multiple options with the same name.
* Capture bugfix for Nikon Coolpix
* Various small bugfixes.
Canon driver:
* Increased the event timeout, so operations work again.
* Fixed a bug in interval capture
* some additional configuration values for newer cameras
Mars driver:
* Synced with SVN TRUNK (1:1 copy).
* Better whitebalance postprocessing
* Camera ids added
* Decompression fixes
Digigr8 driver:
* Synced with SVN TRUNK (1:1 copy).
* bugfixes
Sonix driver:
* Synced with SVN TRUNK (1:1 copy).
* bugfixes
+ changes from 2.3.x
diffstat:
devel/libgphoto2/Makefile | 6 +-
devel/libgphoto2/PLIST.common | 17 +++--
devel/libgphoto2/PLIST.common_end | 4 +-
devel/libgphoto2/distinfo | 18 +---
devel/libgphoto2/patches/patch-aa | 60 -------------------
devel/libgphoto2/patches/patch-ac | 41 -------------
devel/libgphoto2/patches/patch-ad | 14 ----
devel/libgphoto2/patches/patch-ae | 49 ----------------
devel/libgphoto2/patches/patch-af | 13 ----
devel/libgphoto2/patches/patch-ag | 115 --------------------------------------
devel/libgphoto2/patches/patch-ah | 12 ---
devel/libgphoto2/patches/patch-ai | 14 ----
devel/libgphoto2/patches/patch-aj | 14 ++++
devel/libgphoto2/patches/patch-ak | 10 +++
14 files changed, 45 insertions(+), 342 deletions(-)
diffs (truncated from 497 to 300 lines):
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/Makefile
--- a/devel/libgphoto2/Makefile Tue Apr 29 08:19:36 2008 +0000
+++ b/devel/libgphoto2/Makefile Tue Apr 29 09:31:09 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2008/04/12 22:42:59 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2008/04/29 09:31:38 sborrill Exp $
-DISTNAME= libgphoto2-2.3.1
-PKGREVISION= 4
+DISTNAME= libgphoto2-2.4.1
CATEGORIES= devel graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
EXTRACT_SUFX= .tar.bz2
@@ -32,6 +31,7 @@
rm ${PREFIX}/include/gphoto2/gphoto2
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/PLIST.common
--- a/devel/libgphoto2/PLIST.common Tue Apr 29 08:19:36 2008 +0000
+++ b/devel/libgphoto2/PLIST.common Tue Apr 29 09:31:09 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:59 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.12 2008/04/29 09:31:38 sborrill Exp $
bin/gphoto2-config
bin/gphoto2-port-config
include/gphoto2/gphoto2-abilities-list.h
@@ -79,12 +79,13 @@
lib/libgphoto2/${PKGVERSION}/stv0680.la
lib/libgphoto2/${PKGVERSION}/sx330z.la
lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la
-lib/libgphoto2_port/0.7.1/disk.la
-lib/libgphoto2_port/0.7.1/ptpip.la
-lib/libgphoto2_port/0.7.1/serial.la
-${PLIST.libusb}lib/libgphoto2_port/0.7.1/usb.la
+lib/libgphoto2_port/0.8.0/disk.la
+lib/libgphoto2_port/0.8.0/ptpip.la
+lib/libgphoto2_port/0.8.0/serial.la
+${PLIST.libusb}lib/libgphoto2_port/0.8.0/usb.la
lib/pkgconfig/libgphoto2.pc
lib/pkgconfig/libgphoto2_port.pc
+lib/udev/check-mtp-device
lib/udev/check-ptp-camera
man/man3/libgphoto2.3
man/man3/libgphoto2_port.3
@@ -92,14 +93,15 @@
share/doc/libgphoto2/COPYING
share/doc/libgphoto2/NEWS
share/doc/libgphoto2/README
+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.barbie
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
@@ -163,6 +165,7 @@
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
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/PLIST.common_end
--- a/devel/libgphoto2/PLIST.common_end Tue Apr 29 08:19:36 2008 +0000
+++ b/devel/libgphoto2/PLIST.common_end Tue Apr 29 09:31:09 2008 +0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2007/01/03 08:20:18 adam Exp $
+@comment $NetBSD: PLIST.common_end,v 1.5 2008/04/29 09:31:38 sborrill Exp $
@dirrm share/libgphoto2/${PKGVERSION}/konica
@dirrm share/libgphoto2/${PKGVERSION}
@dirrm share/libgphoto2
@dirrm share/doc/libgphoto2/camlibs
@dirrm share/doc/libgphoto2
@dirrm lib/udev
-@dirrm lib/libgphoto2_port/0.7.1
+@dirrm lib/libgphoto2_port/0.8.0
@dirrm lib/libgphoto2_port
@dirrm lib/libgphoto2/${PKGVERSION}
@dirrm lib/libgphoto2
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/distinfo
--- a/devel/libgphoto2/distinfo Tue Apr 29 08:19:36 2008 +0000
+++ b/devel/libgphoto2/distinfo Tue Apr 29 09:31:09 2008 +0000
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.14 2007/06/21 03:40:23 minskim Exp $
+$NetBSD: distinfo,v 1.15 2008/04/29 09:31:38 sborrill Exp $
-SHA1 (libgphoto2-2.3.1.tar.bz2) = 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97
-RMD160 (libgphoto2-2.3.1.tar.bz2) = ab678a5006a89ef1fe9f052dac1f9738961cc3a8
-Size (libgphoto2-2.3.1.tar.bz2) = 3230934 bytes
-SHA1 (patch-aa) = c1620348beddd102b2515987670786a54f9fcf08
+SHA1 (libgphoto2-2.4.1.tar.bz2) = acff08c45e2a69cde2646c321e6140ccd19f1951
+RMD160 (libgphoto2-2.4.1.tar.bz2) = 1671698eec9a1de601de5423d887e8a238a6f41b
+Size (libgphoto2-2.4.1.tar.bz2) = 3493514 bytes
SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b
-SHA1 (patch-ac) = f5d3e72163f6de85c4e5a9b5f4b32d8d628e7b30
-SHA1 (patch-ad) = 270c6f9a655631bc8d43a8d66851e902ea5ea8a5
-SHA1 (patch-ae) = 782807e35b748d80ad4bb8306eb576742d9e6f69
-SHA1 (patch-af) = b0dccb67bf51ad7570438ba8f65d0187f5fd4b17
-SHA1 (patch-ag) = 2c50b33a70dd9c4b41eb8fabc1f7fd03959660f3
-SHA1 (patch-ah) = 0fc27ed7d505e914cec954d98b201fd721995e0f
-SHA1 (patch-ai) = 4b349d60bea6e362c89c65d1ad13eccac26488e5
+SHA1 (patch-aj) = 111b26861d59dddf7a8d0998cb7ae6513114fe38
+SHA1 (patch-ak) = b1e9243cf4d4c78995184b357ba36bdfb0471d76
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/patches/patch-aa
--- a/devel/libgphoto2/patches/patch-aa Tue Apr 29 08:19:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2007/04/25 13:36:18 sborrill Exp $
-
---- camlibs/ptp2/library.c.orig 2007-01-30 20:06:58.000000000 -0500
-+++ camlibs/ptp2/library.c 2007-01-30 20:13:25.000000000 -0500
-@@ -50,23 +50,6 @@
- # define N_(String) (String)
- #endif
-
--/*
-- * On MacOS (Darwin) and *BSD we're not using glibc, but libiconv.
-- * glibc knows that UCS-2 is to be in the local machine endianness,
-- * whereas libiconv does not. So we construct this macro to get
-- * things right. Reportedly, glibc 2.1.3 has a bug so that UCS-2
-- * is always bigendian though, we would need to work around that
-- * too...
-- */
--#ifndef __GLIBC__
--#define UCS_2_INTERNAL "UCS-2-INTERNAL"
--#else
--#if (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1 )
--#error "Too old glibc. This versions iconv() implementation cannot be trusted."
--#endif
--#define UCS_2_INTERNAL "UCS-2"
--#endif
--
- #include "ptp.h"
- #include "ptp-bugs.h"
- #include "ptp-private.h"
-@@ -3619,7 +3602,7 @@
- CameraAbilities a;
- int ret, i, retried = 0;
- PTPParams *params;
-- char *curloc;
-+ char *camloc, *curloc;
-
- /* Make sure our port is either USB or PTP/IP. */
- if ((camera->port->type != GP_PORT_USB) && (camera->port->type != GP_PORT_PTPIP)) {
-@@ -3649,6 +3632,11 @@
- memset (camera->pl->params.data, 0, sizeof (PTPData));
- ((PTPData *) camera->pl->params.data)->camera = camera;
- camera->pl->params.byteorder = PTP_DL_LE;
-+ if (camera->pl->params.byteorder == PTP_DL_LE) {
-+ camloc = "UCS-2LE";
-+ } else {
-+ camloc = "UCS-2BE";
-+ }
-
- switch (camera->port->type) {
- case GP_PORT_USB:
-@@ -3696,8 +3684,8 @@
-
- curloc = nl_langinfo (CODESET);
- if (!curloc) curloc="UTF-8";
-- camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, UCS_2_INTERNAL);
-- camera->pl->params.cd_locale_to_ucs2 = iconv_open(UCS_2_INTERNAL, curloc);
-+ camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, camloc);
-+ camera->pl->params.cd_locale_to_ucs2 = iconv_open(camloc, curloc);
- if ((camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) ||
- (camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) {
- gp_log (GP_LOG_ERROR, "iconv", "Failed to create iconv converter.\n");
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/patches/patch-ac
--- a/devel/libgphoto2/patches/patch-ac Tue Apr 29 08:19:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/01/02 18:32:47 adam Exp $
-
---- camlibs/ptp2/ptp.c.orig 2006-12-24 16:16:20.000000000 +0100
-+++ camlibs/ptp2/ptp.c
-@@ -524,6 +524,9 @@ static inline uint16_t
- ptp_usb_event (PTPParams* params, PTPContainer* event, int wait)
- {
- uint16_t ret;
-+ uint32_t packetlen;
-+ size_t toread;
-+ unsigned char *bp;
- unsigned int rlen;
- PTPUSBEventContainer usbevent;
- PTP_CNT_INIT(usbevent);
-@@ -533,8 +536,24 @@ ptp_usb_event (PTPParams* params, PTPCon
-
- switch(wait) {
- case PTP_EVENT_CHECK:
-- ret=params->check_int_func((unsigned char*)&usbevent,
-- sizeof(usbevent), params->data, &rlen);
-+ ret=params->check_int_func((unsigned char*)&packetlen,
-+ sizeof(packetlen), params->data, &rlen);
-+ if (ret!=PTP_RC_OK)
-+ break;
-+ if (rlen != sizeof(packetlen)) {
-+ ret = PTP_ERROR_IO;
-+ break;
-+ }
-+ toread = dtoh32(packetlen) - sizeof(packetlen);
-+ bp = (unsigned char*)&usbevent.type;
-+ while (toread > 0) {
-+ ret=params->check_int_func(bp,
-+ toread, params->data, &rlen);
-+ if (ret!=PTP_RC_OK)
-+ break;
-+ toread -= rlen;
-+ bp += rlen;
-+ }
- break;
- case PTP_EVENT_CHECK_FAST:
- ret=params->check_int_fast_func((unsigned char*)
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/patches/patch-ad
--- a/devel/libgphoto2/patches/patch-ad Tue Apr 29 08:19:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/05 20:03:19 markd Exp $
-
---- camlibs/digita/digita.c.orig 2007-02-03 18:19:59.857410000 +1300
-+++ camlibs/digita/digita.c
-@@ -26,9 +26,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
--#ifdef HAVE_LIMITS_H
- #include <limits.h>
--#endif
- #ifdef OS2
- #include <db.h>
- #endif
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/patches/patch-ae
--- a/devel/libgphoto2/patches/patch-ae Tue Apr 29 08:19:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/02/05 20:03:19 markd Exp $
-
---- camlibs/mars/mars.c.orig 2007-02-03 18:30:12.430858000 +1300
-+++ camlibs/mars/mars.c
-@@ -38,7 +38,7 @@
- #define GET_DATA 0x0f
-
- static int
--M_READ (GPPort *port, char *data, int size)
-+Ma_READ (GPPort *port, char *data, int size)
- {
- gp_port_write(port, "\x21", 1);
- gp_port_read(port, data, 16);
-@@ -49,7 +49,7 @@ static int
- M_COMMAND (GPPort *port, char *command, int size, char *response)
- {
- gp_port_write(port, command, size);
-- M_READ(port, response, 16);
-+ Ma_READ(port, response, 16);
- return GP_OK;
- }
-
-@@ -68,7 +68,7 @@ mars_init (Camera *camera, GPPort *port,
- * camera reports 0x02 it is "jammed" and we must clear it.
- */
-
-- M_READ(port, c, 16);
-+ Ma_READ(port, c, 16);
- if ( (c[0] == 0x02 ) ) {
- gp_port_write(port, "\x19", 1);
- gp_port_read(port, c, 16);
-@@ -317,7 +317,7 @@ mars_routine (Info *info, GPPort *port,
- memset(c,0,sizeof(c));
-
- /*Routine used in initialization, photo download, and reset. */
-- M_READ(port, c, 16);
-+ Ma_READ(port, c, 16);
- M_COMMAND(port, start, 2, c);
- M_COMMAND(port, do_something, 2, c);
- M_COMMAND(port, address1, 2, c);
-@@ -326,7 +326,7 @@ mars_routine (Info *info, GPPort *port,
- gp_port_write(port, address2, 2);
- /* Moving the memory cursor to the given address? */
- while (( c[0] != 0xa) ) {
-- M_READ(port, c, 16);
-+ Ma_READ(port, c, 16);
- }
-
- M_COMMAND(port, address3, 2, c);
diff -r 4f16a9f7542b -r 7e513629a4c8 devel/libgphoto2/patches/patch-af
--- a/devel/libgphoto2/patches/patch-af Tue Apr 29 08:19:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/02/05 20:03:19 markd Exp $
Home |
Main Index |
Thread Index |
Old Index