products/SLFO
SHA256
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request '_config: Adapt for ffmpeg-7.' (#68) from gleidi/SLFO_main:ffmpeg-7 into main

Browse Source 
Reviewed-on: https://src.suse.de/products/SLFO/pulls/68
Reviewed-by: Libor Miksik <libor.miksik@suse.com>
Reviewed-by: Ruediger Oertel <ro@suse.com>
This commit is contained in:
Ruediger Oertel 2025-01-10 10:35:02 +01:00
commit 1d580b45d1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_config
View File

@ -359,15 +359,15 @@ Substitute: kiwi-packagemanager:instsource product-builder-plugin-ALP
Substitute: system-packages:kiwi-product product-builder
# allow builds using docker tool
Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
Substitute: build-packages:docker !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
# FIXME re-add the pattern later patterns-base-fips
# Podman based image building
Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
Substitute: build-packages:kiwi !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
# FIXME re-add the pattern later patterns-base-fips
# To build ISO images
Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
Substitute: build-packages:iso !cmake-mini !dummy-release !gettext-runtime-mini !gettext-tools-mini !ghostscript-mini !ffmpeg-5-mini-libs !ffmpeg-6-mini-libs !ffmpeg-7-mini-libs !gio-branding-upstream !krb5-mini !krb5-mini-devel !libsystemd0-mini !systemd-mini-container !libudev-mini-devel !libudev-mini1 !libuna-mini-devel !libuna1-mini !libunbound-devel-mini !log4j12-mini !postgresql15-devel-mini !systemd-mini !systemd-mini-devel !systemd-mini-sysvinit !udev-mini !libpxbackend-1_0-mini !libgarcon-branding-upstream
# create conflicts for packages installed into the target image
Substitute: kiwi python3-kiwi
@ -1059,6 +1059,8 @@ Ignore: ffmpeg-5-mini-devel:this-is-only-for-build-envs
Ignore: ffmpeg-5-mini-libs:this-is-only-for-build-envs
Ignore: ffmpeg-6-mini-devel:this-is-only-for-build-envs
Ignore: ffmpeg-6-mini-libs:this-is-only-for-build-envs
Ignore: ffmpeg-7-mini-devel:this-is-only-for-build-envs
Ignore: ffmpeg-7-mini-libs:this-is-only-for-build-envs
Ignore: ghc-bootstrap-helpers:this-is-only-for-build-envs
Ignore: ghc-bootstrap:this-is-only-for-build-envs
Ignore: ghostscript-mini:this-is-only-for-build-envs
@ -1776,8 +1778,8 @@ Prefer: -unzip-rcc
Prefer: -primus -primus-32bit
Prefer: -staging-build-key
Prefer: -clutter-gst-devel
# We have multiple versions of ffmpeg available, the preferred one is ffmpeg5, followd by 4, followed by 3
%define ffmpeg_pref ffmpeg-5
# We have multiple versions of ffmpeg available, the preferred one is ffmpeg7, followd by 4, followed by 3
%define ffmpeg_pref ffmpeg-7
Prefer: %{ffmpeg_pref}-mini-libs
Prefer: %{ffmpeg_pref}-mini-devel
Prefer: %{ffmpeg_pref} %{ffmpeg_pref}-libavcodec-devel %{ffmpeg_pref}-libavformat-devel %{ffmpeg_pref}-libavutil-devel %{ffmpeg_pref}-libswscale-devel %{ffmpeg_pref}-libavdevice-devel %{ffmpeg_pref}-libavfilter-devel
@ -2214,6 +2216,8 @@ BuildFlags: onlybuild:ffmpeg-5
BuildFlags: onlybuild:ffmpeg-5:ffmpeg-5-mini
BuildFlags: onlybuild:ffmpeg-6
BuildFlags: onlybuild:ffmpeg-6:ffmpeg-6-mini
BuildFlags: onlybuild:ffmpeg-7
BuildFlags: onlybuild:ffmpeg-7:ffmpeg-7-mini
BuildFlags: onlybuild:ffnvcodec
BuildFlags: onlybuild:fftw3:standard
BuildFlags: onlybuild:file