Skip to content

Commit

Permalink
Update macOS dependency bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
nohal committed Apr 17, 2024
1 parent f8494a6 commit 26612de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ci/macos-universal-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ vorbis_version="1.3.7"
flac_version="1.4.3"
opus_version="1.4"
blake2_version="0.98.1"
zstd_version="1.5.5"
libarchive_version="3.7.2"
zstd_version="1.5.6"
libarchive_version="3.7.3"
mpg123_version="1.32.4"
lame_version="3.100"
libsndfile_version="1.2.2"
Expand Down Expand Up @@ -385,7 +385,7 @@ patch < $(dirname "${scriptpath}")/../buildosx/wx_slider_patch.diff
# The following patch is required to build usable wxWidgets on Sonoma and new Xcode,
# but breaks ABI compatibility with O 5.8. Bundle built with it applied (or containing wxWidgets newer than 3.2.4)
# must not be used to build plugins until O 5.8 support is phased out.
patch < $(dirname "${scriptpath}")/../buildosx/wx_sonoma_scrolled_window_clip.diff
#patch < $(dirname "${scriptpath}")/../buildosx/wx_sonoma_scrolled_window_clip.diff

./configure \
--with-cxx=11 \
Expand Down
2 changes: 1 addition & 1 deletion ci/universal-build-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -x
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.13}

# URL of the repository to download the dependency bundle from
export DEPS_BUNDLE_REPO="${DEPS_BUNDLE_REPO:-https://dl.cloudsmith.io/public/nohal/opencpn-plugins/raw/files}"
export DEPS_BUNDLE_REPO="${DEPS_BUNDLE_REPO:-https://dl.cloudsmith.io/public/nohal/opencpn-dependencies/raw/files}"
# Name of the bundle
export DEPS_BUNDLE_FILE="${DEPS_BUNDLE_FILE:-macos_deps_universal-opencpn.tar.xz}"
# Where to unpack the bundle
Expand Down

0 comments on commit 26612de

Please sign in to comment.