diff options
| author | Hubert Figuiere <hub@figuiere.net> | 2006-06-19 19:15:03 +0000 |
|---|---|---|
| committer | Hubert Figuiere <hub@figuiere.net> | 2006-06-19 19:15:03 +0000 |
| commit | 6b9d8c228b905f217090800de147c080021bdaa0 (patch) | |
| tree | 4c2ec30032a0dd86373147207c683dbeded7749a | |
| parent | 9754a4341c9dd0cfee323d97f92a451403a909cd (diff) | |
| download | libgphoto2-6b9d8c228b905f217090800de147c080021bdaa0.tar.gz | |
ready for 2.2.1: fix BSD build
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@8902 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | camlibs/ptp2/ptpip.c | 5 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | libgphoto2_port/configure.in | 4 | ||||
| -rw-r--r-- | libgphoto2_port/serial/unix.c | 2 |
5 files changed, 13 insertions, 8 deletions
@@ -1,4 +1,8 @@ -libgphoto2 2.2 +libgphoto2 2.2.1 + + * Fix build for FreeBSD users (and other non-Linux) + +libgphoto2 2.2.0 Build system (packagers beware!): diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c index f9c8b14fe..75b311019 100644 --- a/camlibs/ptp2/ptpip.c +++ b/camlibs/ptp2/ptpip.c @@ -33,6 +33,9 @@ #include <errno.h> #include <sys/select.h> +#include <sys/socket.h> +#include <netinet/in.h> + #include <gphoto2-library.h> #include <gphoto2-port-log.h> #include <gphoto2-setting.h> @@ -219,7 +222,7 @@ ptp_ptpip_senddata (PTPParams* params, PTPContainer* ptp, if (ret == -1) perror ("sendreq/write to cmdfd"); if (ret != sizeof(request)) { - gp_log (GP_LOG_ERROR, "ptpip/senddata", "ptp_ptpip_senddata() len=%ld but ret=%d", sizeof(request), ret); + gp_log (GP_LOG_ERROR, "ptpip/senddata", "ptp_ptpip_senddata() len=%d but ret=%d", (int)sizeof(request), ret); return PTP_RC_GeneralError; } xdata = malloc(WRITE_BLOCKSIZE+8+4); diff --git a/configure.in b/configure.in index 5b799587d..0b2678c58 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoreconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libgphoto2], [2.2.0], [gphoto-devel@lists.sourceforge.net], [libgphoto2]) +AC_INIT([libgphoto2], [2.2.1], [gphoto-devel@lists.sourceforge.net], [libgphoto2]) AC_CONFIG_SRCDIR([libgphoto2/gphoto2.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([libgphoto2_port/m4]) @@ -34,7 +34,7 @@ dnl increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, dnl REVISION is set to 0, otherwise REVISION is incremented. dnl --------------------------------------------------------------------------- AC_SUBST([LIBGPHOTO2_AGE], [1]) -AC_SUBST([LIBGPHOTO2_REVISION], [0]) +AC_SUBST([LIBGPHOTO2_REVISION], [1]) AC_SUBST([LIBGPHOTO2_CURRENT], [3]) AC_SUBST([LIBGPHOTO2_CURRENT_MIN], [`expr $LIBGPHOTO2_CURRENT - $LIBGPHOTO2_AGE`]) diff --git a/libgphoto2_port/configure.in b/libgphoto2_port/configure.in index 059899b2b..4cea52328 100644 --- a/libgphoto2_port/configure.in +++ b/libgphoto2_port/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoreconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libgphoto2_port], [0.6.0], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port]) +AC_INIT([libgphoto2_port], [0.6.1], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port]) AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2-port.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -30,7 +30,7 @@ dnl increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, dnl REVISION is set to 0, otherwise REVISION is incremented. dnl --------------------------------------------------------------------------- AC_SUBST([LIBGPHOTO2_PORT_AGE], [6]) -AC_SUBST([LIBGPHOTO2_PORT_REVISION], [0]) +AC_SUBST([LIBGPHOTO2_PORT_REVISION], [1]) AC_SUBST([LIBGPHOTO2_PORT_CURRENT], [6]) AC_SUBST([LIBGPHOTO2_PORT_CURRENT_MIN], [`expr $LIBGPHOTO2_PORT_CURRENT - $LIBGPHOTO2_PORT_AGE`]) diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 66bdf2c24..72d761eaa 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -307,9 +307,7 @@ gp_port_library_list (GPPortInfoList *list) GPPortInfo info; char path[1024], prefix[1024]; int x, fd; -#ifdef __linux struct stat s; -#endif #ifdef OS2 int r, fh, option; #endif |