Skip to content

Commit

Permalink
update libusb to 1.0.26. (GPSBabel#877)
Browse files Browse the repository at this point in the history
The following warnings are resolved in 1.0.25, but the lateset release is 1.0.26.
warning: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Wdeprecated-declarations]
  • Loading branch information
tsteven4 authored May 23, 2022
1 parent d2f37f8 commit a6785e5
Show file tree
Hide file tree
Showing 17 changed files with 1,241 additions and 697 deletions.
3 changes: 1 addition & 2 deletions libusb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ if(UNIX)
mac/libusb/os/darwin_usb.c
mac/libusb/os/events_posix.c
mac/libusb/os/threads_posix.c
mac/libusb/hotplug.h
mac/libusb/libusb.h
mac/libusb/libusbi.h
mac/libusb/version.h
Expand All @@ -52,7 +51,7 @@ if(UNIX)
mac/libusb/XCode/config.h
)
target_include_directories(usb-1.0 PRIVATE mac/libusb/XCode PUBLIC mac/libusb)
target_link_libraries(usb-1.0 INTERFACE objc "-framework IOKit" "-framework CoreFoundation")
target_link_libraries(usb-1.0 INTERFACE objc "-framework IOKit" "-framework CoreFoundation" "-framework Security")
list(APPEND LIBS usb-1.0)
elseif(GPSBABEL_WITH_LIBUSB STREQUAL "custom")
message(STATUS "libusb-1.0 is enabled but but must be manually configured.")
Expand Down
3 changes: 1 addition & 2 deletions libusb.pri
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ unix {
# TODO: It would be better to create an archive and link to it
# to separate library build requirements from gpsbabel requirements.
DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(\"mac/libusb/libusb.h\")
LIBS += -lobjc -framework IOKit -framework CoreFoundation
LIBS += -lobjc -framework IOKit -framework CoreFoundation -framework Security
INCLUDEPATH += mac/libusb \
mac/libusb/Xcode
SOURCES += \
Expand All @@ -46,7 +46,6 @@ unix {
mac/libusb/os/events_posix.c \
mac/libusb/os/threads_posix.c
HEADERS += \
mac/libusb/hotplug.h \
mac/libusb/libusb.h \
mac/libusb/libusbi.h \
mac/libusb/version.h \
Expand Down
2 changes: 1 addition & 1 deletion mac/libusb/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This is libusb-1.0.24 from https://libusb.info/.
This is libusb-1.0.26 from https://libusb.info/.
Since we have such problems with people
getting libusb successfully built - between the Universal Build issues
and the fact that we have to work hard to go find where it's installed
Expand Down
Loading

0 comments on commit a6785e5

Please sign in to comment.