From d299d0ed6505921508be82ed724444a49008986e Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 9 Mar 2019 22:05:56 +0800 Subject: [PATCH] travis/macos: Use macpack to bundle dependencies This appears to properly handle the ffmpeg libraries that dylibbundler failed to patch. --- .travis/macos/deps.sh | 3 ++- .travis/macos/upload.sh | 13 ++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh index 6eaaf050f1..32295e94a6 100755 --- a/.travis/macos/deps.sh +++ b/.travis/macos/deps.sh @@ -1,4 +1,5 @@ #!/bin/sh -ex brew update -brew install qt5 sdl2 dylibbundler p7zip ccache ffmpeg +brew install qt5 sdl2 p7zip ccache ffmpeg +pip3 install macpack diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index b1e682adf7..b8791d2538 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -13,21 +13,12 @@ cp -r build/bin/citra-qt.app "$REV_NAME" cp build/bin/citra-room "$REV_NAME" # move libs into folder for deployment -dylibbundler -b -x "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -cd -d "${REV_NAME}/citra-qt.app/Contents/Frameworks/" -p "@executable_path/../Frameworks/" -of +macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks" # move qt frameworks into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" -executable="${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" # move libs into folder for deployment -dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" - -# TODO(merry): Figure out why these libraries are not automatically processed -FFMPEG_PATH="$(find $(brew --cellar ffmpeg) -type d -depth 1)" -LIBVORBIS_PATH="$(find $(brew --cellar libvorbis) -type d -depth 1)" -install_name_tool -change "${FFMPEG_PATH}/lib/libavutil.56.dylib" @executable_path/../Frameworks/libavutil.56.dylib "${REV_NAME}/citra-qt.app/Contents/Frameworks/libavcodec.58.dylib" -install_name_tool -change "${FFMPEG_PATH}/lib/libavutil.56.dylib" @executable_path/../Frameworks/libavutil.56.dylib "${REV_NAME}/citra-qt.app/Contents/Frameworks/libswresample.3.dylib" -install_name_tool -change "${FFMPEG_PATH}/lib/libavutil.56.dylib" @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libavcodec.58.dylib" -install_name_tool -change "${FFMPEG_PATH}/lib/libavutil.56.dylib" @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libswresample.3.dylib" -install_name_tool -change "${LIBVORBIS_PATH}/lib/libvorbis.0.dylib" @executable_path/libs/libavutil.56.dylib "${REV_NAME}/libs/libvorbisenc.2.dylib" +macpack "${REV_NAME}/citra" -d "libs" # Make the citra-qt.app application launch a debugging terminal. # Store away the actual binary