Use new tg_owt installation support in snap

This commit is contained in:
Ilya Fedin 2020-10-30 13:23:28 +04:00 committed by John Preston
parent 943593526f
commit 02818a8251

View file

@ -67,8 +67,6 @@ parts:
source: . source: .
source-type: git source-type: git
parse-info: [usr/share/metainfo/telegram-desktop_telegram-desktop.appdata.xml] parse-info: [usr/share/metainfo/telegram-desktop_telegram-desktop.appdata.xml]
build-environment:
- tg_owt_DIR: $SNAPCRAFT_STAGE/tg_owt
build-packages: build-packages:
- python - python
- qtbase5-private-dev - qtbase5-private-dev
@ -268,16 +266,11 @@ parts:
stage-packages: stage-packages:
- libopus0 - libopus0
- libssl1.1 - libssl1.1
override-build: | cmake-parameters:
cmake "$SNAPCRAFT_PART_SRC" \ - -DCMAKE_BUILD_TYPE=Release
-DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr
-DJPEG_LIBRARY_RELEASE="$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so" \ - -DJPEG_LIBRARY_RELEASE=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so
-DJPEG_INCLUDE_DIR="$SNAPCRAFT_STAGE/usr/include" - -DJPEG_INCLUDE_DIR=$SNAPCRAFT_STAGE/usr/include
cmake --build . -- -j$(nproc)
cp -a . "$SNAPCRAFT_PART_INSTALL"
organize:
"*": tg_owt/
prime: [-./*] prime: [-./*]
after: after:
- ffmpeg - ffmpeg