Skip to content

Commit 4a428af

Browse files
saudetsaudet
committed
Fix builds for FFmpeg and Leptonica
1 parent 01ae73b commit 4a428af

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎.github/actions/deploy-windows/action.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ runs:
8686
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-readline-8.2.013-1-any.pkg.tar.zst
8787
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tcl-8.6.13-1-any.pkg.tar.zst
8888
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tk-8.6.13-1-any.pkg.tar.zst
89-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
90-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
91-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
92-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
93-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
94-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
95-
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
89+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
90+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
91+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libmangle-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
92+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
93+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-tools-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
94+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
95+
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-winstorecompat-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
9696
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
9797
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
9898
curl -LO http://repo.msys2.org/mingw/i686/mingw-w64-i686-SDL2-2.30.12-1-any.pkg.tar.zst
@@ -106,13 +106,13 @@ runs:
106106
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-readline-8.2.013-1-any.pkg.tar.zst
107107
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tcl-8.6.13-1-any.pkg.tar.zst
108108
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tk-8.6.13-1-any.pkg.tar.zst
109-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
110-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
111-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
112-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
113-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
114-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
115-
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst
109+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-crt-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
110+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
111+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libmangle-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
112+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libwinpthread-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
113+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-tools-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
114+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winpthreads-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
115+
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-winstorecompat-git-12.0.0.r81.g90abf784a-1-any.pkg.tar.zst
116116
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst
117117
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst
118118
curl -LO http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-SDL2-2.30.12-1-any.pkg.tar.zst

‎.github/actions/redeploy/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ runs:
149149
done
150150
if [[ -n $UPLOAD_URL ]]; then
151151
rm -f $(find redeploy -name *.asc.*)
152-
pushd redeploy; zip -r ../redeploy.zip *; popd
153-
curl --request POST --header "Authorization: Bearer $(echo $CI_DEPLOY_USERNAME:$CI_DEPLOY_PASSWORD | base64)" --form bundle=@redeploy.zip $UPLOAD_URL
152+
pushd redeploy; zip -r ../$ARTIFACT-platform.zip *; popd
153+
curl --request POST --header "Authorization: Bearer $(echo $CI_DEPLOY_USERNAME:$CI_DEPLOY_PASSWORD | base64)" --form bundle=@$ARTIFACT-platform.zip $UPLOAD_URL
154154
fi
155155
df -h
156156

‎ffmpeg/cppbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LIBAOM_CONFIG="-DENABLE_TESTS:BOOL=OFF -DENABLE_TESTDATA:BOOL=OFF -DENABLE_TOOLS
2828
LIBSVTAV1_CONFIG="-DBUILD_APPS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin"
2929

3030
NASM_VERSION=2.14
31-
ZLIB=zlib-1.3.1
31+
ZLIB=zlib-1.3.2
3232
LAME=lame-3.100
3333
SPEEX=speex-1.2.1
3434
OPUS=opus-1.3.1

‎leptonica/cppbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
88
fi
99

1010
NASM_VERSION=2.14
11-
ZLIB=zlib-1.3.1
11+
ZLIB=zlib-1.3.2
1212
GIFLIB=giflib-5.2.2
1313
LIBJPEG=libjpeg-turbo-3.0.1
1414
LIBPNG=libpng-1.6.53 # warning: libpng16 doesn't work on CentOS 6 for some reason

0 commit comments

Comments
 (0)