diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 8bb8ffda7..be092950b 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -20,7 +20,7 @@ jobs: - name: Update brew run: brew update - name: Install brew packages - run: brew install nasm subversion ncurses + run: brew install nasm subversion ncurses md5sha1sum - name: Install SDRplay API run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg @@ -95,7 +95,7 @@ jobs: - name: Update brew run: brew update - name: Install brew packages - run: brew install nasm subversion ncurses + run: brew install nasm subversion ncurses md5sha1sum - name: Install SDRplay API run: | wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg diff --git a/cmake/cpack/deploy_mac.cmake.in b/cmake/cpack/deploy_mac.cmake.in index d6015e85a..6ef9054f6 100644 --- a/cmake/cpack/deploy_mac.cmake.in +++ b/cmake/cpack/deploy_mac.cmake.in @@ -41,3 +41,6 @@ endforeach() message ("Running macdeployqt in ${CPACK_TEMPORARY_INSTALL_DIRECTORY}") execute_process ( COMMAND macdeployqt ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app -always-overwrite -verbose=1 -qmldir=@CMAKE_CURRENT_SOURCE_DIR@/../../plugins/ ) +# macdeployqt corrupts libusb signature, so resign it. See: https://github.com/f4exb/sdrangel/issues/2524 +execute_process ( COMMAND echo "resigning" ) +execute_process ( COMMAND codesign --force --sign - ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/SDRangel.app/Contents/Frameworks/libusb-1.0.0.dylib ) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 63f1c27fb..887286bdb 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -213,7 +213,7 @@ endmacro() if (NOT LIBUSB_FOUND AND NOT USE_PRECOMPILED_LIBS) # Cloning git repo doesn't include configure, so we download the bz2 which does ExternalProject_Add(libusb - URL https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2 + URL https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.tar.bz2 PREFIX "${EXTERNAL_BUILD_LIBRARIES}/libusb" CONFIGURE_COMMAND /configure --prefix= BUILD_COMMAND ${MAKE} @@ -1414,7 +1414,7 @@ if (WIN32 OR APPLE) set(LIBHACKRF_LIBRARIES "${binary_dir}/src/libhackrf${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") # include "libhackrf/hackrf.h" makeLink("${source_dir}/host/libhackrf/src" "${source_dir}/host/libhackrf/libhackrf" hackrf) - set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/") + set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/src") install(DIRECTORY "${binary_dir}/src/" DESTINATION "${INSTALL_LIB_DIR}" FILES_MATCHING PATTERN "libhackrf*${CMAKE_SHARED_LIBRARY_SUFFIX}") endif ()