From 5bdc63a2086c1ffd4c34c9a503af638a47a1d98b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 1 Sep 2020 18:31:03 -0700 Subject: [PATCH] libaltos: Update to support Mac OS X 10.15 (catalina) They decided to break device names reported by USB for some reason, but at least the real names are still available under a different name. Also updated the Makefile-standalone to work on my current box; presumably the next time I build this I'll have to update again... Signed-off-by: Keith Packard --- libaltos/Makefile-standalone | 6 +++--- libaltos/libaltos.dylib | Bin 46228 -> 21820 bytes libaltos/libaltos_darwin.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone index 1430aacb..77c7cca5 100644 --- a/libaltos/Makefile-standalone +++ b/libaltos/Makefile-standalone @@ -33,12 +33,12 @@ OS_SRCS=libaltos_posix.c libaltos_darwin.c # -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ # -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers -XCODE=/Applications/Xcode-beta.app -SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk +XCODE=/Applications/Xcode.app +SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk MINVERSION=10.5 OS_LIB_CFLAGS=\ - -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 -isysroot $(SDK) \ + -DDARWIN -DPOSIX_TTY -arch x86_64 -isysroot $(SDK) \ -mmacosx-version-min=10.5 \ -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \ -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \ diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib index c18493ea7836aca971c0f9ebe8b3b04b1b8d85de..0d5b9c46309e1ec164fbe924bb3921b099bb8013 100755 GIT binary patch literal 21820 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 Y!a;v)B(j;Nn4F{76Zo9b7HC)gAEy->ga7~l literal 46228 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 && get_number (usb_device, CFSTR(kUSBProductID), &device->product) && get_string (object, CFSTR(kIOCalloutDeviceKey), device->path, sizeof (device->path)) && - get_string (usb_device, CFSTR(kUSBProductString), device->name, sizeof (device->name)) && + (get_string (usb_device, CFSTR("kUSBProductString"), device->name, sizeof (device->name)) || + get_string (usb_device, CFSTR(kUSBProductString), device->name, sizeof (device->name))) && get_string (usb_device, CFSTR(kUSBSerialNumberString), serial_string, sizeof (serial_string))) { device->serial = atoi(serial_string); IOObjectRelease(object); -- 2.30.2