[linux-minidisc] Updated patch for cdrtools and libscg to work with HiMD Walkman

[Adrian Glaubitz <glaubitz@physik.fu-berlin.de>]

Hi,

as promised in our previous discussion before, I've updated the patch
which allows our HiMD SCSI code to work with cdrtools and libscg.

To build a working himdformat_scg on MacOS X, apply the attached patch
to cdrtools and build and install it. Then build himdformat_scg with
the following lines:

ln -s /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation libcorefoundation.dylib
gcc -D__DARWIN_X86_CC32 -I/opt/local/include -I/opt/schily/include -L/opt/local/lib -L/opt/schily/lib -L. \
    -lcorefoundation -lIOKit -lschily -lscg -o +himdformat_scg himdformat_scg.c

Note the important symbolic link in the first step. Otherwise the
compiler won't be able to resolve many symbols.

Adrian

diff -ur cdrtools-2.01.01/include/schily/xconfig.h cdrtools-2.01.01-himd/include/schily/xconfig.h
--- cdrtools-2.01.01/include/schily/xconfig.h	2009-11-05 20:05:57.000000000 +0100
+++ cdrtools-2.01.01-himd/include/schily/xconfig.h	2010-06-05 17:48:40.000000000 +0200
@@ -129,6 +129,11 @@
 #define	__JS_ARCH_CONF_INCL
 #endif
 
+#ifdef  __DARWIN_X86_GCC32
+#include <schily/i386-darwin-cc/xconfig.h>
+#define __JS_ARCH_CONF_INCL
+#endif
+
 #ifndef	__JS_ARCH_CONF_INCL
 Error unconfigured architecture
 #endif
diff -ur cdrtools-2.01.01/libscg/scsi-mac-iokit.c cdrtools-2.01.01-himd/libscg/scsi-mac-iokit.c
--- cdrtools-2.01.01/libscg/scsi-mac-iokit.c	2009-11-03 22:28:52.000000000 +0100
+++ cdrtools-2.01.01-himd/libscg/scsi-mac-iokit.c	2010-06-06 11:31:26.000000000 +0200
@@ -129,7 +129,7 @@
 	FILE	*f;
 {
 	__scg_help(f, "SCSITaskDeviceInterface", "Apple SCSI",
-		"", "Mac Prom device name", "IOCompactDiscServices/0 or IODVDServices/0 or IOBDServices/0",
+		"", "Mac Prom device name", "IOCompactDiscServices/0 or IODVDServices/0 or IOBDServices/0 or IOBlockStorageServices/0",
 								FALSE, FALSE);
 	return (0);
 }
@@ -138,6 +138,7 @@
 		"IOCompactDiscServices",
 		"IODVDServices",
 		"IOBDServices",
+		"IOBlockStorageServices",
 		0
 };
 #define	NDEVS	((int)(sizeof (devnames) / sizeof (devnames[0]) - 1))