From f5511edd4000b3c5a6bb46b637698ebba4035cc5 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:08:15 -0600 Subject: [PATCH 01/24] update automake to 1.16.2 --- scripts/macosx/build_automake.sh | 4 ++-- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/macosx/build_automake.sh b/scripts/macosx/build_automake.sh index 765c3942a..662e9cb31 100755 --- a/scripts/macosx/build_automake.sh +++ b/scripts/macosx/build_automake.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.15 +export VERSION_NUMBER=1.16.2 export VERSION=automake-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.xz @@ -20,4 +20,4 @@ cd $VERSION source $PROGDIR/environment.sh -./configure --prefix=$MIXXX_PREFIX && make && make install \ No newline at end of file +./configure --prefix=$MIXXX_PREFIX && make && make install diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 00dbbb41f..d82f00608 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -35,12 +35,12 @@ function download_and_verify { } download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 download_and_verify http://ftp.wayne.edu/gnu/libtool/libtool-2.4.tar.xz afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 download_and_verify https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.3.1.tar.gz 8f95a011e6fe3a75281520daa9376b7f028300e20a5be9af08ef9c851d4bb581 download_and_verify https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c +download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 download_and_verify http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 From 7142c25c56e569dea38b340cf55a06b5b1744107 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:48:56 -0600 Subject: [PATCH 02/24] update chromaprint to 1.5.0 --- scripts/macosx/build_chromaprint.sh | 6 +++--- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/macosx/build_chromaprint.sh b/scripts/macosx/build_chromaprint.sh index 0a146b191..5925c0ec0 100755 --- a/scripts/macosx/build_chromaprint.sh +++ b/scripts/macosx/build_chromaprint.sh @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.3.1 +export VERSION_NUMBER=1.5.0 export VERSION=chromaprint-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" # You may need to change these from version to version. -export DYLIB_NAME=libchromaprint.1.3.0.dylib +export DYLIB_NAME=libchromaprint.${VERSION_NUMBER}.dylib export DYLIB=src/$DYLIB_NAME export STATICLIB=src/libchromaprint_p.a @@ -50,7 +50,7 @@ do done lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB -lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB +#lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB make install # NOTE(rryan): Mixxx depends on id (not rpath) being the full path to the # dylib. Until we fix this, set the chromaprint dylib id: diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index d82f00608..8f75532ea 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -37,10 +37,10 @@ function download_and_verify { download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 download_and_verify http://ftp.wayne.edu/gnu/libtool/libtool-2.4.tar.xz afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 -download_and_verify https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-1.3.1.tar.gz 8f95a011e6fe3a75281520daa9376b7f028300e20a5be9af08ef9c851d4bb581 download_and_verify https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 +download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 download_and_verify http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 From 26fafc60217b84d60b3ce5c1a9964f4cd36eed73 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:09:40 -0600 Subject: [PATCH 03/24] update cmake to 3.18.4 --- scripts/macosx/build_cmake.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_cmake.sh b/scripts/macosx/build_cmake.sh index f7729229a..c0751c983 100755 --- a/scripts/macosx/build_cmake.sh +++ b/scripts/macosx/build_cmake.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=3.5.2 +export VERSION_NUMBER=3.18.4 export VERSION=cmake-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 8f75532ea..7e82013c8 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -37,10 +37,10 @@ function download_and_verify { download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 download_and_verify http://ftp.wayne.edu/gnu/libtool/libtool-2.4.tar.xz afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 -download_and_verify https://cmake.org/files/v3.5/cmake-3.5.2.tar.gz 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a +download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 download_and_verify http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 From e451438e534c9d169d098af00878978c686c0e41 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:10:17 -0600 Subject: [PATCH 04/24] update flac to 1.3.3 --- scripts/macosx/build_flac.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_flac.sh b/scripts/macosx/build_flac.sh index 50781f7f2..2c09a5bfa 100755 --- a/scripts/macosx/build_flac.sh +++ b/scripts/macosx/build_flac.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.3.1 +export VERSION_NUMBER=1.3.3 export VERSION=flac-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.xz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 7e82013c8..d1ec1c1e0 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -37,10 +37,10 @@ function download_and_verify { download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 download_and_verify http://ftp.wayne.edu/gnu/libtool/libtool-2.4.tar.xz afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 -download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 +download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 download_and_verify http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 From fe7e539ec3b636c9034d0c19dccc7203847addeb Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:11:24 -0600 Subject: [PATCH 05/24] update libtool to 2.4.6 --- scripts/macosx/build_libtool.sh | 4 ++-- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/macosx/build_libtool.sh b/scripts/macosx/build_libtool.sh index 6adb21d06..4bb2ac8f7 100755 --- a/scripts/macosx/build_libtool.sh +++ b/scripts/macosx/build_libtool.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=2.4 +export VERSION_NUMBER=2.4.6 export VERSION=libtool-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.xz @@ -20,4 +20,4 @@ cd $VERSION source $PROGDIR/environment.sh -./configure --prefix=$MIXXX_PREFIX && make && make install \ No newline at end of file +./configure --prefix=$MIXXX_PREFIX && make && make install diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index d1ec1c1e0..2399d37a2 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -35,9 +35,9 @@ function download_and_verify { } download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -download_and_verify http://ftp.wayne.edu/gnu/libtool/libtool-2.4.tar.xz afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 +download_and_verify http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 From 350c11d0272b76e9acbc6dff2a6fddfd1f920c47 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:12:29 -0600 Subject: [PATCH 06/24] update libusb to 1.0.23 --- scripts/macosx/build_libusb.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_libusb.sh b/scripts/macosx/build_libusb.sh index 03fa16034..e42cf2a57 100755 --- a/scripts/macosx/build_libusb.sh +++ b/scripts/macosx/build_libusb.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.0.20 +export VERSION_NUMBER=1.0.23 export VERSION=libusb-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.bz2 diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 2399d37a2..cb7237bbf 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -42,11 +42,11 @@ download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1 download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 -download_and_verify http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.tar.bz2 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 download_and_verify http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b download_and_verify http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd download_and_verify http://downloads.xiph.org/releases/opus/opusfile-0.7.tar.gz 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301 +download_and_verify https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d download_and_verify http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/217/portmidi-src-217.zip 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz From 3c72d8156768b5ece9a6b012b994eb6129717334 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:24:09 -0600 Subject: [PATCH 07/24] update lv2 to 1.18.0 --- scripts/macosx/build_lv2.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_lv2.sh b/scripts/macosx/build_lv2.sh index 685e6db4d..b6d32354a 100755 --- a/scripts/macosx/build_lv2.sh +++ b/scripts/macosx/build_lv2.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.14.0 +export VERSION_NUMBER=1.18.0 export VERSION=lv2-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.bz2 diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index cb7237bbf..ab7cfc1b0 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -61,9 +61,9 @@ download_and_verify https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz e download_and_verify https://taglib.github.io/releases/taglib-1.11.1.tar.gz b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b download_and_verify http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 download_and_verify https://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e -download_and_verify http://lv2plug.in/spec/lv2-1.14.0.tar.bz2 b8052683894c04efd748c81b95dd065d274d4e856c8b9e58b7c3da3db4e71d32 download_and_verify https://download.drobilla.net/serd-0.28.0.tar.bz2 1df21a8874d256a9f3d51a18b8c6e2539e8092b62cc2674b110307e93f898aec download_and_verify https://download.drobilla.net/sord-0.16.0.tar.bz2 9d3cb2c9966e93f537f37377171f162023cea6784ca069699be4a7770c8a035a download_and_verify https://download.drobilla.net/sratom-0.6.0.tar.bz2 440ac2b1f4f0b7878f8b95698faa1e8f8c50929a498f68ec5d066863626a3d43 download_and_verify http://download.drobilla.net/lilv-0.24.2.tar.bz2 f7ec65b1c1f1734ded3a6c051bbaf50f996a0b8b77e814a33a34e42bce50a522 download_and_verify https://github.com/frankosterfeld/qtkeychain/archive/v0.9.1.tar.gz 9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e qtkeychain-0.9.1.tar.gz +download_and_verify http://lv2plug.in/spec/lv2-1.18.0.tar.bz2 90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f From 2848fd7ae66a4b4bc7a23225bb80de13ec7a8ce3 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:15:45 -0600 Subject: [PATCH 08/24] update libogg to 1.3.3 --- scripts/macosx/build_ogg.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_ogg.sh b/scripts/macosx/build_ogg.sh index b3c967139..e8ac93eee 100755 --- a/scripts/macosx/build_ogg.sh +++ b/scripts/macosx/build_ogg.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.3.2 +export VERSION_NUMBER=1.3.3 export VERSION=libogg-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.xz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index ab7cfc1b0..bcaba5ceb 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -43,10 +43,10 @@ download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 -download_and_verify http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b download_and_verify http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd download_and_verify http://downloads.xiph.org/releases/opus/opusfile-0.7.tar.gz 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301 download_and_verify https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d +download_and_verify http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 download_and_verify http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/217/portmidi-src-217.zip 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz From 83a27dbdd0556bd13430b21ea270f4acb21baf6b Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:16:59 -0600 Subject: [PATCH 09/24] update openssl to 1.0.2u --- scripts/macosx/build_openssl.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_openssl.sh b/scripts/macosx/build_openssl.sh index fe38c66b6..295e3dda3 100755 --- a/scripts/macosx/build_openssl.sh +++ b/scripts/macosx/build_openssl.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.0.2h +export VERSION_NUMBER=1.0.2u export VERSION=openssl-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index bcaba5ceb..2a066b16f 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -42,10 +42,10 @@ download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1 download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 -download_and_verify https://www.openssl.org/source/openssl-1.0.2h.tar.gz 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 download_and_verify http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd download_and_verify http://downloads.xiph.org/releases/opus/opusfile-0.7.tar.gz 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301 download_and_verify https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d +download_and_verify https://www.openssl.org/source/openssl-1.0.2u.tar.gz ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 download_and_verify http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 download_and_verify http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/217/portmidi-src-217.zip 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f From 8262d05bbdfa1d32d6f3b3a53823b178a0e8f64a Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:17:43 -0600 Subject: [PATCH 10/24] update opus to 1.3.1 and opusfile to 0.12 --- scripts/macosx/build_opus.sh | 4 ++-- scripts/macosx/download_dependencies.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/macosx/build_opus.sh b/scripts/macosx/build_opus.sh index e5273074b..2df1aa923 100755 --- a/scripts/macosx/build_opus.sh +++ b/scripts/macosx/build_opus.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export OPUS_VERSION_NUMBER=1.1.2 +export OPUS_VERSION_NUMBER=1.3.1 export OPUS_VERSION=opus-${OPUS_VERSION_NUMBER} export OPUS_ARCHIVE=$OPUS_VERSION.tar.gz @@ -53,7 +53,7 @@ lipo -create ./$OPUS_STATICLIB ${OTHER_OPUS_STATICLIBS[@]} -output ./$OPUS_STATI make install cd .. -export OPUSFILE_VERSION_NUMBER=0.7 +export OPUSFILE_VERSION_NUMBER=0.12 export OPUSFILE_VERSION=opusfile-${OPUSFILE_VERSION_NUMBER} export OPUSFILE_ARCHIVE=$OPUSFILE_VERSION.tar.gz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 2a066b16f..b97458bbe 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -42,11 +42,11 @@ download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1 download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 -download_and_verify http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz 0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd -download_and_verify http://downloads.xiph.org/releases/opus/opusfile-0.7.tar.gz 9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301 download_and_verify https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2 db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d download_and_verify https://www.openssl.org/source/openssl-1.0.2u.tar.gz ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 download_and_verify http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 +download_and_verify https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.3.1.tar.gz 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d +download_and_verify https://ftp.osuosl.org/pub/xiph/releases/opus/opusfile-0.12.tar.gz 118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b download_and_verify http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/217/portmidi-src-217.zip 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz From f0f7b4b85a1ee9fce8431fab7d58245931313626 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:18:10 -0600 Subject: [PATCH 11/24] update pkgconfig to 0.29.2 --- scripts/macosx/build_pkgconfig.sh | 4 ++-- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/macosx/build_pkgconfig.sh b/scripts/macosx/build_pkgconfig.sh index 5d5c0d961..c68022701 100755 --- a/scripts/macosx/build_pkgconfig.sh +++ b/scripts/macosx/build_pkgconfig.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.29.1 +export VERSION_NUMBER=0.29.2 export VERSION=pkg-config-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz @@ -20,4 +20,4 @@ cd $VERSION source $PROGDIR/environment.sh -./configure --prefix=$MIXXX_PREFIX --with-internal-glib && make && make install \ No newline at end of file +./configure --prefix=$MIXXX_PREFIX --with-internal-glib && make && make install diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index b97458bbe..0a43f562e 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -35,9 +35,9 @@ function download_and_verify { } download_and_verify http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.1.tar.gz beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0 download_and_verify http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f +download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 From 73651d8d6cbd1f961ace04a54c3ab45ee89ce788 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:19:34 -0600 Subject: [PATCH 12/24] update qtkeychain to 0.11.1 --- scripts/macosx/build_qtkeychain.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_qtkeychain.sh b/scripts/macosx/build_qtkeychain.sh index 3e1ed20c4..6f92c5002 100755 --- a/scripts/macosx/build_qtkeychain.sh +++ b/scripts/macosx/build_qtkeychain.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.9.1 +export VERSION_NUMBER=0.11.1 export QT_VERSION=${MIXXX_QT_VERSION} export VERSION=qtkeychain-${VERSION_NUMBER} diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 0a43f562e..93c2b5e64 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -65,5 +65,5 @@ download_and_verify https://download.drobilla.net/serd-0.28.0.tar.bz2 1df21a8874 download_and_verify https://download.drobilla.net/sord-0.16.0.tar.bz2 9d3cb2c9966e93f537f37377171f162023cea6784ca069699be4a7770c8a035a download_and_verify https://download.drobilla.net/sratom-0.6.0.tar.bz2 440ac2b1f4f0b7878f8b95698faa1e8f8c50929a498f68ec5d066863626a3d43 download_and_verify http://download.drobilla.net/lilv-0.24.2.tar.bz2 f7ec65b1c1f1734ded3a6c051bbaf50f996a0b8b77e814a33a34e42bce50a522 -download_and_verify https://github.com/frankosterfeld/qtkeychain/archive/v0.9.1.tar.gz 9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e qtkeychain-0.9.1.tar.gz download_and_verify http://lv2plug.in/spec/lv2-1.18.0.tar.bz2 90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f +download_and_verify https://github.com/frankosterfeld/qtkeychain/archive/v0.11.1.tar.gz 77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d qtkeychain-0.11.1.tar.gz From c379ab69eb3dcf059df0c0363ab441811fd2f988 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:20:57 -0600 Subject: [PATCH 13/24] update rubberband to 1.9.0 --- scripts/macosx/build_rubberband.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_rubberband.sh b/scripts/macosx/build_rubberband.sh index c4b3c6459..27da6ab3b 100755 --- a/scripts/macosx/build_rubberband.sh +++ b/scripts/macosx/build_rubberband.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.8.1 +export VERSION_NUMBER=1.9.0 export VERSION=rubberband-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.bz2 diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 93c2b5e64..9b1ad5cfd 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -52,8 +52,8 @@ download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/ download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz #download_and_verify https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 download_and_verify https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa -download_and_verify http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2 ff0c63b0b5ce41f937a8a3bc560f27918c5fe0b90c6bc1cb70829b86ada82b75 download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.1.tar.gz f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d +download_and_verify https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2 4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026 download_and_verify https://downloads.sourceforge.net/project/libshoutidjc.idjc.p/libshout-idjc-2.4.1.tar.gz 4751c75fc85fc5d10e5b03753b046bcdee39576278bf30565c751816a87facdf download_and_verify http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.26.tar.gz cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092 download_and_verify http://prdownloads.sourceforge.net/scons/scons-2.5.0.tar.gz eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9 From 0acdeffce71ef8cab6e86ed1c84cd97e52800a6f Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:25:33 -0600 Subject: [PATCH 14/24] update to lilv 0.24.10, serd 0.30.4, sord 0.16.4, sratom 0.6.6 --- scripts/macosx/build_lilv.sh | 4 ++-- scripts/macosx/build_serd.sh | 4 ++-- scripts/macosx/build_sord.sh | 4 ++-- scripts/macosx/build_sratom.sh | 4 ++-- scripts/macosx/download_dependencies.sh | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/macosx/build_lilv.sh b/scripts/macosx/build_lilv.sh index e43d835f8..3abd61ca6 100755 --- a/scripts/macosx/build_lilv.sh +++ b/scripts/macosx/build_lilv.sh @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.24.2 +export VERSION_NUMBER=0.24.10 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 DYLIB=build/liblilv-0.${VERSION_NUMBER}.dylib export STATICLIB=build/liblilv-0.a for ARCH in ${MIXXX_ARCHS[@]} diff --git a/scripts/macosx/build_serd.sh b/scripts/macosx/build_serd.sh index c35a244d1..ba8810329 100755 --- a/scripts/macosx/build_serd.sh +++ b/scripts/macosx/build_serd.sh @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.28.0 +export VERSION_NUMBER=0.30.4 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 DYLIB=build/libserd-0.${VERSION_NUMBER}.dylib export STATICLIB=build/libserd-0.a for ARCH in ${MIXXX_ARCHS[@]} diff --git a/scripts/macosx/build_sord.sh b/scripts/macosx/build_sord.sh index 071870601..23f3297c7 100755 --- a/scripts/macosx/build_sord.sh +++ b/scripts/macosx/build_sord.sh @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.16.0 +export VERSION_NUMBER=0.16.4 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 DYLIB=build/libsord-0.${VERSION_NUMBER}.dylib export STATICLIB=build/libsord-0.a for ARCH in ${MIXXX_ARCHS[@]} diff --git a/scripts/macosx/build_sratom.sh b/scripts/macosx/build_sratom.sh index 40880fd5c..92e396f19 100755 --- a/scripts/macosx/build_sratom.sh +++ b/scripts/macosx/build_sratom.sh @@ -11,14 +11,14 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=0.6.0 +export VERSION_NUMBER=0.6.6 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 DYLIB=build/libsratom-0.${VERSION_NUMBER}.dylib export STATICLIB=build/libsratom-0.a for ARCH in ${MIXXX_ARCHS[@]} diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 9b1ad5cfd..59d53923c 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -61,9 +61,9 @@ download_and_verify https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz e download_and_verify https://taglib.github.io/releases/taglib-1.11.1.tar.gz b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b download_and_verify http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 download_and_verify https://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e -download_and_verify https://download.drobilla.net/serd-0.28.0.tar.bz2 1df21a8874d256a9f3d51a18b8c6e2539e8092b62cc2674b110307e93f898aec -download_and_verify https://download.drobilla.net/sord-0.16.0.tar.bz2 9d3cb2c9966e93f537f37377171f162023cea6784ca069699be4a7770c8a035a -download_and_verify https://download.drobilla.net/sratom-0.6.0.tar.bz2 440ac2b1f4f0b7878f8b95698faa1e8f8c50929a498f68ec5d066863626a3d43 -download_and_verify http://download.drobilla.net/lilv-0.24.2.tar.bz2 f7ec65b1c1f1734ded3a6c051bbaf50f996a0b8b77e814a33a34e42bce50a522 download_and_verify http://lv2plug.in/spec/lv2-1.18.0.tar.bz2 90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f +download_and_verify https://download.drobilla.net/serd-0.30.4.tar.bz2 0c95616a6587bee5e728e026190f4acd5ab6e2400e8890d5c2a93031eab01999 +download_and_verify https://download.drobilla.net/sord-0.16.4.tar.bz2 b15998f4e7ad958201346009477d6696e90ee5d3e9aff25e7e9be074372690d7 +download_and_verify https://download.drobilla.net/sratom-0.6.6.tar.bz2 fb910bf62a5e69f4430bf09653d386fc4de9ff02bfd58635e1d45cbd31481b9d +download_and_verify http://download.drobilla.net/lilv-0.24.10.tar.bz2 d1bba93d6ddacadb5e742fd10ad732727edb743524de229c70cc90ef81ffc594 download_and_verify https://github.com/frankosterfeld/qtkeychain/archive/v0.11.1.tar.gz 77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d qtkeychain-0.11.1.tar.gz From 3158db794c4010cf56c5a62981eb691c832ed4b1 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:26:42 -0600 Subject: [PATCH 15/24] update libshout to 2.4.4 --- scripts/macosx/build_shout.sh | 7 +- scripts/macosx/download_dependencies.sh | 2 +- scripts/macosx/fix_libshout_ticket2244.patch | 113 ------------------- 3 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 scripts/macosx/fix_libshout_ticket2244.patch diff --git a/scripts/macosx/build_shout.sh b/scripts/macosx/build_shout.sh index dfd15a9ca..7d724cc0c 100755 --- a/scripts/macosx/build_shout.sh +++ b/scripts/macosx/build_shout.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=2.4.1 +export VERSION_NUMBER=2.4.4 export VERSION=libshout-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz @@ -27,11 +27,6 @@ do tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 cd $VERSION-$ARCH - # Apply patch fixing: - # https://trac.xiph.org/ticket/2244 - # https://bugs.launchpad.net/mixxx/+bug/1544739 - patch -p1 < $PROGDIR/fix_libshout_ticket2244.patch - source $PROGDIR/environment.sh $ARCH ./configure --host $HOST --target $TARGET --disable-dependency-tracking --prefix=$MIXXX_PREFIX make diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 59d53923c..f10a92295 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -52,8 +52,8 @@ download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/ download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz #download_and_verify https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 download_and_verify https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa -download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.1.tar.gz f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d download_and_verify https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2 4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026 +download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.4.tar.gz 8ce90c5d05e7ad1da4c12f185837e8a867c22df2d557b0125afaba4b1438e6c3 download_and_verify https://downloads.sourceforge.net/project/libshoutidjc.idjc.p/libshout-idjc-2.4.1.tar.gz 4751c75fc85fc5d10e5b03753b046bcdee39576278bf30565c751816a87facdf download_and_verify http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.26.tar.gz cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092 download_and_verify http://prdownloads.sourceforge.net/scons/scons-2.5.0.tar.gz eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9 diff --git a/scripts/macosx/fix_libshout_ticket2244.patch b/scripts/macosx/fix_libshout_ticket2244.patch deleted file mode 100644 index 44c2dd7e5..000000000 --- a/scripts/macosx/fix_libshout_ticket2244.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -b -u -r libshout-2.4.1-a/src/shout.c libshout-2.4.1-b/src/shout.c ---- libshout-2.4.1-a/src/shout.c 2015-11-09 06:54:12.000000000 -0500 -+++ libshout-2.4.1-b/src/shout.c 2016-11-25 23:08:02.000000000 -0500 -@@ -130,6 +130,7 @@ - return NULL; - } - self->tls_mode = SHOUT_TLS_AUTO; -+ self->tls_mode_used = SHOUTERR_NOTLS; - #endif - - self->port = LIBSHOUT_DEFAULT_PORT; -@@ -378,7 +379,7 @@ - return SHOUTERR_NOCONNECT; - - #ifdef HAVE_OPENSSL -- switch (self->tls_mode) { -+ switch (self->tls_mode_used) { - case SHOUT_TLS_DISABLED: - /* nothing to do */ - break; -@@ -1157,22 +1158,45 @@ - - case SHOUT_STATE_TLS_PENDING: - #ifdef HAVE_OPENSSL -- if (self->tls_mode == SHOUT_TLS_DISABLED) { -- /* nothing to be done */ -- } else if (self->tls_mode == SHOUT_TLS_AUTO || self->tls_mode == SHOUT_TLS_AUTO_NO_PLAIN) { -+ if (self->tls_mode_used < 0) { -+ switch (self->tls_mode) { -+ case SHOUT_TLS_DISABLED: -+ case SHOUT_TLS_RFC2818: -+ case SHOUT_TLS_RFC2817: -+ self->tls_mode_used = self->tls_mode; -+ break; -+ case SHOUT_TLS_AUTO: -+ case SHOUT_TLS_AUTO_NO_PLAIN: - if (self->server_caps & LIBSHOUT_CAP_GOTCAPS) { -- /* We had a probe allready, otherwise just do nothing to poke the server. */ -+ /* We had a probe allready, otherwise just poke the server. */ - if (self->server_caps & LIBSHOUT_CAP_UPGRADETLS) { -- self->tls_mode = SHOUT_TLS_RFC2817; -+ self->tls_mode_used = SHOUT_TLS_RFC2817; - } else { -- if (self->tls_mode == SHOUT_TLS_AUTO_NO_PLAIN) -+ if (self->tls_mode == SHOUT_TLS_AUTO_NO_PLAIN) { -+ self->tls_mode_used = SHOUTERR_NOTLS; - return SHOUTERR_NOTLS; -- self->tls_mode = SHOUT_TLS_DISABLED; -+ } -+ self->tls_mode_used = SHOUT_TLS_DISABLED; - } - self->state = SHOUT_STATE_TLS_PENDING; - goto retry; -+ } else { -+ /* TODO: do something. */ -+ if (self->tls_mode == SHOUT_TLS_AUTO_NO_PLAIN) { -+ self->tls_mode_used = SHOUTERR_NOTLS; -+ return SHOUTERR_NOTLS; -+ } -+ self->tls_mode_used = SHOUT_TLS_DISABLED; - } -- } else if (self->tls_mode == SHOUT_TLS_RFC2818 || self->upgrade_to_tls) { -+ break; -+ default: -+ rc = SHOUTERR_INSANE; -+ goto failure; -+ break; -+ -+ } -+ } -+ if (self->tls_mode_used == SHOUT_TLS_RFC2818 || self->upgrade_to_tls) { - if (!self->tls) { - self->tls = shout_tls_new(self, self->socket); - if (!self->tls) /* just guessing that it's a malloc error */ -@@ -1183,7 +1207,7 @@ - return SHOUTERR_BUSY; - goto failure; - } -- } else if (self->tls_mode == SHOUT_TLS_RFC2817) { -+ } else if (self->tls_mode_used == SHOUT_TLS_RFC2817) { - if ((rc = shout_create_http_request_upgrade(self, "TLS/1.0")) != SHOUTERR_SUCCESS) { - if (rc == SHOUTERR_BUSY) - return SHOUTERR_BUSY; -@@ -1191,9 +1215,6 @@ - } - self->state = SHOUT_STATE_REQ_PENDING; - goto retry; -- } else { -- rc = SHOUTERR_INSANE; -- goto failure; - } - #endif - self->state = SHOUT_STATE_REQ_CREATION; -@@ -1233,7 +1254,7 @@ - } else if (rc == SHOUTERR_SOCKET && !(self->server_caps & LIBSHOUT_CAP_GOTCAPS) && - (self->tls_mode == SHOUT_TLS_AUTO || self->tls_mode == SHOUT_TLS_AUTO_NO_PLAIN)) { - self->state = SHOUT_STATE_RECONNECT; -- self->tls_mode = SHOUT_TLS_RFC2818; -+ self->tls_mode_used = SHOUT_TLS_RFC2818; - goto retry; - #endif - } -diff -b -u -r libshout-2.4.1-a/src/shout_private.h libshout-2.4.1-b/src/shout_private.h ---- libshout-2.4.1-a/src/shout_private.h 2015-11-09 06:54:12.000000000 -0500 -+++ libshout-2.4.1-b/src/shout_private.h 2016-11-25 23:08:09.000000000 -0500 -@@ -130,6 +130,7 @@ - #ifdef HAVE_OPENSSL - int upgrade_to_tls; - int tls_mode; -+ int tls_mode_used; - char *ca_directory; - char *ca_file; - char *allowed_ciphers; From 681e49c5538b032a4de92396f77b1a0bb727b52a Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:27:23 -0600 Subject: [PATCH 16/24] update libsndfile to 1.0.30 --- scripts/macosx/build_sndfile.sh | 13 +++++-------- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/macosx/build_sndfile.sh b/scripts/macosx/build_sndfile.sh index 815a78a10..e14aabb63 100755 --- a/scripts/macosx/build_sndfile.sh +++ b/scripts/macosx/build_sndfile.sh @@ -11,9 +11,9 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.0.26 +export VERSION_NUMBER=1.0.30 export VERSION=libsndfile-${VERSION_NUMBER} -export ARCHIVE=$VERSION.tar.gz +export ARCHIVE=$VERSION.tar.bz2 echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" @@ -24,16 +24,15 @@ export STATICLIB=src/.libs/libsndfile.a for ARCH in ${MIXXX_ARCHS[@]} do mkdir -p $VERSION-$ARCH - tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 + tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 cd $VERSION-$ARCH # libsndfile test programs references Carbon.h. We work around this by only building in src/ now instead of adding this patch. #curl https://gist.githubusercontent.com/metabr/8623583/raw/90966b76c6f52e1293b5303541e1f2d72e2afd08/0001-libsndfile-doesn-t-find-Carbon.h-using-XCode-4.3.patch | patch -p1 source $PROGDIR/environment.sh $ARCH ./configure --host $HOST --target $TARGET --disable-dependency-tracking --prefix=$MIXXX_PREFIX # Don't build test programs by only making in src/. - cd src make - cd ../.. + cd .. done # Install the host version in case there are binaries we want to run. @@ -53,7 +52,5 @@ done lipo -create ./$DYLIB ${OTHER_DYLIBS[@]} -output ./$DYLIB lipo -create ./$STATICLIB ${OTHER_STATICLIBS[@]} -output ./$STATICLIB -# Don't build test programs by only installing from src/. -cd src make install -cd ../.. +cd .. diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index f10a92295..b424e38a8 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -55,7 +55,7 @@ download_and_verify https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-ever download_and_verify https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2 4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026 download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.4.tar.gz 8ce90c5d05e7ad1da4c12f185837e8a867c22df2d557b0125afaba4b1438e6c3 download_and_verify https://downloads.sourceforge.net/project/libshoutidjc.idjc.p/libshout-idjc-2.4.1.tar.gz 4751c75fc85fc5d10e5b03753b046bcdee39576278bf30565c751816a87facdf -download_and_verify http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.26.tar.gz cd6520ec763d1a45573885ecb1f8e4e42505ac12180268482a44b28484a25092 +download_and_verify https://github.com/libsndfile/libsndfile/releases/download/v1.0.30/libsndfile-1.0.30.tar.bz2 9df273302c4fa160567f412e10cc4f76666b66281e7ba48370fb544e87e4611a download_and_verify http://prdownloads.sourceforge.net/scons/scons-2.5.0.tar.gz eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9 download_and_verify https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b download_and_verify https://taglib.github.io/releases/taglib-1.11.1.tar.gz b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b From 1f9e8b092ada60ffa0845ef6089497192464ae35 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:28:33 -0600 Subject: [PATCH 17/24] update sqlite to 3330000 --- scripts/macosx/build_sqlite.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_sqlite.sh b/scripts/macosx/build_sqlite.sh index 93d44d3dc..f23d34551 100755 --- a/scripts/macosx/build_sqlite.sh +++ b/scripts/macosx/build_sqlite.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=3130000 +export VERSION_NUMBER=3330000 export VERSION=sqlite-autoconf-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.gz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index b424e38a8..c4840f187 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -57,7 +57,7 @@ download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.4.t download_and_verify https://downloads.sourceforge.net/project/libshoutidjc.idjc.p/libshout-idjc-2.4.1.tar.gz 4751c75fc85fc5d10e5b03753b046bcdee39576278bf30565c751816a87facdf download_and_verify https://github.com/libsndfile/libsndfile/releases/download/v1.0.30/libsndfile-1.0.30.tar.bz2 9df273302c4fa160567f412e10cc4f76666b66281e7ba48370fb544e87e4611a download_and_verify http://prdownloads.sourceforge.net/scons/scons-2.5.0.tar.gz eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9 -download_and_verify https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b +download_and_verify https://sqlite.org/2020/sqlite-autoconf-3330000.tar.gz 106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15 download_and_verify https://taglib.github.io/releases/taglib-1.11.1.tar.gz b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b download_and_verify http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 download_and_verify https://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e From e1a14b6a9eae36ba62cac17fa81ca5ba3c721b0f Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:29:01 -0600 Subject: [PATCH 18/24] update libvorbis to 1.3.7 --- scripts/macosx/build_vorbis.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macosx/build_vorbis.sh b/scripts/macosx/build_vorbis.sh index c99de5c2d..3a5e374c7 100755 --- a/scripts/macosx/build_vorbis.sh +++ b/scripts/macosx/build_vorbis.sh @@ -11,7 +11,7 @@ pushd `dirname $0` > /dev/null PROGDIR=`pwd -P` popd > /dev/null -export VERSION_NUMBER=1.3.5 +export VERSION_NUMBER=1.3.7 export VERSION=libvorbis-${VERSION_NUMBER} export ARCHIVE=$VERSION.tar.xz diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index c4840f187..946a541bf 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -59,7 +59,7 @@ download_and_verify https://github.com/libsndfile/libsndfile/releases/download/v download_and_verify http://prdownloads.sourceforge.net/scons/scons-2.5.0.tar.gz eb296b47f23c20aec7d87d35cfa386d3508e01d1caa3040ea6f5bbab2292ace9 download_and_verify https://sqlite.org/2020/sqlite-autoconf-3330000.tar.gz 106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15 download_and_verify https://taglib.github.io/releases/taglib-1.11.1.tar.gz b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b -download_and_verify http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 +download_and_verify http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b download_and_verify https://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e download_and_verify http://lv2plug.in/spec/lv2-1.18.0.tar.bz2 90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f download_and_verify https://download.drobilla.net/serd-0.30.4.tar.bz2 0c95616a6587bee5e728e026190f4acd5ab6e2400e8890d5c2a93031eab01999 From 8759f59c1efecfae245530c9d36588cd434ab3a6 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:31:03 -0600 Subject: [PATCH 19/24] downgrade to Qt 5.12.10 Qt 5.14 has major performance problems with the legacy QGLWidget on macOS. Migrating to QOpenGLWidget will be done for Mixxx 2.4. --- scripts/macosx/build_environment.sh | 7 ++++--- scripts/macosx/build_qt5.sh | 2 +- scripts/macosx/download_dependencies.sh | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/macosx/build_environment.sh b/scripts/macosx/build_environment.sh index dd385d832..80d298b4e 100755 --- a/scripts/macosx/build_environment.sh +++ b/scripts/macosx/build_environment.sh @@ -13,10 +13,11 @@ usage() { echo "Usage: $0 --name [--dependency-cache ] [--macosx-sd MIXXX_ENVIRONMENT_NAME="" # Use the default installed macOS SDK, allowing override via commandline flag. MIXXX_MACOSX_SDK=$(xcodebuild -version -sdk macosx SDKVersion) -# Qt 5.11 requires a minimum of macOS 10.11. -MIXXX_MACOSX_TARGET='10.11' +# Qt 5.12 requires a minimum of macOS 10.12. +# https://doc.qt.io/qt-5.12/supported-platforms.html +MIXXX_MACOSX_TARGET='10.12' MIXXX_MACOSX_STDLIB='libc++' -MIXXX_QT_VERSION='5.14.2' +MIXXX_QT_VERSION='5.12.10' ENABLE_I386=false ENABLE_X86_64=false ENABLE_PPC=false diff --git a/scripts/macosx/build_qt5.sh b/scripts/macosx/build_qt5.sh index 1d24afbfd..25c4bcd9c 100755 --- a/scripts/macosx/build_qt5.sh +++ b/scripts/macosx/build_qt5.sh @@ -39,7 +39,7 @@ export QTDIR=$MIXXX_PREFIX/Qt-${VERSION_NUMBER} # Disable relocatable qt due to https://bugs.launchpad.net/mixxx/+bug/1871238 # TODO(rryan): Disable framework build or use frameworks properly. Qt assumes # that if frameworks are enabled then they are used for deployment. -./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -no-feature-relocatable -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib +./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib make && make install cd .. diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 946a541bf..746c209b3 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -51,7 +51,7 @@ download_and_verify http://www.portaudio.com/archives/pa_stable_v190600_20161030 download_and_verify http://downloads.sourceforge.net/project/portmedia/portmidi/217/portmidi-src-217.zip 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f download_and_verify https://github.com/google/protobuf/archive/v2.6.1.tar.gz 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 protobuf-2.6.1.tar.gz #download_and_verify https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 -download_and_verify https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa +download_and_verify https://download.qt.io/archive/qt/5.12/5.12.10/single/qt-everywhere-src-5.12.10.tar.xz 3e0ee1e57f5cf3eeb038d0b4b22c7eb442285c62639290756b39dc93a1d0e14f download_and_verify https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2 4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026 download_and_verify http://downloads.xiph.org/releases/libshout/libshout-2.4.4.tar.gz 8ce90c5d05e7ad1da4c12f185837e8a867c22df2d557b0125afaba4b1438e6c3 download_and_verify https://downloads.sourceforge.net/project/libshoutidjc.idjc.p/libshout-idjc-2.4.1.tar.gz 4751c75fc85fc5d10e5b03753b046bcdee39576278bf30565c751816a87facdf From 5a8875208d45ffbdced8aeddaad7ca85e3ff32d1 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:38:39 -0600 Subject: [PATCH 20/24] use standard SDKROOT environment variable --- scripts/macosx/build_chromaprint.sh | 2 +- scripts/macosx/build_portmidi.sh | 2 +- scripts/macosx/build_qt4.sh | 2 +- scripts/macosx/build_qtkeychain.sh | 2 +- scripts/macosx/build_rubberband.sh | 6 +++--- scripts/macosx/build_taglib.sh | 2 +- scripts/macosx/environment.sh | 10 +++++----- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/macosx/build_chromaprint.sh b/scripts/macosx/build_chromaprint.sh index 5925c0ec0..6c303fc65 100755 --- a/scripts/macosx/build_chromaprint.sh +++ b/scripts/macosx/build_chromaprint.sh @@ -28,7 +28,7 @@ do tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE make clean make cd .. diff --git a/scripts/macosx/build_portmidi.sh b/scripts/macosx/build_portmidi.sh index 370b64245..498e98d3b 100755 --- a/scripts/macosx/build_portmidi.sh +++ b/scripts/macosx/build_portmidi.sh @@ -28,7 +28,7 @@ do source $PROGDIR/environment.sh $ARCH curl https://gist.githubusercontent.com/rryan/3b92d65242d358d1fb94/raw/e345fdaa635f3afa1ce21c4253782133379b74f0/portmidi.patch | patch -p1 - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH" + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH" make cd ../.. done diff --git a/scripts/macosx/build_qt4.sh b/scripts/macosx/build_qt4.sh index 04bee90d0..53825e29b 100755 --- a/scripts/macosx/build_qt4.sh +++ b/scripts/macosx/build_qt4.sh @@ -70,7 +70,7 @@ curl https://raw.githubusercontent.com/Homebrew/patches/480b7142c4e2ae07de6028f6 # - http://www.mimec.org/node/296 # NOTE(rryan): Setting -system-sqlite sets -system-zlib. Set -qt-zlib explicitly. export OPENSSL_LIBS="-L${MIXXX_PREFIX}/lib -lssl -lcrypto" -./configure -opensource -prefix ${QTDIR} ${QT_ARCHS[@]} -sdk $OSX_SDK -system-sqlite -qt-sql-sqlite -qt-zlib -no-phonon -no-webkit -no-qt3support -release -nomake examples -nomake demos -confirm-license -openssl -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib +./configure -opensource -prefix ${QTDIR} ${QT_ARCHS[@]} -sdk $SDKROOT -system-sqlite -qt-sql-sqlite -qt-zlib -no-phonon -no-webkit -no-qt3support -release -nomake examples -nomake demos -confirm-license -openssl -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib make && make install diff --git a/scripts/macosx/build_qtkeychain.sh b/scripts/macosx/build_qtkeychain.sh index 6f92c5002..eadd17127 100755 --- a/scripts/macosx/build_qtkeychain.sh +++ b/scripts/macosx/build_qtkeychain.sh @@ -29,7 +29,7 @@ do cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH # To build static, use -DQTKEYCHAIN_STATIC=TRUE but this turns off building a shared library. - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake" + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake" make cd .. done diff --git a/scripts/macosx/build_rubberband.sh b/scripts/macosx/build_rubberband.sh index 27da6ab3b..8b34d37cc 100755 --- a/scripts/macosx/build_rubberband.sh +++ b/scripts/macosx/build_rubberband.sh @@ -27,9 +27,9 @@ do tar -jxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH - export CFLAGS="$CFLAGS -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" - export CXXFLAGS="$CXXFLAGS -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" - export LDFLAGS="$LDFLAGS -framework Accelerate -F$OSX_SDK/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" + export CFLAGS="$CFLAGS -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" + export CXXFLAGS="$CXXFLAGS -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" + export LDFLAGS="$LDFLAGS -framework Accelerate -F$SDKROOT/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/" SRC_CFLAGS="-I." SRC_LIBS=" " SNDFILE_CFLAGS=" " SNDFILE_LIBS=" " FFTW_CFLAGS=" " FFTW_LIBS=" " Vamp_LIBS=" " Vamp_CFLAGS=" " ./configure --host $HOST --target $TARGET --prefix=$MIXXX_PREFIX # Hack up the Makefile to build on OS X and use Speex / VDSP. sed -i -e 's/LIBRARY_INCLUDES := \\/LIBRARY_INCLUDES := src\/speex\/speex_resampler.h \\/g' Makefile diff --git a/scripts/macosx/build_taglib.sh b/scripts/macosx/build_taglib.sh index 1d169368c..55c26621f 100755 --- a/scripts/macosx/build_taglib.sh +++ b/scripts/macosx/build_taglib.sh @@ -28,7 +28,7 @@ do cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH # To build static, use -DENABLE_STATIC=ON but this turns off building a shared library. - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$OSX_SDK" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE make cd .. done diff --git a/scripts/macosx/environment.sh b/scripts/macosx/environment.sh index faf583d92..4d7f39bb0 100755 --- a/scripts/macosx/environment.sh +++ b/scripts/macosx/environment.sh @@ -24,10 +24,10 @@ export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" export CPP="$CC -E" export CXXCPP="$CXX -E" -export OSX_SDK=$(xcrun --sdk macosx${MIXXX_MACOSX_SDK} --show-sdk-path) +export SDKROOT=$(xcrun --sdk macosx${MIXXX_MACSDKROOT} --show-sdk-path) -if [[ ! -d $OSX_SDK ]]; then - echo "WARNING: SDK path does not exist: $OSX_SDK" +if [[ ! -d $SDKROOT ]]; then + echo "WARNING: SDK path does not exist: $SDKROOT" exit 1; fi @@ -49,8 +49,8 @@ export I386_OPT_FLAGS="-mmmx -msse -msse2 -msse3 -mfpmath=sse -march=prescott -m export X86_64_OPT_FLAGS="-mmmx -msse -msse2 -msse3 -mfpmath=sse -mtune=generic" export POWERPC_OPT_FLAGS="" -export OSX_CFLAGS="-isysroot $OSX_SDK -mmacosx-version-min=$MIXXX_MACOSX_TARGET -stdlib=$MIXXX_MACOSX_STDLIB $ARCH_FLAGS $COMMON_OPT_FLAGS -I$MIXXX_PREFIX/include" -export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -mmacosx-version-min=$MIXXX_MACOSX_TARGET -stdlib=$MIXXX_MACOSX_STDLIB $ARCH_FLAGS $COMMON_OPT_FLAGS -L$MIXXX_PREFIX/lib" +export OSX_CFLAGS="-isysroot $SDKROOT -mmacosx-version-min=$MIXXX_MACOSX_TARGET -stdlib=$MIXXX_MACOSX_STDLIB $ARCH_FLAGS $COMMON_OPT_FLAGS -I$MIXXX_PREFIX/include" +export OSX_LDFLAGS="-isysroot $SDKROOT -Wl,-syslibroot,$SDKROOT -mmacosx-version-min=$MIXXX_MACOSX_TARGET -stdlib=$MIXXX_MACOSX_STDLIB $ARCH_FLAGS $COMMON_OPT_FLAGS -L$MIXXX_PREFIX/lib" if [[ "$1" == "i386" ]]; then echo "Setting options for $1"; From 3a7a22bfc4b9d0234c81888d4e499ec429193137 Mon Sep 17 00:00:00 2001 From: Be Date: Sun, 15 Nov 2020 17:32:34 -0600 Subject: [PATCH 21/24] add zstd 1.4.5 --- scripts/macosx/build_environment.sh | 1 + scripts/macosx/build_zstd.sh | 37 +++++++++++++++++++++++++ scripts/macosx/download_dependencies.sh | 1 + 3 files changed, 39 insertions(+) create mode 100755 scripts/macosx/build_zstd.sh diff --git a/scripts/macosx/build_environment.sh b/scripts/macosx/build_environment.sh index 80d298b4e..13602a974 100755 --- a/scripts/macosx/build_environment.sh +++ b/scripts/macosx/build_environment.sh @@ -105,6 +105,7 @@ export HOST_ARCH=x86_64 # Setup build systems first so that we can build other projects that use them. $PROGDIR/build_cmake.sh +$PROGDIR/build_zstd.sh $PROGDIR/build_scons.sh $PROGDIR/build_autoconf.sh $PROGDIR/build_automake.sh diff --git a/scripts/macosx/build_zstd.sh b/scripts/macosx/build_zstd.sh new file mode 100755 index 000000000..633c6121f --- /dev/null +++ b/scripts/macosx/build_zstd.sh @@ -0,0 +1,37 @@ +#!/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.4.5 +export VERSION=zstd-${VERSION_NUMBER} +export ARCHIVE=$VERSION.tar.gz + +echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" + +for ARCH in ${MIXXX_ARCHS[@]} +do + mkdir -p $VERSION-$ARCH + tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 + cd $VERSION-$ARCH + cd build/cmake + mkdir cmake_build + source $PROGDIR/environment.sh $ARCH + # environment.sh sets CC/CXX to use ccache, but it hasn't been built yet at this point + export XCODE_ROOT=$(xcode-select -print-path) + export CC="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" + export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" + export CPP="$CC -E" + export CXXCPP="$CXX -E" + cmake -S . -B cmake_build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake --build cmake_build --target install + cd ../../.. +done diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 746c209b3..5a045c577 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -67,3 +67,4 @@ download_and_verify https://download.drobilla.net/sord-0.16.4.tar.bz2 b15998f4e7 download_and_verify https://download.drobilla.net/sratom-0.6.6.tar.bz2 fb910bf62a5e69f4430bf09653d386fc4de9ff02bfd58635e1d45cbd31481b9d download_and_verify http://download.drobilla.net/lilv-0.24.10.tar.bz2 d1bba93d6ddacadb5e742fd10ad732727edb743524de229c70cc90ef81ffc594 download_and_verify https://github.com/frankosterfeld/qtkeychain/archive/v0.11.1.tar.gz 77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d qtkeychain-0.11.1.tar.gz +download_and_verify https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e From ef84d9837c996664cb0463a4671f956adc97ea06 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:41:36 -0600 Subject: [PATCH 22/24] add ccache 4.0.0 --- scripts/macosx/build_ccache.sh | 40 +++++++++++++++++++++++++ scripts/macosx/build_environment.sh | 1 + scripts/macosx/build_qt5.sh | 2 +- scripts/macosx/download_dependencies.sh | 1 + scripts/macosx/environment.sh | 6 ++-- 5 files changed, 46 insertions(+), 4 deletions(-) create mode 100755 scripts/macosx/build_ccache.sh diff --git a/scripts/macosx/build_ccache.sh b/scripts/macosx/build_ccache.sh new file mode 100755 index 000000000..af68f499e --- /dev/null +++ b/scripts/macosx/build_ccache.sh @@ -0,0 +1,40 @@ +#!/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=4.0 +export VERSION=ccache-${VERSION_NUMBER} +export ARCHIVE=$VERSION.tar.gz + +echo "Building $VERSION for $MIXXX_ENVIRONMENT_NAME for architectures: ${MIXXX_ARCHS[@]}" + +for ARCH in ${MIXXX_ARCHS[@]} +do + mkdir -p $VERSION-$ARCH + tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 + cd $VERSION-$ARCH + source $PROGDIR/environment.sh $ARCH + # environment.sh sets CC/CXX to use ccache, but it hasn't been built yet at this point + export XCODE_ROOT=$(xcode-select -print-path) + export CC="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" + export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" + export CPP="$CC -E" + export CXXCPP="$CXX -E" + # The GitHub Action macOS VM has zstd in /usr/local/opt + # Make sure ccache links to the libzstd in the build environment instead so + # it can be used locally for working on Mixxx on macOS. + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX" -DCMAKE_INSTALL_RPATH="@loader_path/../lib" -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake --build . --target install + cd .. +done + +ccache -M 5G diff --git a/scripts/macosx/build_environment.sh b/scripts/macosx/build_environment.sh index 13602a974..14cc4e900 100755 --- a/scripts/macosx/build_environment.sh +++ b/scripts/macosx/build_environment.sh @@ -106,6 +106,7 @@ export HOST_ARCH=x86_64 # Setup build systems first so that we can build other projects that use them. $PROGDIR/build_cmake.sh $PROGDIR/build_zstd.sh +$PROGDIR/build_ccache.sh # depends on zstd $PROGDIR/build_scons.sh $PROGDIR/build_autoconf.sh $PROGDIR/build_automake.sh diff --git a/scripts/macosx/build_qt5.sh b/scripts/macosx/build_qt5.sh index 25c4bcd9c..26e494787 100755 --- a/scripts/macosx/build_qt5.sh +++ b/scripts/macosx/build_qt5.sh @@ -39,7 +39,7 @@ export QTDIR=$MIXXX_PREFIX/Qt-${VERSION_NUMBER} # Disable relocatable qt due to https://bugs.launchpad.net/mixxx/+bug/1871238 # TODO(rryan): Disable framework build or use frameworks properly. Qt assumes # that if frameworks are enabled then they are used for deployment. -./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib +./configure -opensource -prefix $QTDIR -sdk macosx${MIXXX_MACOSX_SDK} -ccache -system-sqlite -sql-sqlite -qt-zlib -platform macx-clang -release -confirm-license -securetransport -force-debug-info -nomake examples -nomake tests -skip qt3d -skip qtwebengine -I${MIXXX_PREFIX}/include -L${MIXXX_PREFIX}/lib make && make install cd .. diff --git a/scripts/macosx/download_dependencies.sh b/scripts/macosx/download_dependencies.sh index 5a045c577..2dca0a675 100755 --- a/scripts/macosx/download_dependencies.sh +++ b/scripts/macosx/download_dependencies.sh @@ -39,6 +39,7 @@ download_and_verify http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.xz ccc45 download_and_verify http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f download_and_verify https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 download_and_verify https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz 573a5400e635b3823fc2394cfa7a217fbb46e8e50ecebd4a61991451a8af766a +download_and_verify https://github.com/ccache/ccache/releases/download/v4.0/ccache-4.0.tar.gz ac97af86679028ebc8555c99318352588ff50f515fc3a7f8ed21a8ad367e3d45 download_and_verify https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 download_and_verify http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 download_and_verify http://downloads.mixxx.org/hss1394-r8.tar.gz d5c87a92ad8e277b418300fbbfcc06a0826dfde71f7b10643ac59703d795c002 diff --git a/scripts/macosx/environment.sh b/scripts/macosx/environment.sh index 4d7f39bb0..a327fa377 100755 --- a/scripts/macosx/environment.sh +++ b/scripts/macosx/environment.sh @@ -19,8 +19,8 @@ else fi export XCODE_ROOT=$(xcode-select -print-path) -export CC="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" -export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" +export CC="$MIXXX_PREFIX/bin/ccache ${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" +export CXX="$MIXXX_PREFIX/bin/ccache ${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" export CPP="$CC -E" export CXXCPP="$CXX -E" @@ -36,7 +36,7 @@ if [[ ! -d $MIXXX_PREFIX ]]; then exit 1; fi -export PATH=$PATH:$MIXXX_PREFIX/bin/ +export PATH=$MIXXX_PREFIX/bin/:$PATH if [[ "$DISABLE_FFAST_MATH" == "yes" ]]; then export COMMON_OPT_FLAGS="-O2" From 063cc2d1c357573ec3011f3298fffd56dc200362 Mon Sep 17 00:00:00 2001 From: Be Date: Sun, 15 Nov 2020 17:47:09 -0600 Subject: [PATCH 23/24] fix setting of minimum macOS version for cmake projects --- scripts/macosx/build_ccache.sh | 2 +- scripts/macosx/build_chromaprint.sh | 2 +- scripts/macosx/build_portmidi.sh | 2 +- scripts/macosx/build_qt4.sh | 6 +++--- scripts/macosx/build_qtkeychain.sh | 2 +- scripts/macosx/build_taglib.sh | 2 +- scripts/macosx/build_zstd.sh | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/macosx/build_ccache.sh b/scripts/macosx/build_ccache.sh index af68f499e..6430bf16b 100755 --- a/scripts/macosx/build_ccache.sh +++ b/scripts/macosx/build_ccache.sh @@ -32,7 +32,7 @@ do # The GitHub Action macOS VM has zstd in /usr/local/opt # Make sure ccache links to the libzstd in the build environment instead so # it can be used locally for working on Mixxx on macOS. - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX" -DCMAKE_INSTALL_RPATH="@loader_path/../lib" -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX" -DCMAKE_INSTALL_RPATH="@loader_path/../lib" -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE cmake --build . --target install cd .. done diff --git a/scripts/macosx/build_chromaprint.sh b/scripts/macosx/build_chromaprint.sh index 6c303fc65..3cc23aa71 100755 --- a/scripts/macosx/build_chromaprint.sh +++ b/scripts/macosx/build_chromaprint.sh @@ -28,7 +28,7 @@ do tar -zxf $DEPENDENCIES/$ARCHIVE -C $VERSION-$ARCH --strip-components 1 cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DWITH_VDSP=TRUE make clean make cd .. diff --git a/scripts/macosx/build_portmidi.sh b/scripts/macosx/build_portmidi.sh index 498e98d3b..c0668a2d9 100755 --- a/scripts/macosx/build_portmidi.sh +++ b/scripts/macosx/build_portmidi.sh @@ -28,7 +28,7 @@ do source $PROGDIR/environment.sh $ARCH curl https://gist.githubusercontent.com/rryan/3b92d65242d358d1fb94/raw/e345fdaa635f3afa1ce21c4253782133379b74f0/portmidi.patch | patch -p1 - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH" + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_OSX_ARCHITECTURES="$ARCH" make cd ../.. done diff --git a/scripts/macosx/build_qt4.sh b/scripts/macosx/build_qt4.sh index 53825e29b..9490bc3ba 100755 --- a/scripts/macosx/build_qt4.sh +++ b/scripts/macosx/build_qt4.sh @@ -53,10 +53,10 @@ export CXXCPP="$CXX -E" # Qt embeds various OSX platform selections in its makefiles and configure # scripts. Fix them to use $MIXXX_MACOSX_TARGET. -sed -e "s/MACOSX_DEPLOYMENT_TARGET = 10.5/MACOSX_DEPLOYMENT_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' configure -sed -e "s/MACOSX_DEPLOYMENT_TARGET 10.[45]/MACOSX_DEPLOYMENT_TARGET $MIXXX_MACOSX_TARGET/g" -i '' configure +sed -e "s/MIXXX_MACOSX_TARGET = 10.5/MIXXX_MACOSX_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' configure +sed -e "s/MIXXX_MACOSX_TARGET 10.[45]/MIXXX_MACOSX_TARGET $MIXXX_MACOSX_TARGET/g" -i '' configure sed -e "s/-mmacosx-version-min=10.[45]/-mmacosx-version-min=$MIXXX_MACOSX_TARGET/g" -i '' configure -sed -e "s/QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4/QMAKE_MACOSX_DEPLOYMENT_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/mac.conf +sed -e "s/QMAKE_MIXXX_MACOSX_TARGET = 10.4/QMAKE_MIXXX_MACOSX_TARGET = $MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/mac.conf sed -e "s/-mmacosx-version-min=10.5/-mmacosx-version-min=$MIXXX_MACOSX_TARGET/g" -i '' mkspecs/common/g++-macx.conf # Build issue with 10.11 SDK. diff --git a/scripts/macosx/build_qtkeychain.sh b/scripts/macosx/build_qtkeychain.sh index eadd17127..28784455a 100755 --- a/scripts/macosx/build_qtkeychain.sh +++ b/scripts/macosx/build_qtkeychain.sh @@ -29,7 +29,7 @@ do cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH # To build static, use -DQTKEYCHAIN_STATIC=TRUE but this turns off building a shared library. - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake" + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_TEST_APPLICATION=OFF -DCMAKE_PREFIX_PATH="$MIXXX_PREFIX/Qt-$QT_VERSION/lib/cmake" make cd .. done diff --git a/scripts/macosx/build_taglib.sh b/scripts/macosx/build_taglib.sh index 55c26621f..b430dcd24 100755 --- a/scripts/macosx/build_taglib.sh +++ b/scripts/macosx/build_taglib.sh @@ -28,7 +28,7 @@ do cd $VERSION-$ARCH source $PROGDIR/environment.sh $ARCH # To build static, use -DENABLE_STATIC=ON but this turns off building a shared library. - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE make cd .. done diff --git a/scripts/macosx/build_zstd.sh b/scripts/macosx/build_zstd.sh index 633c6121f..68a6f0254 100755 --- a/scripts/macosx/build_zstd.sh +++ b/scripts/macosx/build_zstd.sh @@ -31,7 +31,7 @@ do export CXX="${XCODE_ROOT}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" export CPP="$CC -E" export CXXCPP="$CXX -E" - cmake -S . -B cmake_build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE + cmake -S . -B cmake_build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$MIXXX_PREFIX" -DCMAKE_OSX_DEPLOYMENT_TARGET="$MIXXX_MACOSX_TARGET" -DCMAKE_OSX_SYSROOT="$SDKROOT" -DCMAKE_VERBOSE_MAKEFILE=TRUE -DBUILD_SHARED_LIBS=TRUE cmake --build cmake_build --target install cd ../../.. done From dd844a1a7e60cb8a4d55a0e6516943b2654252d5 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 14 Nov 2020 23:43:49 -0600 Subject: [PATCH 24/24] build on GitHub Actions --- .github/workflows/build-environment-build.yml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/build-environment-build.yml diff --git a/.github/workflows/build-environment-build.yml b/.github/workflows/build-environment-build.yml new file mode 100644 index 000000000..89a1a9c29 --- /dev/null +++ b/.github/workflows/build-environment-build.yml @@ -0,0 +1,67 @@ +name: Build + +on: [pull_request, push] + +jobs: + build-mac: + name: macOS + runs-on: macos-10.15 + env: + DEPENDENCY_CACHE: /Users/runner/dependencies + steps: + - name: checkout Git repository + uses: actions/checkout@v2 + - name: dependency cache + uses: actions/cache@v2 + env: + cache-name: dependencies + with: + path: ${{ env.DEPENDENCY_CACHE }} + key: ${{ env.cache-name }}-${{ runner.os}}-${{ hashFiles('download_dependencies.sh') }} + restore-keys: | + ${{ env.cache-name }}-${{ runner.os }} + - name: ccache + uses: actions/cache@v2 + env: + cache-name: ccache + with: + path: /Users/runner/Library/Caches/ccache + key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.head_ref }}-${{ github.run_number }} + restore-keys: | + ${{ env.cache-name }}-${{ runner.os }}-${{ github.head_ref }} + ${{ env.cache-name }}-${{ runner.os }} + - name: build + env: + # 10.12 is the minimum macOS version for Qt 5.12 + MACOSX_DEPLOYMENT_TARGET: 10.12 + BRANCH_NAME: 2.3 + ARCHITECTURE: x86_64 + run: | + # Quit on errors. + # See also: + # - http://mywiki.wooledge.org/BashFAQ/105 + # - https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/ + set -e -o pipefail + # Local echo. + set -x + + # remove last number (patch number) from version number because Qt's configure script doesn't work with it + if [[ $(xcrun --show-sdk-version) =~ ([0-9]*\.[0-9]*)(.[0-9]*)? ]]; then + export MACOSX_SDK=${BASH_REMATCH[1]} + else + echo "macOS SDK version did not match expected format" + exit + fi + SHA=`git rev-parse --short HEAD` + ENVIRONMENT_NAME=${BRANCH_NAME}-${SHA}-sdk${MACOSX_SDK}-macosminimum${MACOSX_DEPLOYMENT_TARGET}-${ARCHITECTURE} + + mkdir -p environment/${ENVIRONMENT_NAME} + + scripts/macosx/download_dependencies.sh ${DEPENDENCY_CACHE} + scripts/macosx/build_environment.sh --macosx-sdk ${MACOSX_SDK} --dependency-cache ${DEPENDENCY_CACHE} --name ${ENVIRONMENT_NAME} --macosx-stdlib libc++ --enable-x86-64 2>&1 | tee environment/${ENVIRONMENT_NAME}/build_environment.log + tar -C environment -czf ${ENVIRONMENT_NAME}.tar.gz ${ENVIRONMENT_NAME} + - name: upload macOS build environment artifact + uses: actions/upload-artifact@v2 + with: + name: macOS-build-environment + path: ./*.tar.gz