From b3b15764acefa2580285446f9f3b2fa15d7e25fd Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sun, 27 Oct 2024 13:54:58 +0200 Subject: [PATCH] ci: Add more explicit deps into fedora/deps.txt And use the pkgconfig() syntax to install things based on the .pc file rather than the package name. Current list generated from meson introspect --dependencies Part-of: --- .gitlab-image-tags.yml | 2 +- ci/docker/fedora/deps.txt | 220 +++++++++++++++++++++++++++++--------- 2 files changed, 170 insertions(+), 52 deletions(-) diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml index 2f13494938..469879fda4 100644 --- a/.gitlab-image-tags.yml +++ b/.gitlab-image-tags.yml @@ -5,7 +5,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2024-10-27.3' + FEDORA_TAG: '2024-10-27.4' DEBIAN_TAG: '2024-10-27.0' diff --git a/ci/docker/fedora/deps.txt b/ci/docker/fedora/deps.txt index d766250055..749f41eaa6 100644 --- a/ci/docker/fedora/deps.txt +++ b/ci/docker/fedora/deps.txt @@ -1,5 +1,4 @@ aalib-devel -aom bat bison busybox @@ -14,15 +13,11 @@ dnf-plugins-core elfutils elfutils-devel faac-devel -fdk-aac -fdk-aac-devel ffmpeg ffmpeg-devel ffmpeg-libs flex flite-devel -fluidsynth -fluidsynth-devel gcc gcc-c++ gdb @@ -30,32 +25,15 @@ git-core git-lfs glslc gpac-devel -graphene-devel gsl-devel gssdp-devel gtest-devel gtk-doc -gtk3-devel -gtk4-devel gupnp-devel gupnp-igd-devel intel-mediasdk-devel iproute -json-glib-devel -libaom-devel -libcaca-devel -libcurl-devel -libdav1d-devel -libdrm-devel libnice-devel -libsodium-devel -libsoup-devel -libunwind-devel -libva-devel -libxcb-devel -libxkbcommon-devel -libxkbcommon-x11-devel -libxml2-devel libxslt-devel libyaml-devel llvm-devel @@ -70,21 +48,13 @@ mesa-libGLU-devel mesa-libOpenCL-devel mesa-libOSMesa-devel mesa-vulkan-drivers -mono-devel nasm -neon-devel ninja-build npm nunit -opencv-devel openjpeg2-devel patch procps-ng -python3 -python3-cairo -python3-cairo-devel -python3-devel -python3-gobject python3-pip python3-wheel qemu-system-x86 @@ -100,7 +70,6 @@ qt5-qtx11extras-devel qt6-doctools qt6-linguist qt6-qtbase-devel -qt6-qtbase-gui qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtmultimedia-devel @@ -109,27 +78,176 @@ qt6-qtshadertools qt6-qttools qt6-qtwayland-devel redhat-rpm-config -sbc-devel -SDL2-devel -srt-devel -srt-libs -svt-av1 -svt-av1-devel -svt-hevc -svt-hevc-devel -svt-hevc-libs -svt-hevc-libs -svt-vp9 -svt-vp9-devel -svt-vp9-libs +soundtouch-devel +subunit-devel systemd-udev -valgrind -valgrind-devel -vulkan-devel vulkan-loader -x264 -x264-devel -x264-devel -x265 xorg-x11-server-Xvfb xset + +pkgconfig(alsa) +pkgconfig(aom) +pkgconfig(atk) +pkgconfig(avtp) +pkgconfig(bash-completion) +pkgconfig(bluez) +pkgconfig(caca) +pkgconfig(cairo-gobject) +pkgconfig(cairo-png) +pkgconfig(cairo) +pkgconfig(cdparanoia-3) +pkgconfig(dav1d) +pkgconfig(dvdnav) +pkgconfig(dvdread) +pkgconfig(egl) +pkgconfig(fdk-aac) +pkgconfig(flac) +pkgconfig(fluidsynth) +pkgconfig(gbm) +pkgconfig(gdk-3.0) +pkgconfig(gdk-pixbuf-2.0) +pkgconfig(gdk-x11-3.0) +pkgconfig(gio-2.0) +pkgconfig(gio-unix-2.0) +pkgconfig(gl) +pkgconfig(glesv2) +pkgconfig(glib-2.0) +pkgconfig(glx) +pkgconfig(gmodule-2.0) +pkgconfig(gmodule-export-2.0) +pkgconfig(gmodule-no-export-2.0) +pkgconfig(gnutls) +pkgconfig(gobject-2.0) +pkgconfig(gobject-introspection-1.0) +pkgconfig(graphene-gobject-1.0) +pkgconfig(gthread-2.0) +pkgconfig(gtk+-3.0) +pkgconfig(gtk+-wayland-3.0) +pkgconfig(gtk+-x11-3.0) +pkgconfig(gtk4) +pkgconfig(gudev-1.0) +pkgconfig(iso-codes) +pkgconfig(jack) +pkgconfig(json-glib-1.0) +pkgconfig(lc3) +pkgconfig(lcms2) +pkgconfig(ldacBT-enc) +pkgconfig(libass) +pkgconfig(libavc1394) +pkgconfig(libavcodec) +pkgconfig(libavfilter) +pkgconfig(libavformat) +pkgconfig(libavutil) +pkgconfig(libbs2b) +pkgconfig(libcap) +pkgconfig(libcdio) +pkgconfig(libchromaprint) +pkgconfig(libcrypto) +pkgconfig(libcurl) +pkgconfig(libdca) +pkgconfig(libde265) +pkgconfig(libdrm) +pkgconfig(libdv) +pkgconfig(libdw) +pkgconfig(libexif) +pkgconfig(libffi) +pkgconfig(libiec61883) +pkgconfig(libjpeg) +pkgconfig(libmfx) +pkgconfig(libmodplug) +pkgconfig(libmpeg2) +pkgconfig(libmpg123) +pkgconfig(libopenjp2) +pkgconfig(libopenmpt) +pkgconfig(libpng) +pkgconfig(libpulse) +pkgconfig(libqrencode) +pkgconfig(libraw1394) +pkgconfig(librsvg-2.0) +pkgconfig(librtmp) +pkgconfig(libsodium) +pkgconfig(libsoup-2.4) +pkgconfig(libsoup-3.0) +pkgconfig(libsrtp2) +pkgconfig(libssh2) +pkgconfig(libudev) +pkgconfig(libunwind) +pkgconfig(libusb-1.0) +pkgconfig(libv4l2) +pkgconfig(libva-drm) +pkgconfig(libva-wayland) +pkgconfig(libva-x11) +pkgconfig(libva) +pkgconfig(libvisual-0.4) +pkgconfig(libwebp) +pkgconfig(libwebpdemux) +pkgconfig(libwebpmux) +pkgconfig(libxml-2.0) +pkgconfig(lilv-0) +pkgconfig(lrdf) +pkgconfig(microdns) +pkgconfig(mjpegtools) +pkgconfig(mono) +pkgconfig(neon) +pkgconfig(nettle) +pkgconfig(ogg) +pkgconfig(openal) +pkgconfig(opencv4) +pkgconfig(OpenEXR) +pkgconfig(opengl) +pkgconfig(openh264) +pkgconfig(openssl) +pkgconfig(opus) +pkgconfig(pango) +pkgconfig(pangocairo) +pkgconfig(py3cairo) +pkgconfig(pygobject-3.0) +pkgconfig(python-3.12-embed) +pkgconfig(python-3.12) +pkgconfig(Qt5Core) +pkgconfig(Qt6Core) +pkgconfig(sbc) +pkgconfig(sdl2) +pkgconfig(shout) +pkgconfig(sndfile) +pkgconfig(spandsp) +pkgconfig(speex) +pkgconfig(srt) +pkgconfig(SvtAv1Dec) +pkgconfig(SvtAv1Enc) +pkgconfig(SvtHevcEnc) +pkgconfig(SvtVp9Enc) +pkgconfig(taglib) +pkgconfig(theoradec) +pkgconfig(theoraenc) +pkgconfig(twolame) +pkgconfig(valgrind) +pkgconfig(vo-amrwbenc) +pkgconfig(vorbis) +pkgconfig(vorbisenc) +pkgconfig(vpx) +pkgconfig(vulkan) +pkgconfig(wavpack) +pkgconfig(wayland-client) +pkgconfig(wayland-cursor) +pkgconfig(wayland-egl) +pkgconfig(wayland-protocols) +pkgconfig(webrtc-audio-coding-1) +pkgconfig(webrtc-audio-processing-1) +pkgconfig(x11-xcb) +pkgconfig(x11) +pkgconfig(x264) +pkgconfig(x265) +pkgconfig(xcb) +pkgconfig(xdamage) +pkgconfig(xext) +pkgconfig(xfixes) +pkgconfig(xi) +pkgconfig(xkbcommon-x11) +pkgconfig(xkbcommon) +pkgconfig(xrandr) +pkgconfig(xtst) +pkgconfig(xv) +pkgconfig(zbar) +pkgconfig(zlib) +pkgconfig(zvbi-0.2)