Revert "Self-build openh264 in snap for lesser package size"

This reverts commit a8430d8ecf.
This commit is contained in:
Ilya Fedin
2025-09-01 01:09:50 +04:00
committed by John Preston
parent e6665a8305
commit 09fb42291d

View File

@@ -99,11 +99,13 @@ parts:
plugin: nil plugin: nil
stage-packages: stage-packages:
- libgeoclue-2-0 - libgeoclue-2-0
- libopenh264-7
- libxcb-cursor0 - libxcb-cursor0
- libxcb-record0 - libxcb-record0
- libxcb-screensaver0 - libxcb-screensaver0
stage: stage:
- ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so* - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
- ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
- ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so* - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*
- ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so* - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so*
- ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so* - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so*
@@ -157,6 +159,7 @@ parts:
build-packages: build-packages:
- nasm - nasm
- libdav1d-dev - libdav1d-dev
- libopenh264-dev
- libopus-dev - libopus-dev
- libvdpau-dev - libvdpau-dev
- libvpx-dev - libvpx-dev
@@ -166,7 +169,6 @@ parts:
- --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" - --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
- --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" - --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
- --extra-ldflags="-Wl,--push-state,--no-as-needed,-lstdc++,--pop-state"
- --disable-debug - --disable-debug
- --disable-programs - --disable-programs
- --disable-doc - --disable-doc
@@ -305,7 +307,6 @@ parts:
prime: [-./*] prime: [-./*]
after: after:
- nv-codec-headers - nv-codec-headers
- openh264
jpegli: jpegli:
source: https://github.com/libjxl/libjxl.git source: https://github.com/libjxl/libjxl.git
@@ -374,19 +375,6 @@ parts:
- LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR - LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
prime: [-./*] prime: [-./*]
openh264:
source: https://github.com/cisco/openh264.git
source-depth: 1
source-tag: v2.6.0
plugin: meson
build-packages:
- meson
meson-parameters:
- --prefix=/usr
- --buildtype=release
- --default-library=static
prime: [-./*]
protobuf: protobuf:
source: https://github.com/protocolbuffers/protobuf.git source: https://github.com/protocolbuffers/protobuf.git
source-depth: 1 source-depth: 1
@@ -490,6 +478,7 @@ parts:
source-commit: 62321fd7128ab2650b459d4195781af8185e46b5 source-commit: 62321fd7128ab2650b459d4195781af8185e46b5
plugin: cmake plugin: cmake
build-packages: build-packages:
- libopenh264-dev
- libopus-dev - libopus-dev
- libpipewire-0.3-dev - libpipewire-0.3-dev
- libssl-dev - libssl-dev
@@ -502,4 +491,3 @@ parts:
after: after:
- ffmpeg - ffmpeg
- jpegli - jpegli
- openh264