From 3f3767e4a466dc919f589c06886926040d7a7741 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 24 Mar 2025 17:31:35 +0700 Subject: [PATCH] fix libheif problem by turning off the option that failed --- vcpkg-triplets/x64-linux-glibc-toolchain.cmake | 5 ++++- vcpkg-triplets/x64-linux-glibc.cmake | 7 +++++++ vcpkg.json | 8 ++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/vcpkg-triplets/x64-linux-glibc-toolchain.cmake b/vcpkg-triplets/x64-linux-glibc-toolchain.cmake index c2a84910..14a8ac68 100644 --- a/vcpkg-triplets/x64-linux-glibc-toolchain.cmake +++ b/vcpkg-triplets/x64-linux-glibc-toolchain.cmake @@ -1,4 +1,7 @@ set(CMAKE_C_COMPILER /usr/bin/gcc) set(CMAKE_CXX_COMPILER /usr/bin/g++) set(CMAKE_AR /usr/bin/ar) -set(CMAKE_LINKER /usr/bin/ld.gold) \ No newline at end of file +set(CMAKE_LINKER /usr/bin/ld.gold) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) +set(ENV{CFLAGS} "-fPIC -fPIE") +set(ENV{CXXFLAGS} "-fPIC -fPIE") \ No newline at end of file diff --git a/vcpkg-triplets/x64-linux-glibc.cmake b/vcpkg-triplets/x64-linux-glibc.cmake index a2210573..c0dea03f 100644 --- a/vcpkg-triplets/x64-linux-glibc.cmake +++ b/vcpkg-triplets/x64-linux-glibc.cmake @@ -7,4 +7,11 @@ set(VCPKG_BUILD_TYPE release) set(VCPKG_C_FLAGS "-fPIC -fPIE") set(VCPKG_CXX_FLAGS "-fPIC -fPIE") +set(VCPKG_CMAKE_CONFIGURE_OPTIONS + -DBUILD_SHARED_LIBS=OFF + -DWITH_EXAMPLES=OFF + -DWITH_GDK_PIXBUF=OFF + -DBUILD_TESTING=OFF +) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/x64-linux-glibc-toolchain.cmake") \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index 8dedd77a..90220335 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -27,6 +27,14 @@ "webp" ] }, + { + "name": "libheif", + "features": [ + "aom", + "jpeg", + "hevc" + ] + }, "libiconv", "libpng", "librabbitmq",