From b083ff91ea3942f644cd3f769a1410344c9fb9c9 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Fri, 8 Aug 2025 09:43:09 +0800 Subject: [PATCH] provisioning: openSUSE-15.6 - fix gstreamer h264 codec installation the gstreamer-1.20-plugin-openh264 package seems to be outdated, as opensuse's openh264 repo seems to have moved to gstreamer-1.24 and renamed the package to gstreamer-plugin-openh264: https://codecs.opensuse.org/openh264/openSUSE_Leap/x86_64/ This partially reverts 69f651b01794c93da20894a7ea5728a332903850. Change-Id: Ie159ec48f83a7b7d10671d2200f7eb4fbcf93db3 Reviewed-by: Lars Sutterud Reviewed-by: Artem Dyomin (cherry picked from commit c52c9ef8b8214c8372715f93a97340c7b2c0c1c2) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2b1b4fdb37cf6f43f32ba4cb30b4ee1e5b3eb0a2) --- .../qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh | 1 + .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh | 1 + .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh index 4dd0314f..550a850c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh @@ -8,5 +8,6 @@ sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/dis sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.5/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/oss/#g" /etc/zypp/repos.d/repo-update.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/codecs.opensuse.org/openh264/openSUSE_Leap/#g" /etc/zypp/repos.d/repo-openh264.repo sudo zypper lr -u diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index a590b50a..69f3b420 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -56,7 +56,7 @@ sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \ - gstreamer-plugins-bad-devel + gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh index 239bfea9..cd66199b 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh @@ -8,5 +8,6 @@ sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/dis sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.6/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.6/oss/#g" /etc/zypp/repos.d/repo-update.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.6/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/codecs.opensuse.org/openh264/openSUSE_Leap/#g" /etc/zypp/repos.d/repo-openh264.repo sudo zypper lr -u diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index 925f27a6..dc2c306d 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -52,7 +52,7 @@ sudo zypper -nq install libxml2-devel libxslt-devel sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) -sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel gstreamer-plugin-openh264 # cups sudo zypper -nq install cups-devel