diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4834d52..8f403ba 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -67,19 +67,30 @@ jobs: :: ------ dep ------ set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin mkdir dependencies_src + :: ===== exiv2 ===== curl -fsSL -o exiv2_bin.zip https://github.com/Exiv2/exiv2/releases/download/v0.28.3/exiv2-0.28.3-2019msvc64.zip 7z x exiv2_bin.zip -y ren .\exiv2-0.28.3-2019msvc64 dependencies_bin + :: ===== zlib ===== curl -fsSL -o zlib_src.zip https://zlib.net/zlib131.zip 7z x zlib_src.zip -y -o"dependencies_src" ren .\dependencies_src\zlib-1.3.1 zlib || goto :error cmake ./dependencies_src/zlib -Bbuild_dependencies/zlib -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error cmake --build build_dependencies/zlib --config Release --target=install || goto :error curl -fsSL -o expat_src.zip https://github.com/libexpat/libexpat/archive/R_2_6_2.zip + :: ===== expat ===== 7z x expat_src.zip -y -o"dependencies_src" ren .\dependencies_src\libexpat-R_2_6_2 expat || goto :error cmake ./dependencies_src/expat/expat -Bbuild_dependencies/expat -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error cmake --build build_dependencies/expat --config Release --target=install || goto :error + :: ===== ECM ===== + git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git dependencies_src/extra-cmake-modules + cmake .\dependencies_src\extra-cmake-modules -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error + cmake --build build_dependencies/extra-cmake-modules --config Release --target=install || goto :error + :: ===== KImageFormats ===== + git clone -q https://invent.kde.org/frameworks/kimageformats.git dependencies_src/kimageformats + cmake .\dependencies_src\kimageformats -DKDE_INSTALL_QTPLUGINDIR=%QT_ROOT_DIR%\plugins || goto :error + cmake --build build_dependencies/kimageformats --config Release --target=install || goto :error :: ------ app ------ cmake -Bbuild . -DCMAKE_INSTALL_PREFIX="%PWD%\build\" cmake --build build --config Release diff --git a/appveyor.yml b/appveyor.yml index 9fc954e..845ebb7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: QTDIR: C:\Qt\6.7\mingw_64 MINGW64: C:\Qt\Tools\mingw1120_64 KF_BRANCH: master - EXIV2_VERSION: "0.28.2" + EXIV2_VERSION: "0.28.3" EXIV2_CMAKE_OPTIONS: "-DEXIV2_ENABLE_BROTLI=OFF -DEXIV2_ENABLE_INIH=OFF -DEXIV2_BUILD_EXIV2_COMMAND=OFF" PPIC_CMAKE_OPTIONS: "-DPREFER_QT_5=OFF" WINDEPLOYQT_ARGS: "--verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation" @@ -67,24 +67,24 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% # install AOM for libavif AV1 decoding support... - cd 3rdparty - #- git clone -b v3.6.0 --depth 1 https://aomedia.googlesource.com/aom - #- cd aom - #- mkdir build.aom - #- cd build.aom - #- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DAOM_TARGET_CPU=generic -DENABLE_TESTS=OFF -DENABLE_TESTDATA=OFF -DENABLE_TOOLS=OFF -DENABLE_EXAMPLES=0 - #- cmake --build . --config Release - #- cmake --build . --config Release --target install/strip - - mkdir aom + - git clone -b v3.9.1 --depth 1 https://aomedia.googlesource.com/aom - cd aom - - curl -fsSL -o ppkg-aom.zip https://sourceforge.net/projects/pineapple-package-manager/files/packages/mingw-w64-x86_64-windows/aom-3.6.0-1.zip - - ppkg ppkg-aom.zip - - 7z x ppkg-aom.zip LICENSE -y + - mkdir build.aom + - cd build.aom + - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DENABLE_DOCS=OFF -DBUILD_SHARED_LIBS=ON -DAOM_TARGET_CPU=generic -DENABLE_TESTS=OFF -DENABLE_TESTDATA=OFF -DENABLE_TOOLS=OFF -DENABLE_EXAMPLES=0 + - cmake --build . --config Release + - cmake --build . --config Release --target install/strip + #- mkdir aom + #- cd aom + #- curl -fsSL -o ppkg-aom.zip https://sourceforge.net/projects/pineapple-package-manager/files/packages/mingw-w64-x86_64-windows/aom-3.9.1-1.zip + #- ppkg ppkg-aom.zip + #- 7z x ppkg-aom.zip LICENSE -y - cd %APPVEYOR_BUILD_FOLDER% # install libavif for avif format support of KImageFormats - cd %LIBAVIF% - - curl -fsSL -o libavif-v0_11_1.zip https://github.com/AOMediaCodec/libavif/archive/v0.11.1.zip - - 7z x libavif-v0_11_1.zip -y - - cd libavif-0.11.1 + - curl -fsSL -o libavif-v0_11_1.zip https://github.com/AOMediaCodec/libavif/archive/v1.1.1.zip + - 7z x libavif-v1_1_1.zip -y + - cd libavif-1.1.1 - mkdir build - cd build - cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DAVIF_CODEC_AOM=ON @@ -104,9 +104,9 @@ build_script: - cd %APPVEYOR_BUILD_FOLDER% # build libexpat for libexiv2 - cd %LIBEXPAT% - - curl -fsSL -o R_2_5_0.zip https://github.com/libexpat/libexpat/archive/R_2_5_0.zip - - 7z x R_2_5_0.zip -y - - cd libexpat-R_2_5_0/expat/ + - curl -fsSL -o R_2_6_2.zip https://github.com/libexpat/libexpat/archive/R_2_6_2.zip + - 7z x R_2_6_2.zip -y + - cd libexpat-R_2_6_2/expat/ - cmake -G "Ninja" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF - cmake --build . --target install/strip - cd %APPVEYOR_BUILD_FOLDER% @@ -151,8 +151,8 @@ build_script: - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\aom\LICENSE License.aom.txt - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\karchive\LICENSES\LGPL-2.0-or-later.txt License.KArchive.txt - copy %APPVEYOR_BUILD_FOLDER%\3rdparty\kimageformats\LICENSES\LGPL-2.1-or-later.txt License.kimageformats.txt - - copy %LIBEXPAT%\libexpat-R_2_5_0\expat\COPYING License.expat.txt - - copy %LIBAVIF%\libavif-0.11.1\LICENSE License.libavif.txt + - copy %LIBEXPAT%\libexpat-R_2_6_2\expat\COPYING License.expat.txt + - copy %LIBAVIF%\libavif-1.1.1\LICENSE License.libavif.txt - copy %LIBEXIV2%\exiv2-%EXIV2_VERSION%\COPYING License.exiv2.txt # TODO: Qt, zlib - cd ..