From bbb9252f582e21c75b7aa6996e63cb4704614153 Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sun, 11 May 2025 23:11:08 +0100 Subject: [PATCH 1/2] update libjasper from 2.0.32 to 4.2.5 --- .github/scripts/build-linux.sh | 6 +++--- .github/scripts/build-macos.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index c67caa9..cb0034f 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -55,10 +55,10 @@ popd # Install libjasper: # - libraw RedCine codec support -curl -L --retry 3 -o jasper.tar.gz https://github.com/jasper-software/jasper/archive/version-2.0.32.tar.gz -$CHECK_SHA256 jasper.tar.gz a3583a06698a6d6106f2fc413aa42d65d86bedf9a988d60e5cfa38bf72bc64b9 +curl -L --retry 3 -o jasper.tar.gz https://github.com/jasper-software/jasper/archive/version-4.2.5.tar.gz +$CHECK_SHA256 jasper.tar.gz 3f4b1df7cab7a3cc67b9f6e28c730372f030b54b0faa8548a9ee04ae83fffd44 tar xzf jasper.tar.gz -pushd jasper-version-2.0.32 +pushd jasper-version-4.2.5 mkdir cmake_build cd cmake_build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 63957bc..0cac5de 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -61,10 +61,10 @@ popd # Install libjasper: # - libraw RedCine codec support -curl -L --retry 3 -o jasper.tar.gz https://github.com/jasper-software/jasper/archive/version-2.0.32.tar.gz -$CHECK_SHA256 jasper.tar.gz a3583a06698a6d6106f2fc413aa42d65d86bedf9a988d60e5cfa38bf72bc64b9 +curl -L --retry 3 -o jasper.tar.gz https://github.com/jasper-software/jasper/archive/version-4.2.5.tar.gz +$CHECK_SHA256 jasper.tar.gz 3f4b1df7cab7a3cc67b9f6e28c730372f030b54b0faa8548a9ee04ae83fffd44 tar xzf jasper.tar.gz -pushd jasper-version-2.0.32 +pushd jasper-version-4.2.5 mkdir cmake_build cd cmake_build cmake -DCMAKE_INSTALL_PREFIX=$LIB_INSTALL_PREFIX -DCMAKE_BUILD_TYPE=Release \ From 99b75b56f5a6cbe19433247edce6cf9e2889676e Mon Sep 17 00:00:00 2001 From: Maik Riechert Date: Sun, 11 May 2025 23:24:26 +0100 Subject: [PATCH 2/2] libjasper: allow in-source builds --- .github/scripts/build-linux.sh | 3 ++- .github/scripts/build-macos.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build-linux.sh b/.github/scripts/build-linux.sh index cb0034f..c973cc7 100755 --- a/.github/scripts/build-linux.sh +++ b/.github/scripts/build-linux.sh @@ -62,7 +62,8 @@ pushd jasper-version-4.2.5 mkdir cmake_build cd cmake_build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ - -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_PROGRAMS=OFF .. + -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_PROGRAMS=OFF \ + -DALLOW_IN_SOURCE_BUILD=ON .. make install -j$(nproc) popd diff --git a/.github/scripts/build-macos.sh b/.github/scripts/build-macos.sh index 0cac5de..5aaee02 100755 --- a/.github/scripts/build-macos.sh +++ b/.github/scripts/build-macos.sh @@ -69,7 +69,8 @@ mkdir cmake_build cd cmake_build cmake -DCMAKE_INSTALL_PREFIX=$LIB_INSTALL_PREFIX -DCMAKE_BUILD_TYPE=Release \ -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_PROGRAMS=OFF \ - -DCMAKE_INSTALL_NAME_DIR=$LIB_INSTALL_PREFIX/lib .. + -DCMAKE_INSTALL_NAME_DIR=$LIB_INSTALL_PREFIX/lib \ + -DALLOW_IN_SOURCE_BUILD=ON .. make install -j popd