[sane-devel] Re: Darwin/MacOSX
Peter O'Gorman
peter@pogma.com
Thu, 28 Nov 2002 21:12:03 +0900
--Apple-Mail-4-48781561
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
On Thursday, November 28, 2002, at 08:47 PM, Karl Heinz Kremer wrote:
> It's possilbe that it's not a problem with Sane. There are two other
> systems
> involved: libusb and Darwin. My plan is to replace libusb with some
> code that
> talks to the Darwin USB functions directly. I started this some time
> ago, and
> the first result was that I found a bug in Sane (which is fixed in
> CVS).
> Somebody reported success yesterday or the day before with a Canon
> scanner
> under OS X. Henning asked for more information, but I have not seen
> anything
> yet.
>
Okay, okay, I get the message :)
Note that a dlopen compatibility library is needed, I suggest using
dlcompat <http://www.opendarwin.org/projects/dlcompat>, but I am a
little biased :)
--Apple-Mail-4-48781561
Content-Disposition: attachment;
filename=sane-backends-1.0.9.patch.gz
Content-Transfer-Encoding: base64
Content-Type: application/x-gzip;
x-unix-mode=0644;
name="sane-backends-1.0.9.patch.gz"
H4sICGIH5j0CA3NhbmUtYmFja2VuZHMtMS4wLjkucGF0Y2gAzVbvW9s2EP4c/xW31DSEYJMfBIY7
tjiQrmmdhIdQ6DY2z7GVxMORPEsOZWv/950kA1uBLHzY8ywffJLuvTud7vQqUTydgjUM8gx4QIk1
CcIrQiNuNey6fWCzLJ7tFGs7g+CKTOOE2DF9DPwYzrAs61mOS+OcwpikAA1oNp3dPafdgma93jRq
tdq6UZWTIVtCcxcaB85u3Wl9rZ10OmA1Wgfb+1DTotMxIIknyvGGnQQO4JfBhsWlMDd7H85O3SoO
vH531H07rhpQ6qjZ2WjkScXA6w/fycHRURUs8jFlmbCiGxos4hAs9NFBnbnlo8m4Cpdoj+bHrz33
+7G06rpH73rDY601fwErSwMxR0WxqyjOpJVVspYk4zGjVkyncmfn/sB9OzqtOnJ42jvXg0F/iGtG
7VlwsBYsyhNigFFk7pSkDB8mezQanKhkUfa9Hpoej8/ed8coi0z8oTvoHZpbYH5jRM/orihJ7HBl
hRVivY5SUNUGbppBE3up5TRa2Anr9dK9+ZNd1Nzbl10kRaOh2ugFxNOITMH352n+Uc4BcB5TAiej
8dnr/gco2zyxN/KyVJKEE6OGoFsr9+TE6/m+WntouJHbnJWVUlk+4Z4p9wpF8fRVID0AwCITOIQZ
EYQuYbPsHfvdvizY6KJche/g9MxTE3D00HN//OEVeiBJPC1CRZtv3POeP37j+d7IPa6uVeGQ0Wk8
yzPy6JnfaVdX9g5WuiARjEKBJYV628HKNJurq3pvurKie+39hixpIWVJ5e8FFL8wY5xbIVukcRII
vFrbMMkF5Hi/MpHTQJDkBsScAAnnDAThgkPEgDLxhaMbIvA4BcEc/uBzBa9wyMiCLYME2BQugfAw
SAm3AdyEMwVbBHSWEF74Kinxa7kCv+cMY2EXwTWBFDeEW1gAUvScZMS2bUD7iNGK+MqwpE2QhfN4
SfxwEfHDikkZZanAGy03DLapmQDbxL5Bry9f6mysSU4jXP70qZgXBIckhWwQJAm79hGhe8SfJsFM
UR+q1YdNfuNgRiSVpIYL9IpkCsUB+YkLdOCjPwKmYr8dkzM9lSQmspjOKkbtf7j5JwJjoE0dab3k
qtXKbYtcEKAEG1wwCKIIKn5FDmVX8ZvFhCVcVtbUr4x/uzSN0VHh4faEEIJqfVBl8+/nhj2DJyMj
p2DxL50VO5kHWRQiX/j4/mCjHmJaa911qYj118/55AlGf4BaffcfwEvjQCgOaMir79T3nHp7NQc8
4uKfXNBwWrv3XNDebUoq0EIyQUlfuPImViUjnOP/hKi6DfGMMllBVSFKroFRcknL23cGEVnGIeE/
oQxZTsXP9iRPrvyY+iStIrlqlKZ0q1RaBcfuKoK/wvf936CS9lMWU2F9O+kVQ/fWXIf9rKR+TdTC
nzr3tqJBLf6D3FkunpW8xq+X/R12zfQ/q+eNE9jZkkQN6nXD/zvvx13Y2jH+AgLx590eCwAA
--Apple-Mail-4-48781561
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
Here is my patch in full (watch for line wrapping) also attached as a
.gz:
diff -Naur sane-backends-1.0.9.orig/backend/Makefile.in
sane-backends-1.0.9/backend/Makefile.in
--- sane-backends-1.0.9.orig/backend/Makefile.in Sun Sep 1
22:46:53 2002
+++ sane-backends-1.0.9/backend/Makefile.in Sun Nov 24 19:40:38 2002
@@ -139,7 +139,7 @@
libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
- -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
+ -version-info $(V_MAJOR):$(V_REV):$(V_MINOR) -module
%-s.lo: %-s.c
@$(LIBTOOL) $(MCOMP) $(COMPILE) -DSTUBS -DBACKEND_NAME=$* $<
diff -Naur sane-backends-1.0.9.orig/backend/dll.c
sane-backends-1.0.9/backend/dll.c
--- sane-backends-1.0.9.orig/backend/dll.c Sun Apr 21 23:13:40 2002
+++ sane-backends-1.0.9/backend/dll.c Sun Nov 24 19:40:38 2002
@@ -267,7 +267,11 @@
# ifdef __hpux
# define POSTFIX ".sl.%u"
# else
+# ifdef __APPLE__
+# define POSTFIX ".%u.so"
+# else
# define POSTFIX ".so.%u"
+# endif
# endif
mode = getenv ("LD_BIND_NOW") ? RTLD_NOW : RTLD_LAZY;
#elif defined(HAVE_SHL_LOAD)
diff -Naur sane-backends-1.0.9.orig/configure
sane-backends-1.0.9/configure
--- sane-backends-1.0.9.orig/configure Wed Oct 23 05:19:22 2002
+++ sane-backends-1.0.9/configure Sun Nov 24 19:40:38 2002
@@ -6571,7 +6571,7 @@
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes. Also zsh
mangles
# `"' quotes if we put them in here... so don't!
- archive_cmds='$nonopt $(test .$module = .yes && echo -bundle ||
echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs
$deplibs$linker_flags -install_name $rpath/$soname $verstring'
+ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle ||
echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs
$deplibs$linker_flags $(test .$module = .yes || (echo -install_name
$rpath/$soname $verstring))'
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
diff -Naur sane-backends-1.0.9.orig/sanei/sanei_usb.c
sane-backends-1.0.9/sanei/sanei_usb.c
--- sane-backends-1.0.9.orig/sanei/sanei_usb.c Sat Oct 12 20:06:05 2002
+++ sane-backends-1.0.9/sanei/sanei_usb.c Sun Nov 24 19:41:34 2002
@@ -542,7 +542,7 @@
"(address: %d), ignoring the new one\n",
devices[devcount].bulk_in_ep);
else
- devices[devcount].bulk_in_ep = address;
+ devices[devcount].bulk_in_ep =
endpoint->bEndpointAddress;
}
else
{
@@ -551,7 +551,7 @@
"(address: %d), ignoring the new one\n",
devices[devcount].bulk_out_ep);
else
- devices[devcount].bulk_out_ep = address;
+ devices[devcount].bulk_out_ep =
endpoint->bEndpointAddress;
}
}
#else /* not HAVE_LIBUSB */
--Apple-Mail-4-48781561--