diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46eaeb5..1cec2e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ env: REGISTRY: ghcr.io IMAGE_NAME: kinoite # When updating this value, remember to also update the webhook - UPSTREAM_VERSION: 43 + UPSTREAM_VERSION: 44 jobs: wait-for-new-upstream-image: diff --git a/build.sh b/build.sh index 767b69c..2a81bdc 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -euo pipefail -UPSTREAM_IMAGE=quay.io/fedora-ostree-desktops/kinoite:43 +UPSTREAM_IMAGE=quay.io/fedora-ostree-desktops/kinoite:44 PACKAGES_READ_TOKEN=$(cat ~/.git-credentials | sed 's;.*:\(.*\)@.*;\1;') TARGET=${1:-surface} diff --git a/setup/steps/4-packages.sh b/setup/steps/4-packages.sh index 95742cc..115edb8 100755 --- a/setup/steps/4-packages.sh +++ b/setup/steps/4-packages.sh @@ -26,13 +26,21 @@ pkgs+=( podman-compose ) -# Intel GPU +# Intel GPU, see https://rpmfusion.org/Howto/Multimedia if [ "${VARIANT}" == "julia" ] || [ "${VARIANT}" == "surface" ]; then pkgs+=( intel-media-driver ) fi +# AMD GPU, see https://rpmfusion.org/Howto/Multimedia +# mesa-vdpau-drivers-freeworld does not exist after fedora 43 +if [ "${VARIANT}" == "opa" ]; then + pkgs+=( + mesa-va-drivers-freeworld + ) +fi + # KDE apps that don't work as flatpaks if [ "${VARIANT}" == "julia" ]; then pkgs+=( @@ -62,8 +70,6 @@ if [ "${VARIANT}" == "julia" ]; then dnf -y install --setopt=install_weak_deps=False wine fi -# AMD GPU -if [ "${VARIANT}" == "opa" ]; then - dnf swap -y mesa-va-drivers mesa-va-drivers-freeworld - dnf swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld -fi +# Full ffmpeg and multimedia group for complete codec support, see https://rpmfusion.org/Howto/Multimedia +dnf swap -y ffmpeg-free ffmpeg --allowerasing +dnf -y --setopt=optional_metadata_types=comps install @multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin --allowerasing