Skip to content

Commit

Permalink
Merge pull request #148 from hzeller/feature-20250108-trim-appimage
Browse files Browse the repository at this point in the history
Trim libraries pulled in AppImage.
  • Loading branch information
hzeller authored Jan 8, 2025
2 parents 6497c23 + ecc1dcb commit ebd0926
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/conf/AppImageBuilder.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ AppDir:
#- libopenslide0
- libturbojpeg
- libexif12
- libswscale5
#- libswscale5
- libdeflate0
- libsixel1
#- libpoppler-glib8
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit ebd0926

Please sign in to comment.