1 | diff -rNup /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/libgphoto2/Portfile ./Portfile |
---|
2 | --- /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/libgphoto2/Portfile 2010-03-15 17:31:33.000000000 +0100 |
---|
3 | +++ ./Portfile 2010-04-12 20:29:41.000000000 +0200 |
---|
4 | @@ -2,7 +2,7 @@ |
---|
5 | |
---|
6 | PortSystem 1.0 |
---|
7 | name libgphoto2 |
---|
8 | -version 2.4.5 |
---|
9 | +version 2.4.9 |
---|
10 | revision 3 |
---|
11 | categories devel |
---|
12 | maintainers nomaintainer |
---|
13 | @@ -17,9 +17,9 @@ homepage http://www.gphoto.or |
---|
14 | master_sites sourceforge:gphoto |
---|
15 | use_bzip2 yes |
---|
16 | |
---|
17 | -checksums md5 490d7f6def94ff9532593e62aed946e3 \ |
---|
18 | - sha1 b1f51f0587afbe454db411f9005bd6ce5138156b \ |
---|
19 | - rmd160 b5add1b9d13079578c113f45a11eafa8372c1c84 |
---|
20 | +checksums md5 32b233189e3df7e5e67d2a81163682b8 \ |
---|
21 | + sha1 7d876fd650430e4f52fe10e53f378688e6026387 \ |
---|
22 | + rmd160 1af4e817281d6bfac1650a0b427a2903c997a9bb |
---|
23 | |
---|
24 | depends_build port:pkgconfig |
---|
25 | depends_lib port:dbus \ |
---|
26 | @@ -31,7 +31,7 @@ depends_lib port:dbus \ |
---|
27 | port:libtool |
---|
28 | |
---|
29 | patchfiles patch-configure.diff patch-configure-nodoxygen.diff \ |
---|
30 | - patch-camlibs_Makefile.in.diff |
---|
31 | + patch-camlibs_Makefile.in.diff patch-usbscsi-autoconf.diff |
---|
32 | |
---|
33 | configure.cflags-append -I${prefix}/include -no-cpp-precomp |
---|
34 | configure.args --mandir=${prefix}/share/man \ |
---|
35 | @@ -47,4 +47,3 @@ variant with_doxygen description {Use do |
---|
36 | depends_build-append port:doxygen |
---|
37 | patchfiles-delete patch-configure-nodoxygen.diff |
---|
38 | } |
---|
39 | - |
---|
40 | diff -rNup /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/libgphoto2/files/patch-usbscsi-autoconf.diff ./files/patch-usbscsi-autoconf.diff |
---|
41 | --- /opt/local/var/macports/sources/rsync.macports.org/release/ports/devel/libgphoto2/files/patch-usbscsi-autoconf.diff 1970-01-01 01:00:00.000000000 +0100 |
---|
42 | +++ ./files/patch-usbscsi-autoconf.diff 2010-04-12 20:29:15.000000000 +0200 |
---|
43 | @@ -0,0 +1,35 @@ |
---|
44 | +--- libgphoto2_port/usbscsi/linux.c 2010/03/29 09:39:26 12857 |
---|
45 | ++++ libgphoto2_port/usbscsi/linux.c 2010/04/11 19:01:46 12992 |
---|
46 | +@@ -27,8 +27,12 @@ |
---|
47 | + #include <sys/stat.h> |
---|
48 | + #include <sys/types.h> |
---|
49 | + #include <sys/param.h> |
---|
50 | +-#include <sys/ioctl.h> |
---|
51 | +-#include <scsi/sg.h> |
---|
52 | ++#ifdef HAVE_SYS_IOCTL_H |
---|
53 | ++# include <sys/ioctl.h> |
---|
54 | ++#endif |
---|
55 | ++#ifdef HAVE_SCSI_SG_H |
---|
56 | ++# include <scsi/sg.h> |
---|
57 | ++#endif |
---|
58 | + #ifdef HAVE_LOCKDEV |
---|
59 | + # include <lockdev.h> |
---|
60 | + #endif |
---|
61 | +@@ -297,6 +301,7 @@ |
---|
62 | + static int gp_port_usbscsi_send_scsi_cmd (GPPort *port, int to_dev, char *cmd, |
---|
63 | + int cmd_size, char *sense, int sense_size, char *data, int data_size) |
---|
64 | + { |
---|
65 | ++#ifdef HAVE_SCSI_SG_H |
---|
66 | + sg_io_hdr_t io_hdr; |
---|
67 | + |
---|
68 | + if (!port) |
---|
69 | +@@ -328,6 +333,9 @@ |
---|
70 | + } |
---|
71 | + |
---|
72 | + return GP_OK; |
---|
73 | ++#else |
---|
74 | ++ return GP_ERROR_NOT_SUPPORTED; |
---|
75 | ++#endif |
---|
76 | + } |
---|
77 | + |
---|
78 | + static int |
---|