[X2Go-Commits] [x2goclient] 44/52: macbuild.sh: add work-in-progress PulseAudio bundling.
git-admin at x2go.org
git-admin at x2go.org
Thu Jul 30 04:47:13 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 6c90ba73dd4bed532885be75f021485a3e1a06b5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 3 23:37:46 2015 +0200
macbuild.sh: add work-in-progress PulseAudio bundling.
Needs to be ripped apart and be redone, because dylibbundler is not
smart enough to handle our case.
---
debian/changelog | 3 +++
macbuild.sh | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 5a82a25..d5779a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,9 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
was not found.
- macbuild.sh: copy PulseAudio libraries and binaries.
- macbuild.sh: add phase output for bundling nxproxy.
+ - macbuild.sh: add work-in-progress PulseAudio bundling. Needs to be ripped
+ apart and be redone, because dylibbundler is not smart enough to handle
+ our case.
-- X2Go Release Manager <git-admin at x2go.org> Tue, 28 Jul 2015 06:05:27 +0200
diff --git a/macbuild.sh b/macbuild.sh
index 61df87b..7b69dcf 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -270,6 +270,41 @@ if [ "${BUNDLE}" = "1" ]; then
--install-path "@executable_path/../Frameworks/" \
--create-dir
+ phase "Bundling PulseAudio"
+ typeset cur_binary_name=""
+ for cur_binary in ${PULSEAUDIO_BINARIES_FULL[@]}; do
+ if [ ! -L "${cur_binary}" ]; then
+ cur_binary_name="$(basename "${cur_binary}")"
+ dylibbundler \
+ --fix-file "${EXE_DIR}/${cur_binary_name}" \
+ --bundle-deps \
+ --dest-dir "${FRAMEWORKS_DIR}/" \
+ --install-path "@executable_path/../Frameworks/" \
+ --create-dir \
+ --overwrite-files
+ fi
+ done
+
+ typeset intermediate_lib_dir=""
+ for cur_binary in ${PULSEAUDIO_LIBRARIES_FULL[@]}; do
+ intermediate_lib_dir="$(lazy_canonical_path "$(dirname "${cur_binary}")/")"
+ intermediate_lib_dir="${intermediate_lib_dir##"$(lazy_canonical_path "${MACPORTS_PREFIX}/lib/")"}"
+
+ if [ ! -L "${cur_binary}" ]; then
+ cur_binary_name="$(basename "${cur_binary}")"
+
+ typeset nesting_level="$(get_nesting_level "${intermediate_lib_dir}")"
+
+ dylibbundler \
+ --fix-file "${FRAMEWORKS_DIR}/${intermediate_lib_dir}/${cur_binary_name}" \
+ --bundle-deps \
+ --dest-dir "${FRAMEWORKS_DIR}/" \
+ --install-path "@loader_path/$(repeat_str "../" "${nesting_level}")Frameworks/" \
+ --create-dir \
+ --overwrite-files
+ fi
+ done
+
phase "Bundling up using macdeployqt"
macdeployqt "${APPBUNDLE}" -verbose=2
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list