Browse Source

chore(CI): Rename Windows vpx.patch to vpx-windows.patch

Avoid conflict with different VPX patch needed for macos
reviewable/pr6438/r3
Anthony Bilinski 4 years ago
parent
commit
3dd3cae761
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 2
      buildscripts/build_vpx_cross.sh
  2. 2
      buildscripts/docker/Dockerfile.windows_builder
  3. 0
      buildscripts/patches/vpx-windows.patch

2
buildscripts/build_vpx_cross.sh

@ -43,7 +43,7 @@ else @@ -43,7 +43,7 @@ else
exit 1
fi
patch -Np1 < "$(dirname "$0")"/patches/vpx.patch
patch -Np1 < "$(dirname "$0")"/patches/vpx-windows.patch
CFLAGS=${ARCH_FLAGS} CROSS="${ARCH}-w64-mingw32-" \
./configure --target="${VPX_ARCH}" \

2
buildscripts/docker/Dockerfile.windows_builder

@ -138,7 +138,7 @@ RUN mkdir -p /src/sodium && \ @@ -138,7 +138,7 @@ RUN mkdir -p /src/sodium && \
COPY download/download_vpx.sh /build/download/download_vpx.sh
COPY build_vpx_cross.sh /build/build_vpx_cross.sh
COPY patches/vpx.patch /build/patches/vpx.patch
COPY patches/vpx-windows.patch /build/patches/vpx-windows.patch
RUN mkdir -p /src/vpx && \
cd /src/vpx && \
/build/build_vpx_cross.sh --arch ${ARCH} && \

0
buildscripts/patches/vpx.patch → buildscripts/patches/vpx-windows.patch

Loading…
Cancel
Save