Skip to content

Commit 13851fb

Browse files
committed
switch back to my fork of libspatialaudio with build fixes
1 parent 8195f69 commit 13851fb

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/build-shotcut-msys2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ OPENCV_CONTRIB_HEAD=0
6161
OPENCV_CONTRIB_REVISION="4.12.0"
6262
ENABLE_LIBSPATIALAUDIO=1
6363
LIBSPATIALAUDIO_HEAD=0
64-
LIBSPATIALAUDIO_REVISION="c7b403cb5a980bbaccd307aafa1cfeceb6585efc" # 0.4.0 with install fix
64+
LIBSPATIALAUDIO_REVISION="origin/shotcut"
6565
ENABLE_LADSPA=1
6666
LADSPA_HEAD=0
6767
LADSPA_REVISION="origin/shotcut"
@@ -453,7 +453,7 @@ function set_globals {
453453
REPOLOCS[14]="https://github.com/ddennedy/gopro2gpx.git"
454454
REPOLOCS[15]="https://github.com/opencv/opencv.git"
455455
REPOLOCS[16]="https://github.com/opencv/opencv_contrib.git"
456-
REPOLOCS[17]="https://github.com/videolabs/libspatialaudio.git"
456+
REPOLOCS[17]="https://github.com/ddennedy/libspatialaudio.git"
457457

458458
# REPOTYPE Array holds the repo types. (Yes, this might be redundant, but easy for me)
459459
REPOTYPES[0]="git"

scripts/build-shotcut.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ LIBWEBP_HEAD=0
102102
LIBWEBP_REVISION="v1.6.0"
103103
ENABLE_LIBSPATIALAUDIO=1
104104
LIBSPATIALAUDIO_HEAD=0
105-
LIBSPATIALAUDIO_REVISION="c7b403cb5a980bbaccd307aafa1cfeceb6585efc" # 0.4.0 with install fix
105+
LIBSPATIALAUDIO_REVISION="origin/shotcut"
106106
ENABLE_WHISPERCPP=1
107107
WHISPERCPP_HEAD=0
108108
WHISPERCPP_REVISION="v1.8.3"
@@ -563,7 +563,7 @@ function set_globals {
563563
REPOLOCS[3]="https://github.com/mirror/x264.git"
564564
REPOLOCS[4]="https://chromium.googlesource.com/webm/libvpx.git"
565565
REPOLOCS[5]="https://github.com/ddennedy/movit.git"
566-
REPOLOCS[6]="https://github.com/videolabs/libspatialaudio.git"
566+
REPOLOCS[6]="https://github.com/ddennedy/libspatialaudio.git"
567567
REPOLOCS[7]="https://github.com/mltframework/shotcut.git"
568568
REPOLOCS[8]="https://github.com/swh/ladspa.git"
569569
REPOLOCS[9]="https://github.com/OpenMathLib/OpenBLAS.git"
@@ -909,7 +909,7 @@ function set_globals {
909909

910910
#####
911911
# libspatialaudio
912-
CONFIG[6]="cmake -G Ninja -B build -D CMAKE_INSTALL_PREFIX=$FINAL_INSTALL_DIR -D CMAKE_CXX_STANDARD=14 -D CMAKE_CXX_FLAGS=\"-DSPATIALAUDIO_EXPORT=\" $CMAKE_DEBUG_FLAG"
912+
CONFIG[6]="cmake -G Ninja -B build -D CMAKE_INSTALL_PREFIX=$FINAL_INSTALL_DIR $CMAKE_DEBUG_FLAG"
913913
[ "$TARGET_OS" = "Darwin" ] && CONFIG[6]="${CONFIG[6]} -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64'"
914914
CFLAGS_[6]="$CFLAGS"
915915
LDFLAGS_[6]="$LDFLAGS"

0 commit comments

Comments
 (0)