void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Replace mozjpeg with jpegli in snap"

Browse source 
This reverts commit f57e2edf2a.
This commit is contained in:
John Preston 2024-04-16 23:22:55 +04:00
parent 566b53ce9f
commit bb0280f096
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
snap/snapcraft.yaml
View file

@ -131,7 +131,6 @@ parts:
cmake-parameters: cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
- -DTDESKTOP_API_ID=611335 - -DTDESKTOP_API_ID=611335
- -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
- -DDESKTOP_APP_USE_PACKAGED_LAZY=ON - -DDESKTOP_APP_USE_PACKAGED_LAZY=ON
@ -159,6 +158,7 @@ parts:
after: after:
- ffmpeg - ffmpeg
- libjxl - libjxl
- mozjpeg
- openal - openal
- protobuf - protobuf
- qt - qt
@ -238,6 +238,10 @@ parts:
rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas" rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack" rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so.8.2.2
after:
- mozjpeg
libjxl: libjxl:
source: https://github.com/libjxl/libjxl.git source: https://github.com/libjxl/libjxl.git
@ -253,7 +257,7 @@ parts:
- -DBUILD_TESTING=OFF - -DBUILD_TESTING=OFF
- -DJPEGXL_ENABLE_DEVTOOLS=OFF - -DJPEGXL_ENABLE_DEVTOOLS=OFF
- -DJPEGXL_ENABLE_TOOLS=OFF - -DJPEGXL_ENABLE_TOOLS=OFF
- -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON - -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF
- -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_DOXYGEN=OFF
- -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF
- -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_BENCHMARK=OFF
@ -272,6 +276,27 @@ parts:
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/share - -./usr/share
mozjpeg:
source: https://github.com/mozilla/mozjpeg.git
source-depth: 1
source-tag: v4.1.4
plugin: cmake
build-environment:
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
cmake-generator: Ninja
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr
- -DENABLE_STATIC=OFF
- -DWITH_JPEG8=ON
- -DPNG_SUPPORTED=OFF
prime:
- -./usr/bin
- -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
- -./usr/share
openal: openal:
source: https://github.com/kcat/openal-soft.git source: https://github.com/kcat/openal-soft.git
source-depth: 1 source-depth: 1
@ -433,9 +458,7 @@ parts:
-confirm-license \ -confirm-license \
-openssl-linked \ -openssl-linked \
-nomake examples \ -nomake examples \
-nomake tests \ -nomake tests
-- \
-DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT
DESTDIR="$CRAFT_PART_INSTALL" cmake --install . DESTDIR="$CRAFT_PART_INSTALL" cmake --install .
@ -456,7 +479,7 @@ parts:
- -./usr/mkspecs - -./usr/mkspecs
- -./usr/modules - -./usr/modules
after: after:
- libjxl - mozjpeg
- patches - patches
rnnoise: rnnoise:
@ -536,11 +559,10 @@ parts:
cmake-parameters: cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_PREFIX=/usr
- -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
prime: prime:
- -./usr/include - -./usr/include
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
after: after:
- ffmpeg - ffmpeg
- libjxl - mozjpeg