Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Benau
Benau committed Jun 25, 2023
1 parent 67d276d commit 3de2ce1
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 42 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/apple.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,10 @@ jobs:
run: |
cd src/astc-encoder
sed -i '/-Werror/d' Source/cmake_core.cmake
sed -i 's|${ASTC_TARGET}-static|astcenc|g' Source/cmake_core.cmake
if [ ${{ matrix.platform }} = "MacOSX" ]; then
sed -i 's|STATIC|SHARED|g' Source/cmake_core.cmake
sed -i 's|${ASTCENC_TARGET}-shared|astcenc|g' Source/cmake_core.cmake
else
sed -i 's|${ASTCENC_TARGET}-static|astcenc|g' Source/cmake_core.cmake
fi
mkdir build
cd build
Expand All @@ -295,17 +296,17 @@ jobs:
-DCCTOOLS_ARCH=${{ matrix.arch }} \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-cctools.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-${{ steps.sysroot.outputs.lowercase }}-${{ matrix.arch }} \
-DISA_SSE41=ON -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-O3 -DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-O3 -DASTCENC_DYNAMIC_LIBRARY=1'
-DASTCENC_ISA_SSE41=ON -DASTCENC_INVARIANCE=OFF -DASTCENC_CLI=OFF \
-DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_SHAREDLIB=ON \
-DCMAKE_C_FLAGS='-O3' -DCMAKE_CXX_FLAGS='-O3'
else
cmake .. -DCCTOOLS_PREFIX=/opt/cctools -DCCTOOLS_PLATFORM=${{ matrix.platform }} \
-DCCTOOLS_ARCH=${{ matrix.arch }} \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-cctools.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-${{ steps.sysroot.outputs.lowercase }}-${{ matrix.arch }} \
-DISA_NEON=ON -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-O3 -DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-O3 -DASTCENC_DYNAMIC_LIBRARY=1'
-DASTCENC_ISA_NEON=ON -DASTCENC_INVARIANCE=OFF -DASTCENC_CLI=OFF \
-DASTCENC_UNIVERSAL_BUILD=OFF -DASTCENC_SHAREDLIB=ON \
-DCMAKE_C_FLAGS='-O3' -DCMAKE_CXX_FLAGS='-O3'
fi
make -j5
if [ ${{ matrix.platform }} = "MacOSX" ]; then
Expand Down
36 changes: 13 additions & 23 deletions .github/workflows/win.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
- name: Build SQLite
run: |
cd src/sqlite
sed -i 's/${PROJECT_NAME} STATIC/${PROJECT_NAME} SHARED/g' CMakeLists.txt
sed -i 's/Rpcrt4.lib/rpcrt4/g' CMakeLists.txt
mkdir build
cd build
cmake .. -DLLVM_ARCH=${{ matrix.arch }} -DLLVM_PREFIX=$HOME/llvm-mingw \
Expand Down Expand Up @@ -503,42 +503,32 @@ jobs:
run: |
cd src/astc-encoder
sed -i '/-Werror/d' Source/cmake_core.cmake
sed -i 's|${ASTC_TARGET}-static|astcenc|g' Source/cmake_core.cmake
sed -i 's|STATIC|SHARED|g' Source/cmake_core.cmake
sed -i 's|!defined(__clang__) && defined(_MSC_VER)|1|g' Source/astcenc_platform_isa_detection.cpp
sed -i 's|Windows.h|windows.h|g' Source/astcenc_platform_isa_detection.cpp
sed -i 's/${ASTCENC_TARGET}-shared/astcenc/g' Source/cmake_core.cmake
mkdir build
cd build
# We require SSE4.1 (x86_64) or NEON (arm*) for astc-encoder
# SSE2 for i686 because SSE4.1 fails to compile
# We require SSE4.1 (x86) or NEON (arm*) for astc-encoder
if [ ${{ matrix.arch }} = "armv7" ]; then
cmake .. -DLLVM_ARCH=${{ matrix.arch }} -DLLVM_PREFIX=$HOME/llvm-mingw \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-llvm-mingw.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-win-${{ matrix.arch }} \
-DISA_NEON=OFF -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-DASTCENC_DYNAMIC_LIBRARY=1'
-DASTCENC_ISA_NEON=OFF -DASTCENC_INVARIANCE=OFF -DASTCENC_CLI=OFF \
-DASTCENC_SHAREDLIB=ON
elif [ ${{ matrix.arch }} = "aarch64" ]; then
cmake .. -DLLVM_ARCH=${{ matrix.arch }} -DLLVM_PREFIX=$HOME/llvm-mingw \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-llvm-mingw.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-win-${{ matrix.arch }} \
-DISA_NEON=ON -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-DASTCENC_DYNAMIC_LIBRARY=1'
elif [ ${{ matrix.arch }} = "i686" ]; then
cmake .. -DMXE_PREFIX=/data/mxe/usr \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-mxe-${{ matrix.arch }}.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-win-${{ matrix.arch }} \
-DISA_SSE2=ON -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-msse3 -O2 -DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-msse3 -O2 -DASTCENC_DYNAMIC_LIBRARY=1'
-DASTCENC_ISA_NEON=ON -DASTCENC_INVARIANCE=OFF -DASTCENC_CLI=OFF \
-DASTCENC_SHAREDLIB=ON
else
if [ ${{ matrix.arch }} = "i686" ]; then
sed -i 's/_mm_popcnt_u64/__builtin_popcountll/g' ../Source/astcenc_vecmathlib_sse_4.h
fi
sed -i 's/_mm_round_ps(a.m, flags)/_mm_round_ps(a.m, _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC)/g' ../Source/astcenc_vecmathlib_sse_4.h
cmake .. -DMXE_PREFIX=/data/mxe/usr \
-DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-mxe-${{ matrix.arch }}.cmake \
-DCMAKE_INSTALL_PREFIX=$HOME/dependencies-win-${{ matrix.arch }} \
-DISA_SSE41=ON -DNO_INVARIANCE=ON -DCLI=OFF \
-DCMAKE_C_FLAGS='-O2 -DASTCENC_DYNAMIC_LIBRARY=1' \
-DCMAKE_CXX_FLAGS='-O2 -DASTCENC_DYNAMIC_LIBRARY=1'
-DASTCENC_ISA_SSE41=ON -DASTCENC_INVARIANCE=OFF -DASTCENC_CLI=OFF \
-DASTCENC_SHAREDLIB=ON -DCMAKE_C_FLAGS='-O2' -DCMAKE_CXX_FLAGS='-O2'
fi
make -j4
dll2lib.sh ${{ env.dlltool_arch }} Source/libastcenc.dll
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
url = https://github.com/curl/curl
[submodule "src/sqlite"]
path = src/sqlite
url = https://github.com/azadkuh/sqlite-amalgamation
url = https://github.com/rhuijben/sqlite-amalgamation
[submodule "src/libpng"]
path = src/libpng
url = https://github.com/glennrp/libpng
Expand Down Expand Up @@ -45,7 +45,7 @@
url = https://github.com/libsndfile/libsamplerate
[submodule "src/wayland"]
path = src/wayland
url = https://github.com/wayland-project/wayland
url = https://gitlab.freedesktop.org/wayland/wayland
[submodule "src/bluez"]
path = src/bluez
url = https://github.com/bluez/bluez
Expand Down
2 changes: 1 addition & 1 deletion src/astc-encoder
Submodule astc-encoder updated 352 files
2 changes: 1 addition & 1 deletion src/curl
Submodule curl updated 2639 files
2 changes: 1 addition & 1 deletion src/freetype
Submodule freetype updated 621 files
2 changes: 1 addition & 1 deletion src/harfbuzz
Submodule harfbuzz updated 566 files
2 changes: 1 addition & 1 deletion src/libjpeg
Submodule libjpeg updated 75 files
+1 −0 .gitattributes
+9 −8 .github/workflows/build.yml
+15 −3 BUILDING.md
+52 −22 CMakeLists.txt
+90 −14 ChangeLog.md
+1 −1 LICENSE.md
+1 −1 cmakescripts/BuildPackages.cmake
+0 −1 cmyk.h
+2 −0 djpeg.c
+190 −189 doc/html/group___turbo_j_p_e_g.html
+7 −7 doc/html/search/all_6.js
+6 −6 doc/html/search/functions_0.js
+3 −3 doc/html/structtjtransform.html
+3 −2 fuzz/decompress.cc
+3 −2 fuzz/decompress_yuv.cc
+57 −54 java/TJBench.java
+5 −8 java/TJExample.java
+63 −13 java/TJUnitTest.java
+91 −85 java/doc/index-all.html
+86 −82 java/doc/org/libjpegturbo/turbojpeg/TJ.html
+87 −82 java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
+1 −1 java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html
+183 −165 java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
+20 −19 java/doc/org/libjpegturbo/turbojpeg/TJTransform.html
+43 −38 java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
+86 −80 java/doc/org/libjpegturbo/turbojpeg/YUVImage.html
+1 −1 java/doc/org/libjpegturbo/turbojpeg/package-summary.html
+3 −2 java/doc/serialized-form.html
+74 −69 java/org/libjpegturbo/turbojpeg/TJ.java
+73 −68 java/org/libjpegturbo/turbojpeg/TJCompressor.java
+2 −2 java/org/libjpegturbo/turbojpeg/TJCustomFilter.java
+163 −150 java/org/libjpegturbo/turbojpeg/TJDecompressor.java
+14 −14 java/org/libjpegturbo/turbojpeg/TJTransform.java
+35 −31 java/org/libjpegturbo/turbojpeg/TJTransformer.java
+84 −77 java/org/libjpegturbo/turbojpeg/YUVImage.java
+7 −7 jccolext.c
+16 −5 jccolor.c
+0 −1 jchuff.c
+10 −2 jchuff.h
+0 −1 jcmaster.c
+18 −19 jcphuff.c
+0 −1 jdapimin.c
+7 −7 jdcolext.c
+0 −1 jdcolor.c
+0 −1 jdmainct.c
+0 −1 jdmerge.c
+10 −10 jdmrgext.c
+4 −4 jsimd.h
+4 −4 jsimd_none.c
+2 −2 jversion.h.in
+10 −10 rdppm.c
+5 −7 simd/arm/aarch32/jsimd.c
+7 −10 simd/arm/aarch64/jsimd.c
+94 −93 simd/arm/jcphuff-neon.c
+0 −1 simd/arm/jdcolor-neon.c
+0 −1 simd/arm/jdmerge-neon.c
+0 −1 simd/arm/jidctint-neon.c
+75 −9 simd/i386/jsimd.c
+6 −6 simd/jsimd.h
+5 −7 simd/mips/jsimd.c
+5 −7 simd/mips64/jsimd.c
+5 −7 simd/powerpc/jsimd.c
+51 −9 simd/x86_64/jsimd.c
+58 −59 tjbench.c
+4 −7 tjexample.c
+48 −27 tjunittest.c
+1 −1 transupp.c
+19 −12 turbojpeg-jni.c
+4 −4 turbojpeg-mapfile
+4 −4 turbojpeg-mapfile.jni
+107 −57 turbojpeg.c
+489 −473 turbojpeg.h
+1 −1 win/jpeg.rc.in
+1 −1 win/turbojpeg.rc.in
+9 −1 wizard.txt
2 changes: 1 addition & 1 deletion src/libpng
Submodule libpng updated from 07b880 to f13577
2 changes: 1 addition & 1 deletion src/libvpx
Submodule libvpx updated 222 files
2 changes: 1 addition & 1 deletion src/mbedtls
Submodule mbedtls updated from 869298 to 1873d3
2 changes: 1 addition & 1 deletion src/sqlite
Submodule sqlite updated 7 files
+37 −0 .github/workflows/cmake.yml
+535 −105 CMakeLists.txt
+14,434 −9,897 shell.c
+14,828 −6,578 sqlite3.c
+412 −150 sqlite3.h
+13 −0 sqlite3.pc.in
+22 −2 sqlite3ext.h

0 comments on commit 3de2ce1

Please sign in to comment.