From efd1d5162d75144c450e9e89a47765a560926bae Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:49:48 -0800 Subject: [PATCH] [f43] chore: Move packages to multimedia repo (#7417) (#7437) * chore: Move packages to multimedia repo (#7316) * chore: Move packages to multimedia repo * chore: Add Multimedia repo to builds of packages that need it * chore: openh264 * chore: Add multimedia repo to a couple more packages that need it --------- * chore: Rawhide > $releasever --------- (cherry picked from commit 264901b33329f167b110067f71b55dbdb6cc2c0b) Signed-off-by: Gilver Co-authored-by: Gilver --- anda/lib/fdk-aac/anda.hcl | 2 +- anda/lib/libde265/anda.hcl | 2 ++ anda/lib/libfreeaptx/anda.hcl | 1 + anda/lib/openh264/anda.hcl | 2 +- anda/lib/rtmpdump/anda.hcl | 3 ++- anda/multimedia/ffmpeg/anda.hcl | 4 ++-- anda/multimedia/gstreamer1/gstreamer1-plugin-libav/anda.hcl | 3 ++- anda/multimedia/gstreamer1/gstreamer1-plugins-bad/anda.hcl | 3 ++- anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/anda.hcl | 3 ++- anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl | 3 ++- anda/multimedia/kvazaar/anda.hcl | 2 +- anda/multimedia/lcevcdec/anda.hcl | 2 ++ anda/multimedia/mjpegtools/anda.hcl | 1 + anda/multimedia/uavs3d/anda.hcl | 3 ++- anda/multimedia/vvdec/anda.hcl | 1 + anda/multimedia/vvenc/anda.hcl | 1 + anda/multimedia/x264-bootstrap/anda.hcl | 3 ++- anda/multimedia/x264/anda.hcl | 3 ++- anda/multimedia/x265/anda.hcl | 3 ++- anda/multimedia/xevd/anda.hcl | 2 ++ anda/multimedia/xeve/anda.hcl | 2 ++ 21 files changed, 35 insertions(+), 14 deletions(-) diff --git a/anda/lib/fdk-aac/anda.hcl b/anda/lib/fdk-aac/anda.hcl index 06dac1bc18..27b2e29124 100644 --- a/anda/lib/fdk-aac/anda.hcl +++ b/anda/lib/fdk-aac/anda.hcl @@ -3,7 +3,7 @@ project pkg { spec = "fdk-aac.spec" } labels { - subrepo = "extras" + subrepo = "multimedia" weekly = 1 } } diff --git a/anda/lib/libde265/anda.hcl b/anda/lib/libde265/anda.hcl index cc0f1db0fd..165afe78dc 100644 --- a/anda/lib/libde265/anda.hcl +++ b/anda/lib/libde265/anda.hcl @@ -2,8 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "libde265.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/lib/libfreeaptx/anda.hcl b/anda/lib/libfreeaptx/anda.hcl index bac6cc9f1b..1c0f5d7f4e 100644 --- a/anda/lib/libfreeaptx/anda.hcl +++ b/anda/lib/libfreeaptx/anda.hcl @@ -6,5 +6,6 @@ project pkg { labels { weekly = 1 mock = 1 + subrepo = "multimedia" } } diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl index 825d3a7615..ddde4a35c1 100644 --- a/anda/lib/openh264/anda.hcl +++ b/anda/lib/openh264/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "openh264.spec" } labels { - subrepo = "extras" + subrepo = "multimedia" } } diff --git a/anda/lib/rtmpdump/anda.hcl b/anda/lib/rtmpdump/anda.hcl index 8a4c8ba8c6..6deeb7f0d2 100644 --- a/anda/lib/rtmpdump/anda.hcl +++ b/anda/lib/rtmpdump/anda.hcl @@ -4,6 +4,7 @@ project pkg { spec = "rtmpdump.spec" } labels { - mock =1 + mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/ffmpeg/anda.hcl b/anda/multimedia/ffmpeg/anda.hcl index 84fa2ba693..523cae0329 100644 --- a/anda/multimedia/ffmpeg/anda.hcl +++ b/anda/multimedia/ffmpeg/anda.hcl @@ -2,11 +2,11 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "ffmpeg.spec" - extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-nvidia"] + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-nvidia", "https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { updbranch = 1 mock = 1 - subrepo = "extras" + subrepo = "multimedia" } } diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/anda.hcl index f6d20ce1a6..380de641ba 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/anda.hcl +++ b/anda/multimedia/gstreamer1/gstreamer1-plugin-libav/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gstreamer1-plugin-libav.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { - subrepo = "extras" + subrepo = "multimedia" mock = 1 updbranch = 1 } diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/anda.hcl index e031b556e2..6893a2c35e 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/anda.hcl +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gstreamer1-plugins-bad.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { - subrepo = "extras" + subrepo = "multimedia" mock = 1 updbranch = 1 } diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/anda.hcl index 5ef2660d6e..1a1c4236d3 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/anda.hcl +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-ugly/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gstreamer1-plugins-ugly.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { - subrepo = "extras" + subrepo = "multimedia" mock = 1 updbranch = 1 } diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl index b3231c6cd4..d702910072 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gstreamer1-vaapi.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { - subrepo = "extras" + subrepo = "multimedia" mock = 1 updbranch = 1 } diff --git a/anda/multimedia/kvazaar/anda.hcl b/anda/multimedia/kvazaar/anda.hcl index 9001334d1b..e791705fc8 100644 --- a/anda/multimedia/kvazaar/anda.hcl +++ b/anda/multimedia/kvazaar/anda.hcl @@ -4,6 +4,6 @@ project pkg { spec = "kvazaar.spec" } labels { - mock =1 + mock = 1 } } diff --git a/anda/multimedia/lcevcdec/anda.hcl b/anda/multimedia/lcevcdec/anda.hcl index fc1d38512a..e5873b95fa 100644 --- a/anda/multimedia/lcevcdec/anda.hcl +++ b/anda/multimedia/lcevcdec/anda.hcl @@ -2,8 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "LCEVCdec.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/mjpegtools/anda.hcl b/anda/multimedia/mjpegtools/anda.hcl index 4660da642e..e851cc292a 100644 --- a/anda/multimedia/mjpegtools/anda.hcl +++ b/anda/multimedia/mjpegtools/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/uavs3d/anda.hcl b/anda/multimedia/uavs3d/anda.hcl index e74e92e8fc..6edbc27184 100644 --- a/anda/multimedia/uavs3d/anda.hcl +++ b/anda/multimedia/uavs3d/anda.hcl @@ -4,6 +4,7 @@ project pkg { spec = "uavs3d.spec" } labels { - mock =1 + mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/vvdec/anda.hcl b/anda/multimedia/vvdec/anda.hcl index 9f202d5576..0da4bcd8a0 100644 --- a/anda/multimedia/vvdec/anda.hcl +++ b/anda/multimedia/vvdec/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/vvenc/anda.hcl b/anda/multimedia/vvenc/anda.hcl index ccbfbd4469..ea5a6e16d2 100644 --- a/anda/multimedia/vvenc/anda.hcl +++ b/anda/multimedia/vvenc/anda.hcl @@ -5,5 +5,6 @@ project pkg { } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/x264-bootstrap/anda.hcl b/anda/multimedia/x264-bootstrap/anda.hcl index decba3bc73..994df93f69 100644 --- a/anda/multimedia/x264-bootstrap/anda.hcl +++ b/anda/multimedia/x264-bootstrap/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "x264-bootstrap.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 - subrepo = "extras" + subrepo = "multimedia" } } diff --git a/anda/multimedia/x264/anda.hcl b/anda/multimedia/x264/anda.hcl index cda0c50dc7..6b22aeb238 100644 --- a/anda/multimedia/x264/anda.hcl +++ b/anda/multimedia/x264/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "x264.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 - subrepo = "extras" + subrepo = "multimedia" } } diff --git a/anda/multimedia/x265/anda.hcl b/anda/multimedia/x265/anda.hcl index a995e9638d..44cdf3332d 100644 --- a/anda/multimedia/x265/anda.hcl +++ b/anda/multimedia/x265/anda.hcl @@ -2,9 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "x265.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 - subrepo = "extras" + subrepo = "multimedia" } } diff --git a/anda/multimedia/xevd/anda.hcl b/anda/multimedia/xevd/anda.hcl index ed33aba013..561da72fd3 100644 --- a/anda/multimedia/xevd/anda.hcl +++ b/anda/multimedia/xevd/anda.hcl @@ -2,8 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "xevd.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 + subrepo = "multimedia" } } diff --git a/anda/multimedia/xeve/anda.hcl b/anda/multimedia/xeve/anda.hcl index ed448b2fce..a2d63adcd4 100644 --- a/anda/multimedia/xeve/anda.hcl +++ b/anda/multimedia/xeve/anda.hcl @@ -2,8 +2,10 @@ project pkg { arches = ["x86_64", "aarch64", "i386"] rpm { spec = "xeve.spec" + extra_repos = ["https://repos.fyralabs.com/terra\\$releasever-multimedia"] } labels { mock = 1 + subrepo = "multimedia" } }