Fix macOS ARM64 libusb include paths

Author: seasonyuu

crates/dsview-sys/build.rs

@@ -332,9 +332,20 @@ fn bridge_dependency_include_flags(_target: &TargetInfo) -> Vec<String> {
     let mut flags = Vec::new();
     for package in ["glib-2.0", "libusb-1.0", "fftw3"] {
         for flag in pkg_config_output(package, "--cflags") {
+            let parent_flag = if package == "libusb-1.0" {
+                normalized_libusb_include_flag(&flag)
+            } else {
+                None
+            };
+
             if !flags.contains(&flag) {
                 flags.push(flag);
             }
+            if let Some(parent_flag) = parent_flag {
+                if !flags.contains(&parent_flag) {
+                    flags.push(parent_flag);
+                }
+            }
         }
     }
     flags
@@ -529,3 +540,13 @@ fn append_msvc_flag(command: &mut Command, flag: &str) {
         command.arg(flag);
     }
 }
+
+fn normalized_libusb_include_flag(flag: &str) -> Option<String> {
+    let include_path = flag.strip_prefix("-I")?;
+    let include_path = Path::new(include_path);
+    if include_path.file_name()? != "libusb-1.0" {
+        return None;
+    }
+
+    Some(format!("-I{}", include_path.parent()?.display()))
+}

crates/dsview-sys/native/CMakeLists.txt

@@ -18,6 +18,16 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
 pkg_check_modules(FFTW REQUIRED fftw3)
 
+set(LIBUSB_NORMALIZED_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIRS})
+foreach(LIBUSB_INCLUDE_DIR IN LISTS LIBUSB_INCLUDE_DIRS)
+    get_filename_component(LIBUSB_INCLUDE_BASENAME "${LIBUSB_INCLUDE_DIR}" NAME)
+    if(LIBUSB_INCLUDE_BASENAME STREQUAL "libusb-1.0")
+        get_filename_component(LIBUSB_INCLUDE_PARENT "${LIBUSB_INCLUDE_DIR}" DIRECTORY)
+        list(APPEND LIBUSB_NORMALIZED_INCLUDE_DIRS "${LIBUSB_INCLUDE_PARENT}")
+    endif()
+endforeach()
+list(REMOVE_DUPLICATES LIBUSB_NORMALIZED_INCLUDE_DIRS)
+
 find_package(ZLIB REQUIRED)
 find_package(Threads REQUIRED)
 
@@ -61,7 +71,7 @@ target_include_directories(dsview_runtime PRIVATE
     ${LIBSIGROK_ROOT}
     ${COMMON_ROOT}
     ${GLIB_INCLUDE_DIRS}
-    ${LIBUSB_INCLUDE_DIRS}
+    ${LIBUSB_NORMALIZED_INCLUDE_DIRS}
     ${FFTW_INCLUDE_DIRS}
 )