Mercurial > hg > sv-dependency-builds
changeset 165:7e6e71a29886
Update build for AUDIO_COMPONENT_FIX
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Wed, 30 Oct 2019 12:40:34 +0000 |
| parents | 5cc1366da2e9 |
| children | cbd6d7e562c7 |
| files | osx/lib/libportaudio.a src/portaudio_20161030_catalina_patch/configure src/portaudio_20161030_catalina_patch/configure.in src/portaudio_20161030_catalina_patch/src/hostapi/coreaudio/pa_mac_core.c |
| diffstat | 4 files changed, 26 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/portaudio_20161030_catalina_patch/configure Wed Oct 30 11:28:45 2019 +0000 +++ b/src/portaudio_20161030_catalina_patch/configure Wed Oct 30 12:40:34 2019 +0000 @@ -15821,8 +15821,10 @@ $as_echo "#define PA_USE_COREAUDIO 1" >>confdefs.h - - CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror" + $as_echo "#define AUDIO_COMPONENT_FIX 1" >>confdefs.h + + + CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated" LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" if test "x$enable_mac_universal" = "xyes" ; then @@ -15863,13 +15865,19 @@ elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then mac_version_min="-mmacosx-version-min=10.4" mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`" + elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" + elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" else - as_fn_error $? "Could not find 10.5 to 10.12 SDK." "$LINENO" 5 + as_fn_error $? "Could not find 10.5 to 10.14 SDK." "$LINENO" 5 fi esac mac_arches="" - for arch in i386 x86_64 ppc ppc64 + for arch in x86_64 do save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -arch $arch"
--- a/src/portaudio_20161030_catalina_patch/configure.in Wed Oct 30 11:28:45 2019 +0000 +++ b/src/portaudio_20161030_catalina_patch/configure.in Wed Oct 30 12:40:34 2019 +0000 @@ -203,8 +203,9 @@ dnl Mac OS X configuration AC_DEFINE(PA_USE_COREAUDIO,1) + AC_DEFINE(AUDIO_COMPONENT_FIX,1) - CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror" + CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated" LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" if test "x$enable_mac_universal" = "xyes" ; then @@ -258,15 +259,21 @@ elif xcodebuild -version -sdk macosx10.12 Path >/dev/null 2>&1 ; then mac_version_min="-mmacosx-version-min=10.4" mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.12 Path`" + elif xcodebuild -version -sdk macosx10.13 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.13 Path`" + elif xcodebuild -version -sdk macosx10.14 Path >/dev/null 2>&1 ; then + mac_version_min="-mmacosx-version-min=10.4" + mac_sysroot="-isysroot `xcodebuild -version -sdk macosx10.14 Path`" else - AC_MSG_ERROR([Could not find 10.5 to 10.12 SDK.]) + AC_MSG_ERROR([Could not find 10.5 to 10.14 SDK.]) fi esac dnl Pick which architectures to build for based on what dnl the compiler supports. mac_arches="" - for arch in i386 x86_64 ppc ppc64 + for arch in x86_64 do save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -arch $arch"
--- a/src/portaudio_20161030_catalina_patch/src/hostapi/coreaudio/pa_mac_core.c Wed Oct 30 11:28:45 2019 +0000 +++ b/src/portaudio_20161030_catalina_patch/src/hostapi/coreaudio/pa_mac_core.c Wed Oct 30 12:40:34 2019 +0000 @@ -1262,6 +1262,10 @@ desc.componentFlags = 0; desc.componentFlagsMask = 0; +#ifdef AUDIO_COMPONENT_FIX + DBUG( ( "Using AUDIO_COMPONENT_FIX logic." ) ); +#endif + /* -- find the component -- */ #ifndef AUDIO_COMPONENT_FIX comp = FindNextComponent( NULL, &desc );