From ecc1dcba1a5ce8257c334d99c21c175da246cfe7 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 8 Jan 2025 06:04:47 -0800 Subject: [PATCH] Trim libraries pulled in AppImage. * Semove swscale that was bundled with the appimage but not needed anymore. * Simplify library checking in CMake - no need to require swscale for jpeg,qoi,openslide anymore Issue: #140 --- .github/conf/AppImageBuilder.yml.in | 2 +- .github/workflows/ubuntu.yml | 15 ++++++++++----- CMakeLists.txt | 10 ---------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/conf/AppImageBuilder.yml.in b/.github/conf/AppImageBuilder.yml.in index a375766..ba2125d 100644 --- a/.github/conf/AppImageBuilder.yml.in +++ b/.github/conf/AppImageBuilder.yml.in @@ -32,7 +32,7 @@ AppDir: #- libopenslide0 - libturbojpeg - libexif12 - - libswscale5 + #- libswscale5 - libdeflate0 - libsixel1 #- libpoppler-glib8 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index b6d1146..85a2ec4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -20,7 +20,7 @@ jobs: - name: Install minimal dependencies run: | sudo apt update - sudo apt install cmake git g++ clang pkg-config libswscale-dev libavutil-dev libdeflate-dev + sudo apt install cmake git g++ clang pkg-config libdeflate-dev - name: Get the Source uses: actions/checkout@v3 @@ -139,11 +139,9 @@ jobs: run: | sudo apt update sudo apt install cmake git g++ clang pkg-config - sudo apt install libswscale-dev libavutil-dev libdeflate-dev + sudo apt install libdeflate-dev sudo apt install libturbojpeg-dev libexif-dev - sudo apt install librsvg2-dev libcairo-dev sudo apt install libsixel-dev - sudo apt install libpoppler-glib-dev sudo apt install pandoc - name: Set Version @@ -166,11 +164,18 @@ jobs: -DWITH_QOI_IMAGE=On \ -DWITH_LIBSIXEL=On strip AppDir/usr/bin/timg - ldd AppDir/usr/bin/timg + sed "s/@VERSION@/$PACKAGE_VERSION/" \ < .github/conf/AppImageBuilder.yml.in \ > AppImageBuilder.yml + echo "--- Binary size ---" + du -hs AppDir/usr/bin/timg + size AppDir/usr/bin/timg + + echo "--- Libraries linked ---" + ldd AppDir/usr/bin/timg + - name: Package uses: AppImageCrafters/build-appimage@master env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b8c711..60d8da8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,6 @@ endif() if(WITH_TURBOJPEG) pkg_check_modules(TURBOJPEG REQUIRED IMPORTED_TARGET libturbojpeg) pkg_check_modules(EXIF REQUIRED IMPORTED_TARGET libexif) - pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil) - pkg_check_modules(SWSCALE IMPORTED_TARGET REQUIRED libswscale) endif() if(WITH_GRAPHICSMAGICK) @@ -68,8 +66,6 @@ endif() if(WITH_OPENSLIDE_SUPPORT) pkg_check_modules(OPENSLIDE IMPORTED_TARGET REQUIRED openslide) - pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil) - pkg_check_modules(SWSCALE IMPORTED_TARGET REQUIRED libswscale) endif() if(WITH_VIDEO_DECODING) @@ -81,12 +77,6 @@ if(WITH_VIDEO_DECODING) endif() endif() -# TODO: allow for fallback if that is not available. -if(WITH_QOI_IMAGE) - pkg_check_modules(AVUTIL REQUIRED IMPORTED_TARGET libavutil) - pkg_check_modules(SWSCALE IMPORTED_TARGET REQUIRED libswscale) -endif() - find_package(Threads) add_subdirectory(src)