Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/libgphoto2-04-scsi-usb.diff
author yippi
Tue, 20 Apr 2010 19:53:20 +0000
changeset 17885 89c68f7e6b08
child 17886 7d3334e70d52
permissions -rw-r--r--
2010-04-20 Brian Cameron <[email protected]> * base-specs/Pyrex.spec: Bump to 0.9.9. * base-specs/shared-mime-info.spec: Bump to 0.71. * base-specs/libgphoto2.spec, base-specs/gphoto2.spec, patches/libgphoto2-04-scsi-usb.diff: Bumpt o 2.4.9. Add patch needed to build. * base-specs/gtkam.spec, patches/gtkam-01-menu-entry.diff: Bump to 0.1.17 and update patch so it applies. * base-specs/iso-codes.spec: Bump to 3.15.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17885
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- libgphoto2-2.4.9/libgphoto2_port/usbscsi/linux.c-orig	2010-04-20 11:07:39.992083298 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ libgphoto2-2.4.9/libgphoto2_port/usbscsi/linux.c	2010-04-20 11:07:48.360592381 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -24,6 +24,7 @@
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 #include <unistd.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
 #include <string.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
 #include <fcntl.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
+#include <limits.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
 
 #include <sys/stat.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 #include <sys/types.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
 #include <sys/param.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    11
 
--- libgphoto2-2.4.9/libgphoto2_port/usbdiskdirect/linux.c-orig	2010-04-20 11:06:16.410540653 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    12
 
+++ libgphoto2-2.4.9/libgphoto2_port/usbdiskdirect/linux.c	2010-04-20 11:06:50.364528307 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    13
 
@@ -24,6 +24,7 @@
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    14
 
 #include <unistd.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    15
 
 #include <string.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    16
 
 #include <fcntl.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    17
 
+#include <limits.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    18
 
 #include <sys/stat.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    19
 
 #include <sys/types.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    20
 
 #include <sys/param.h>
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    21
 
--- libgphoto2-2.4.9/libgphoto2_port/configure.ac-orig	2010-04-20 11:12:05.460272323 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    22
 
+++ libgphoto2-2.4.9/libgphoto2_port/configure.ac	2010-04-20 11:33:14.304568030 -0500
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    23
 
@@ -354,7 +354,7 @@ AC_CHECK_LIB(pthread, pthread_create)
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    24
 
 GP_CONFIG_MSG([USB ports])
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    25
 
 GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5],
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    26
 
 		[usb.h],[usb_open],[
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    27
 
-	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb usbdiskdirect usbscsi"
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    28
 
+	IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb usbdiskdirect"
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    29
 
 ],[],
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    30
 
 		[disable-explicitly],
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    31
 
 		[http://libusb.sourceforge.net/]
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    32
 
@@ -363,6 +363,14 @@ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    33
 
 dnl depends on libusb's availability
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    34
 
 GP_UDEV([test "x$have_LIBUSB" = xyes])
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    35
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    36
 
+if test "x$have_LIBUSB" = "xyes"; then
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    37
 
+	AC_CHECK_HEADER([scsi/sg.h],
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    38
 
+			[have_sg=yes])
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    39
 
+	if test "x$have_sg" = "xyes"; then
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    40
 
+		IOLIB_SUBDIRS="$IOLIB_SUBDIRS usbscsi"
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    41
 
+	fi
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    42
 
+fi
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    43
 
+
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    44
 
 dnl ---------------------------------------------------------------------------
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    45
 
 dnl disk - hal and various stuff
89c68f7e6b08 2010-04-20 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    46
 
 dnl ---------------------------------------------------------------------------
upstream/oracle/spec-files