From 5bdff87e3f1a8265cd9ad36e5574dbdaf89c3def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Mon, 4 Nov 2019 13:07:15 +0100 Subject: [PATCH 1/5] ci(macos): fix lookup path of Qt dependencies for new OBS bundle format --- CI/package-macos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/package-macos.sh b/CI/package-macos.sh index 5411ad2d..4413f46e 100755 --- a/CI/package-macos.sh +++ b/CI/package-macos.sh @@ -23,9 +23,9 @@ export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg" echo "[obs-websocket] Modifying obs-websocket.so" install_name_tool \ - -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @rpath/QtWidgets \ - -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @rpath/QtGui \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \ + -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ + -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ ./build/obs-websocket.so # Check if replacement worked From 070660848bf77cae5d3ac8f7f52927cd83cae070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Mon, 11 Nov 2019 13:27:33 +0100 Subject: [PATCH 2/5] ci(macos): use @rpath in package script --- CI/package-macos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/package-macos.sh b/CI/package-macos.sh index 4413f46e..65438f47 100755 --- a/CI/package-macos.sh +++ b/CI/package-macos.sh @@ -23,9 +23,9 @@ export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg" echo "[obs-websocket] Modifying obs-websocket.so" install_name_tool \ - -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ - -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ + -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ + -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ ./build/obs-websocket.so # Check if replacement worked From 11b948fb69f1a6d6a3f5279da5cb63c69939dc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Mon, 11 Nov 2019 13:36:04 +0100 Subject: [PATCH 3/5] Revert "ci(macos): use @rpath in package script" This reverts commit 070660848bf77cae5d3ac8f7f52927cd83cae070. --- CI/package-macos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/package-macos.sh b/CI/package-macos.sh index 65438f47..4413f46e 100755 --- a/CI/package-macos.sh +++ b/CI/package-macos.sh @@ -23,9 +23,9 @@ export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg" echo "[obs-websocket] Modifying obs-websocket.so" install_name_tool \ - -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ - -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ + -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ + -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ ./build/obs-websocket.so # Check if replacement worked From ebf631a15fa119c890b3dbec48c427925ff42e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Mon, 11 Nov 2019 14:54:17 +0100 Subject: [PATCH 4/5] ci(macos): fix lib paths in package script --- CI/package-macos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/package-macos.sh b/CI/package-macos.sh index 4413f46e..e775fb00 100755 --- a/CI/package-macos.sh +++ b/CI/package-macos.sh @@ -24,8 +24,8 @@ export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg" echo "[obs-websocket] Modifying obs-websocket.so" install_name_tool \ -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ - -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtGui \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtCore \ + -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \ + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \ ./build/obs-websocket.so # Check if replacement worked From 7dd8cb5d8d20d7b5892df878857efa4b001c5ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Mon, 11 Nov 2019 15:27:27 +0100 Subject: [PATCH 5/5] ci(macos): use framework rpath in package script --- CI/package-macos.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CI/package-macos.sh b/CI/package-macos.sh index e775fb00..b68c40a8 100755 --- a/CI/package-macos.sh +++ b/CI/package-macos.sh @@ -23,9 +23,12 @@ export LATEST_FILENAME="obs-websocket-latest-$LATEST_VERSION.pkg" echo "[obs-websocket] Modifying obs-websocket.so" install_name_tool \ - -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets \ - -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore \ + -add_rpath @executable_path/../Frameworks/QtWidgets.framework/Versions/5/ \ + -add_rpath @executable_path/../Frameworks/QtGui.framework/Versions/5/ \ + -add_rpath @executable_path/../Frameworks/QtCore.framework/Versions/5/ \ + -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @rpath/QtWidgets \ + -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @rpath/QtGui \ + -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \ ./build/obs-websocket.so # Check if replacement worked