-
Notifications
You must be signed in to change notification settings - Fork 23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add lv2, serd, sord, sratom, and lilv support to macOS build. #15 #43
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echo commands | ||
| set -x | ||
|
|
||
| # Quit on errors | ||
| set -e | ||
|
|
||
| # Get the path to our scripts folder. | ||
| pushd `dirname $0` > /dev/null | ||
| PROGDIR=`pwd -P` | ||
| popd > /dev/null | ||
|
|
||
| export VERSION_NUMBER=0.24.2 | ||
| export VERSION=lilv-${VERSION_NUMBER} | ||
| export ARCHIVE=$VERSION.tar.bz2 | ||
|
|
||
| echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" | ||
|
|
||
| # You may need to change these from version to version. | ||
| export DYLIB=build/liblilv-0.0.24.2.dylib | ||
| export STATICLIB=build/liblilv-0.a | ||
|
|
||
| for ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| mkdir -p $VERSION-$ARCH | ||
| tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
| ./waf configure build --static --prefix="$MIXXX_PREFIX" | ||
| cd .. | ||
| done | ||
|
|
||
| # Install the $HOST_ARCH version in case there are binaries we want to run. | ||
| export ARCH=$HOST_ARCH | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| OTHER_DYLIBS=() | ||
| OTHER_STATICLIBS=() | ||
| for OTHER_ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| if [ $OTHER_ARCH != $ARCH ]; then | ||
| OTHER_DYLIBS+=(../$VERSION-$OTHER_ARCH/$DYLIB) | ||
| OTHER_STATICLIBS+=(../$VERSION-$OTHER_ARCH/$STATICLIB) | ||
| fi | ||
| done | ||
|
|
||
| lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB | ||
| lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB | ||
| ./waf install | ||
| cd .. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echo commands | ||
| set -x | ||
|
|
||
| # Quit on errors | ||
| set -e | ||
|
|
||
| # Get the path to our scripts folder. | ||
| pushd `dirname $0` > /dev/null | ||
| PROGDIR=`pwd -P` | ||
| popd > /dev/null | ||
|
|
||
| export VERSION_NUMBER=1.14.0 | ||
| export VERSION=lv2-${VERSION_NUMBER} | ||
| export ARCHIVE=$VERSION.tar.bz2 | ||
|
|
||
| echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" | ||
|
|
||
| for ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| mkdir -p $VERSION-$ARCH | ||
| tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| ./waf configure build --lv2dir "$MIXXX_PREFIX/Library/Audio/Plug-Ins/LV2" --prefix="$MIXXX_PREFIX" --no-plugins | ||
| cd .. | ||
| done | ||
|
|
||
| # Install the $HOST_ARCH version in case there are binaries we want to run. | ||
| export ARCH=$HOST_ARCH | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| # No binaries so no need to lipo anything. | ||
| ./waf install | ||
| cd .. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echo commands | ||
| set -x | ||
|
|
||
| # Quit on errors | ||
| set -e | ||
|
|
||
| # Get the path to our scripts folder. | ||
| pushd `dirname $0` > /dev/null | ||
| PROGDIR=`pwd -P` | ||
| popd > /dev/null | ||
|
|
||
| export VERSION_NUMBER=0.28.0 | ||
| export VERSION=serd-${VERSION_NUMBER} | ||
| export ARCHIVE=$VERSION.tar.bz2 | ||
|
|
||
| echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" | ||
|
|
||
| # You may need to change these from version to version. | ||
| export DYLIB=build/libserd-0.0.28.0.dylib | ||
| export STATICLIB=build/libserd-0.a | ||
|
|
||
| for ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| mkdir -p $VERSION-$ARCH | ||
| tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
| ./waf configure build --static --prefix="$MIXXX_PREFIX" | ||
| cd .. | ||
| done | ||
|
|
||
| # Install the $HOST_ARCH version in case there are binaries we want to run. | ||
| export ARCH=$HOST_ARCH | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| OTHER_DYLIBS=() | ||
| OTHER_STATICLIBS=() | ||
| for OTHER_ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| if [ $OTHER_ARCH != $ARCH ]; then | ||
| OTHER_DYLIBS+=(../$VERSION-$OTHER_ARCH/$DYLIB) | ||
| OTHER_STATICLIBS+=(../$VERSION-$OTHER_ARCH/$STATICLIB) | ||
| fi | ||
| done | ||
|
|
||
| lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB | ||
| lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB | ||
| ./waf install | ||
| cd .. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echo commands | ||
| set -x | ||
|
|
||
| # Quit on errors | ||
| set -e | ||
|
|
||
| # Get the path to our scripts folder. | ||
| pushd `dirname $0` > /dev/null | ||
| PROGDIR=`pwd -P` | ||
| popd > /dev/null | ||
|
|
||
| export VERSION_NUMBER=0.16.0 | ||
| export VERSION=sord-${VERSION_NUMBER} | ||
| export ARCHIVE=$VERSION.tar.bz2 | ||
|
|
||
| echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" | ||
|
|
||
| # You may need to change these from version to version. | ||
| export DYLIB=build/libsord-0.0.16.0.dylib | ||
| export STATICLIB=build/libsord-0.a | ||
|
|
||
| for ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| mkdir -p $VERSION-$ARCH | ||
| tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
| ./waf configure build --static --prefix="$MIXXX_PREFIX" | ||
| cd .. | ||
| done | ||
|
|
||
| # Install the $HOST_ARCH version in case there are binaries we want to run. | ||
| export ARCH=$HOST_ARCH | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| OTHER_DYLIBS=() | ||
| OTHER_STATICLIBS=() | ||
| for OTHER_ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| if [ $OTHER_ARCH != $ARCH ]; then | ||
| OTHER_DYLIBS+=(../$VERSION-$OTHER_ARCH/$DYLIB) | ||
| OTHER_STATICLIBS+=(../$VERSION-$OTHER_ARCH/$STATICLIB) | ||
| fi | ||
| done | ||
|
|
||
| lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB | ||
| lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB | ||
| ./waf install | ||
| cd .. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Echo commands | ||
| set -x | ||
|
|
||
| # Quit on errors | ||
| set -e | ||
|
|
||
| # Get the path to our scripts folder. | ||
| pushd `dirname $0` > /dev/null | ||
| PROGDIR=`pwd -P` | ||
| popd > /dev/null | ||
|
|
||
| export VERSION_NUMBER=0.6.0 | ||
| export VERSION=sratom-${VERSION_NUMBER} | ||
| export ARCHIVE=$VERSION.tar.bz2 | ||
|
|
||
| echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" | ||
|
|
||
| # You may need to change these from version to version. | ||
| export DYLIB=build/libsratom-0.0.6.0.dylib | ||
| export STATICLIB=build/libsratom-0.a | ||
|
|
||
| for ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| mkdir -p $VERSION-$ARCH | ||
| tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
| ./waf configure build --static --prefix="$MIXXX_PREFIX" | ||
| cd .. | ||
| done | ||
|
|
||
| # Install the $HOST_ARCH version in case there are binaries we want to run. | ||
| export ARCH=$HOST_ARCH | ||
| cd $VERSION-$ARCH | ||
| source $PROGDIR/environment.sh $ARCH | ||
|
|
||
| OTHER_DYLIBS=() | ||
| OTHER_STATICLIBS=() | ||
| for OTHER_ARCH in ${MIXXX_ARCHS[@]} | ||
| do | ||
| if [ $OTHER_ARCH != $ARCH ]; then | ||
| OTHER_DYLIBS+=(../$VERSION-$OTHER_ARCH/$DYLIB) | ||
| OTHER_STATICLIBS+=(../$VERSION-$OTHER_ARCH/$STATICLIB) | ||
| fi | ||
| done | ||
|
|
||
| lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB | ||
| lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB | ||
| ./waf install | ||
| cd .. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't
--lv2dirbe/Library/Audio/Plug-Ins/LV2according to the LV2 standard?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does anything need to be specified for the
--lv2dirargument?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you don't set --lvd2dir then this installer script tries to install a bunch of manifest junk to /Library/Audio/Plug-Ins/LV2 on the build VM, so I changed it to $PREFIX//Library/Audio/Plug-Ins/LV2. I don't know what we're supposed to do with these manifests -- does Mixxx need to install them on the user's computer? We don't have an installer on macOS, the user just drops the Mixxx.app bundle into /Applications.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Put another way, we don't want to change the build VM's global state since each environment should be hermetic, so I had this write to
$MIXXX_PREFIX/Library/Audio/Plug-Ins/LV2instead of/Library/Audio/Plug-Ins/LV2.From what I can tell, this option only affects where files are written -- I grepped for
$MIXXX_PREFIXin all of the generated files and it doesn't occur.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I presumed
--lv2dirset the default plugin search path, but it seems I was wrong. It's not clear to me what these manifests do or if they're really necessary. The README in schemas.lv2 says "These are included with LV2 and installed as a bundle to support validation andmore intelligent use of data by hosts."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Alright, well I'll merge this now. If there is an issue with macOS builds detecting LV2 plugins, let's keep this in mind.