This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit d86e2e1c8450ac757b190dbedd97d62041d94c68
Author: Mihai Moldovan <io...@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 7f257e7..becb3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,6 +112,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
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.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-...@lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index cff39ae..7b14bb5 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -287,6 +287,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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
