use macports for ffmpeg lib (no more issues on rpaths)

release_scripts/osx/release.macx.sh

@@ -19,7 +19,7 @@ PROJECT_ROOT="$SCRIPT_PATH/../.."
 
 
 APPLICATION_NAME="OpenBoard"
-BASE_QT_DIR=~/Qt/5.15.0/clang_64
+BASE_QT_DIR=~/Qt/5.15.2/clang_64
 # Executables
 QMAKE=$BASE_QT_DIR/bin/qmake
 MACDEPLOYQT=$BASE_QT_DIR/bin/macdeployqt
@@ -99,7 +99,7 @@ function addImporter {
     rm MakeFile*
     rm -rf release
     rm -rf debug
-    $QMAKE ${importerName}.pro
+    $QMAKE ${importerName}.pro -spec macx-clang
     make -j4 release
     $MACDEPLOYQT ${importerName}.app 
     cd -
@@ -143,9 +143,9 @@ notify "Generating Makefile ..."
 
 
 if [ "$1" == "1010" ]; then
-   QMAKE_CMD="$QMAKE \"DEFINES+=OS_NEWER_THAN_OR_EQUAL_TO_1010\" $APPLICATION_NAME.pro -spec macx-g++"
+   QMAKE_CMD="$QMAKE \"DEFINES+=OS_NEWER_THAN_OR_EQUAL_TO_1010\" $APPLICATION_NAME.pro -spec macx-clang"
 else
-   QMAKE_CMD="$QMAKE $APPLICATION_NAME.pro -spec macx-g++"
+   QMAKE_CMD="$QMAKE $APPLICATION_NAME.pro -spec macx-clang"
 fi
 $QMAKE_CMD
 
@@ -200,32 +200,6 @@ cd "`pwd`/build/macx/release/product/"
 $MACDEPLOYQT "`pwd`/$APPLICATION_NAME.app"
 cd -
 
-# make sure libs installed via homebrew 2.0 refer to in-app libs
- notify "relinking libs ..."
-# libavformat
-install_name_tool "$APP/Contents/Frameworks/libavformat.58.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libavcodec.58.dylib @executable_path/../Frameworks/libavcodec.58.dylib
-install_name_tool "$APP/Contents/Frameworks/libavformat.58.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libswresample.3.dylib @executable_path/../Frameworks/libswresample.3.dylib
-install_name_tool "$APP/Contents/Frameworks/libavformat.58.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib
-
-# libavcodec
-install_name_tool "$APP/Contents/Frameworks/libavcodec.58.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libswresample.3.dylib  @executable_path/../Frameworks/libswresample.3.dylib
-install_name_tool "$APP/Contents/Frameworks/libavcodec.58.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib
-
-#libswresample
-install_name_tool "$APP/Contents/Frameworks/libswresample.3.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib
-
-#libswscale
-install_name_tool "$APP/Contents/Frameworks/libswscale.5.dylib" -change /usr/local/Cellar/ffmpeg/4.3.1_1/lib/libavutil.56.dylib @executable_path/../Frameworks/libavutil.56.dylib
-
-# libhogweed
-install_name_tool "$APP/Contents/Frameworks/libhogweed.6.dylib" -change /usr/local/Cellar/nettle/3.6/lib/libnettle.8.dylib @executable_path/../Frameworks/libnettle.8.dylib
-
-# libssl
-install_name_tool "$APP/Contents/Frameworks/libssl.1.1.dylib" -change /usr/local/Cellar/openssl@1.1/1.1.1h/lib/libcrypto.1.1.dylib @executable_path/../Frameworks/libcrypto.1.1.dylib
-
-# libvorbis
-install_name_tool "$APP/Contents/Frameworks/libvorbisenc.2.dylib" -change /usr/local/Cellar/libvorbis/1.3.6/lib/libvorbis.0.dylib @executable_path/../Frameworks/libvorbis.0.dylib
-
 notify "Extracting debug information ..."
 $DSYMUTIL "$APP/Contents/MacOS/$APPLICATION_NAME" -o "$DSYM"
 $STRIP -S "$APP/Contents/MacOS/$APPLICATION_NAME"