From 742e70f1853c1a0c5f195aa83e8e24773074503e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Jun 2024 03:47:20 +0200 Subject: [PATCH 1/5] Upgrade sources --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index fff4f6f..018a0a7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,8 +55,8 @@ ram.runtime = "200M" autoupdate.strategy = "latest_github_release" [resources.sources.libheif] - url = "https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz" - sha256 = "e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718" + url = "https://github.com/strukturag/libheif/releases/download/v1.17.6/libheif-1.17.6.tar.gz" + sha256 = "8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee" autoupdate.strategy = "latest_github_release" autoupdate.upstream = "https://github.com/strukturag/libheif" From a1aebe338649c73350f38e9c684910480ac931cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 10 Jun 2024 18:45:22 +0200 Subject: [PATCH 2/5] Build libheif with cmake --- manifest.toml | 4 ++-- scripts/_common.sh | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index 018a0a7..2df8f24 100644 --- a/manifest.toml +++ b/manifest.toml @@ -102,8 +102,8 @@ ram.runtime = "200M" "libheif-dev", "build-essential", "pkg-config", - "autoconf", - "automake", + "cmake", + "ninja", "libx265-dev", "libde265-dev", "libaom-dev", diff --git a/scripts/_common.sh b/scripts/_common.sh index 1ce2711..db039c0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,14 +29,15 @@ function build_libheif { export GOCACHE="$install_dir/build/.cache" pushd "$install_dir/libheif" || ynh_die - # mkdir -p "$install_dir/local" - # chown -R $app:$app "$install_dir/local" - ynh_exec_as "$app" ./autogen.sh 2>&1 - ynh_exec_as "$app" ./configure --prefix="$install_dir/local" --disable-gdk-pixbuf 2>&1 - ynh_exec_as "$app" make clean 2>&1 - ynh_exec_as "$app" make 2>&1 - ynh_exec_as "$app" make install 2>&1 - ynh_exec_as "$app" make clean 2>&1 + mkdir build + pushd build + ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ + cmake --preset=release --prefix="$install_dir/local" -DWITH_GDK_PIXBUF=OFF -G Ninja .. + ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ + ninja + ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ + ninja install + popd popd || ynh_die } From 3f814cc7ab4735588f0c6d785709aee3fdd57f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 10 Jun 2024 18:51:33 +0200 Subject: [PATCH 3/5] ninja -> ninja-build --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2df8f24..3e4edec 100644 --- a/manifest.toml +++ b/manifest.toml @@ -103,7 +103,7 @@ ram.runtime = "200M" "build-essential", "pkg-config", "cmake", - "ninja", + "ninja-build", "libx265-dev", "libde265-dev", "libaom-dev", From 12b8a2e974cb91c2e2bff472dfe5e54547a2da9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 10 Jun 2024 19:00:27 +0200 Subject: [PATCH 4/5] mkdir as user --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index db039c0..b1ab0eb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,7 +29,7 @@ function build_libheif { export GOCACHE="$install_dir/build/.cache" pushd "$install_dir/libheif" || ynh_die - mkdir build + ynh_exec_as "$app" mkdir build pushd build ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ cmake --preset=release --prefix="$install_dir/local" -DWITH_GDK_PIXBUF=OFF -G Ninja .. From ef30e1e136e99f6d59db1bec10271bf17deb9404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 10 Jun 2024 22:54:57 +0200 Subject: [PATCH 5/5] cmake_install_prefix --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b1ab0eb..886c10b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -32,7 +32,7 @@ function build_libheif { ynh_exec_as "$app" mkdir build pushd build ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ - cmake --preset=release --prefix="$install_dir/local" -DWITH_GDK_PIXBUF=OFF -G Ninja .. + cmake --preset=release -DCMAKE_INSTALL_PREFIX="$install_dir/local" -DWITH_GDK_PIXBUF=OFF -G Ninja .. ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \ ninja ynh_exec_and_print_stderr_only_if_error ynh_exec_as "$app" \