From 48c1f01655bd32306c9c1995f98527c70f5ec03e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Aug 2024 06:49:18 +0530 Subject: [PATCH] Use statically linked ffmpeg in Linux binary builds --- bypy/linux.conf | 2 +- bypy/sources.json | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bypy/linux.conf b/bypy/linux.conf index 1533be4393..a0fac22a1c 100644 --- a/bypy/linux.conf +++ b/bypy/linux.conf @@ -2,4 +2,4 @@ image 'https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-serve # Build time deps for Qt. See https://doc.qt.io/qt-6/linux-requirements.html and # https://doc.qt.io/qt-6/qtwebengine-platform-notes.html -deps 'flex bison gperf ruby python2 libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-util-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libxkbfile-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa libxcb-xkb-dev libegl1-mesa-dev libxtst-dev libnss3-dev libfreetype6-dev libfontconfig-dev libdrm-dev libxshmfence-dev libcups2-dev libxcb-cursor-dev libgbm-dev libpulse-dev libasound2-dev flite1-dev libspeechd-dev libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev' +deps 'flex bison gperf ruby python2 libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-util-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libxkbfile-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa libxcb-xkb-dev libegl1-mesa-dev libxtst-dev libnss3-dev libfreetype6-dev libfontconfig-dev libdrm-dev libxshmfence-dev libcups2-dev libxcb-cursor-dev libgbm-dev libpulse-dev libasound2-dev flite1-dev libspeechd-dev' diff --git a/bypy/sources.json b/bypy/sources.json index 2f2b755748..1a99550f64 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -506,9 +506,20 @@ } }, + { + "name": "nv-codec-headers", + "comment": "Needed for building Qt Multimedia, see https://code.qt.io/cgit/qt/qt5.git/tree/coin/provisioning/common/unix/install-ffmpeg.sh only change the version when bumping ffmpeg and qt versions.", + "os": "linux", + "unix": { + "filename": "nv-codec-headers-11.1.zip", + "hash": "sha256:d0262edcd464c36eddd35c754faf29799161a30b4f8635a4aa06f9ecedf053e2", + "urls": ["https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/11.1.zip"] + } + }, + { "name": "ffmpeg", - "os": "macos,windows", + "comment": "Needed for building Qt Multimedia. Only change the version when bumping Qt version. Get the needed ffmpeg version from: https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend", "unix": { "filename": "ffmpeg-6.1.2.tar.xz", "hash": "sha256:3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38",