diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index a14844d..0ad5873 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -4,7 +4,7 @@ on: push: env: - CACHE_VERSION: 9 + CACHE_VERSION: 0 DEBIAN_FRONTEND: noninteractive PAWPAW_SKIP_TESTS: 1 diff --git a/bootstrap-common.sh b/bootstrap-common.sh index 79a99cb..46b3c4f 100755 --- a/bootstrap-common.sh +++ b/bootstrap-common.sh @@ -425,7 +425,7 @@ fi # PAWPAW_SKIP_SAMPLERATE # zlib (skipped on macOS) if [ "${MACOS}" -eq 0 ]; then - git_clone zlib "${ZLIB_VERSION}" "${ZLIB_URL}" + download zlib "${ZLIB_VERSION}" "${ZLIB_URL}" build_conf zlib "${ZLIB_VERSION}" "--static --prefix=${PAWPAW_PREFIX} --zprefix" if [ "${CROSS_COMPILING}" -eq 0 ]; then diff --git a/patches/opus/02_hidden-opus-api.patch b/patches/opus/02_hidden-opus-api.patch index dd1f385..3e1815c 100644 --- a/patches/opus/02_hidden-opus-api.patch +++ b/patches/opus/02_hidden-opus-api.patch @@ -1,11 +1,13 @@ ---- opus-static-1.3.1.orig/include/opus_defines.h -+++ opus-static-1.3.1/include/opus_defines.h +diff --git a/include/opus_defines.h b/include/opus_defines.h +index cd8f4dd..48f59da 100644 +--- a/include/opus_defines.h ++++ b/include/opus_defines.h @@ -63,19 +63,7 @@ extern "C" { /** @cond OPUS_INTERNAL_DOC */ /**Export control for opus functions */ -#ifndef OPUS_EXPORT --# if defined(WIN32) +-# if defined(_WIN32) -# if defined(OPUS_BUILD) && defined(DLL_EXPORT) -# define OPUS_EXPORT __declspec(dllexport) -# else diff --git a/setup/versions.sh b/setup/versions.sh index 6ec3d2b..841a00d 100644 --- a/setup/versions.sh +++ b/setup/versions.sh @@ -25,13 +25,13 @@ LIBOGG_URL=${XIPH_URL}/ogg LIBVORBIS_VERSION=1.3.7 LIBVORBIS_URL=${XIPH_URL}/vorbis -FLAC_VERSION=1.4.2 +FLAC_VERSION=1.4.3 FLAC_URL=${XIPH_URL}/flac -OPUS_VERSION=1.3.1 +OPUS_VERSION=1.5.1 OPUS_URL=${XIPH_URL}/opus -LIBSNDFILE_VERSION=1.1.0 +LIBSNDFILE_VERSION=1.2.2 LIBSNDFILE_URL=https://github.com/libsndfile/libsndfile/releases/download/${LIBSNDFILE_VERSION} LIBSAMPLERATE_VERSION=0.1.9 @@ -40,8 +40,8 @@ LIBSAMPLERATE_URL=http://www.mega-nerd.com/SRC MINGW_STD_THREADS_VERSION=c931bac289dd431f1dd30fc4a5d1a7be36668073 MINGW_STD_THREADS_URL=https://github.com/meganz/mingw-std-threads.git -ZLIB_VERSION=cacf7f1d4e3d44d871b605da3b647f07d718623f # 1.2.11 -ZLIB_URL=https://github.com/madler/zlib.git +ZLIB_VERSION=1.3.1 +ZLIB_URL=https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION} # --------------------------------------------------------------------------------------------------------------------- # bootstrap plugins