Skip to content

Commit

Permalink
Merge pull request #991 from gqrx-sdr/fix-pluto
Browse files Browse the repository at this point in the history
Fix SoapyPlutoSDR driver on MacOS
  • Loading branch information
argilo authored Oct 6, 2021
2 parents b96b40c + 2f9b900 commit c9f1368
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
cd /tmp
git clone https://github.com/analogdevicesinc/libiio.git
cd libiio
git checkout v0.23
mkdir build
cd build
cmake ..
Expand Down Expand Up @@ -130,8 +131,8 @@ jobs:
cp /Library/Frameworks/ad9361.framework/ad9361 /usr/local/lib/libad9361.dylib
install_name_tool -id "/usr/local/lib/libad9361.dylib" /usr/local/lib/libad9361.dylib
install_name_tool -delete_rpath /Library/Frameworks /usr/local/lib/libad9361.dylib
install_name_tool -change @rpath/iio.framework/Versions/0.21/iio /usr/local/lib/libiio.dylib /usr/local/lib/libad9361.dylib
install_name_tool -change @rpath/iio.framework/Versions/0.21/iio /usr/local/lib/libiio.dylib /usr/local/lib/SoapySDR/modules0.*/libPlutoSDRSupport.so
install_name_tool -change @rpath/iio.framework/Versions/0.23/iio /usr/local/lib/libiio.dylib /usr/local/lib/libad9361.dylib
install_name_tool -change @rpath/iio.framework/Versions/0.23/iio /usr/local/lib/libiio.dylib /usr/local/lib/SoapySDR/modules0.*/libPlutoSDRSupport.so
install_name_tool -change @rpath/ad9361.framework/Versions/0.2/ad9361 /usr/local/lib/libad9361.dylib /usr/local/lib/SoapySDR/modules0.*/libPlutoSDRSupport.so
cd /tmp
Expand Down
13 changes: 12 additions & 1 deletion macos_bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ mkdir -p Gqrx.app/Contents/Resources
</plist>
EOM

/bin/cat <<EOM >Entitlements.plist
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>
EOM

cp build/src/gqrx Gqrx.app/Contents/MacOS
cp resources/icons/gqrx.icns Gqrx.app/Contents/Resources
cp -r /usr/local/lib/SoapySDR/modules* Gqrx.app/Contents/soapy-modules
Expand All @@ -48,5 +59,5 @@ ln -sf /usr/local/opt/[email protected]/Frameworks/Python.framework /usr/local/opt/pyth

for f in Gqrx.app/Contents/libs/*.dylib Gqrx.app/Contents/soapy-modules/*.so Gqrx.app/Contents/Frameworks/Python.framework/Versions/3.9/Resources/Python.app/Contents/MacOS/Python Gqrx.app/Contents/Frameworks/*.framework Gqrx.app/Contents/MacOS/gqrx
do
codesign --force --verify --verbose --timestamp --options runtime --sign $IDENTITY $f
codesign --force --verify --verbose --timestamp --options runtime --entitlements Entitlements.plist --sign $IDENTITY $f
done
6 changes: 6 additions & 0 deletions resources/news.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

2.14.6: In progress...

FIXED: SoapyPlutoSDR driver on MacOS.
IMPROVED: MacOS releases are now signed & notarized.


2.14.5: Released October 3, 2021

NEW: Added SoapyRemote to AppImage and DMG releases.
Expand Down

0 comments on commit c9f1368

Please sign in to comment.