From 98bdcef8f14b98b83946caf4f5a86c05f7bc84e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20Mo=C5=BEeiko?= Date: Sat, 24 Feb 2024 04:30:58 -0800 Subject: [PATCH] upgrade xz, libpng, mpg123 to latest versions --- build.cmd | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/build.cmd b/build.cmd index c831f20..9a453a3 100644 --- a/build.cmd +++ b/build.cmd @@ -14,9 +14,9 @@ set NINJA_VERSION=1.11.1 set ZLIB_VERSION=1.3.1 set BZIP2_VERSION=1.0.8 -set XZ_VERSION=5.4.6 +set XZ_VERSION=5.6.0 set ZSTD_VERSION=1.5.5 -set LIBPNG_VERSION=1.6.41 +set LIBPNG_VERSION=1.6.43 set LIBJPEGTURBO_VERSION=3.0.0 set JBIG_VERSION=2.1 set LERC_VERSION=4.0.0 @@ -34,7 +34,7 @@ set LIBVORBIS_VERSION=1.3.7 set OPUS_VERSION=1.4 set OPUSFILE_VERSION=0.12 set FLAC_VERSION=1.4.3 -set MPG123_VERSION=1.32.4 +set MPG123_VERSION=1.32.5 set LIBMODPLUG_VERSION=0.8.9.0 rem libjxl dependencies @@ -173,7 +173,7 @@ rem call :get "https://github.com/madler/zlib/releases/download/v%ZLIB_VERSION%/zlib-%ZLIB_VERSION%.tar.xz" || exit /b 1 call :get "https://sourceware.org/pub/bzip2/bzip2-%BZIP2_VERSION%.tar.gz" || exit /b 1 -call :get "https://download.sourceforge.net/lzmautils/xz-%XZ_VERSION%.tar.xz" || exit /b 1 +call :get "https://github.com/tukaani-project/xz/releases/download/v%XZ_VERSION%/xz-%XZ_VERSION%.tar.xz" || exit /b 1 call :get "https://github.com/facebook/zstd/releases/download/v%ZSTD_VERSION%/zstd-%ZSTD_VERSION%.tar.gz" || exit /b 1 call :get "https://download.sourceforge.net/libpng/libpng-%LIBPNG_VERSION%.tar.xz" || exit /b 1 call :get "https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%LIBJPEGTURBO_VERSION%.tar.gz" || exit /b 1 @@ -243,26 +243,18 @@ rem rem xz rem -pushd %BUILD%\xz-%XZ_VERSION% -msbuild.exe -nologo -v:m -p:configuration=ReleaseMT -p:platform=x64 -p:PlatformToolset=v143 windows\vs2019\liblzma.vcxproj || exit /b 1 -copy windows\vs2019\ReleaseMT\x64\liblzma\liblzma.lib %DEPEND%\lib\ -mkdir %DEPEND%\include\lzma -copy /y src\liblzma\api\lzma.h %DEPEND%\include\ -copy /y src\liblzma\api\lzma\*.h %DEPEND%\include\lzma\ -popd - -if not exist %DEPEND%\lib\pkgconfig mkdir %DEPEND%\lib\pkgconfig -echo prefix=%CD%/%DEPEND% > %DEPEND%\lib\pkgconfig\liblzma.pc -echo exec_prefix=%CD%/%DEPEND% >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo libdir=%CD%/%DEPEND%/lib >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo includedir=%CD%/%DEPEND%/include >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo. >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo Name: liblzma >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo Description: General purpose data compression library >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo URL: https://tukaani.org/xz/ >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo Version: %XZ_VERSION% >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo Cflags: -I${includedir} >> %DEPEND%\lib\pkgconfig\liblzma.pc -echo Libs: -L${libdir} -llzma >> %DEPEND%\lib\pkgconfig\liblzma.pc +cmake.exe -Wno-dev ^ + -S %BUILD%\xz-%XZ_VERSION% ^ + -B %BUILD%\xz-%XZ_VERSION% ^ + -A x64 -T host=x64 ^ + -G %MSVC_GENERATOR% ^ + -DCMAKE_INSTALL_PREFIX=%DEPEND% ^ + -DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^ + -DBUILD_SHARED_LIBS=OFF ^ + -DENABLE_NLS=OFF ^ + || exit /b 1 +cmake.exe --build %BUILD%\xz-%XZ_VERSION% --config Release --target install --parallel || exit /b 1 rem rem zstd