From 451a7ee729ac9abf677969f7c0fdfb045c63b2f2 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 4 Sep 2025 12:11:58 -0500 Subject: [PATCH] fix(gstreamer1-plugins-bad,gstreamer1-vaapi): Track build deps (#6349) * fix(gstreamer1-plugins-bad,gstreamer1-vaapi): Track build deps * A --- .../LCEVCdec_VERSION.txt | 1 + .../gstreamer1-plugins-bad-lcevcdec4.patch | 35 +++++++++++++++++++ .../gstreamer1-plugins-bad.spec | 6 +++- .../gstreamer1-plugins-bad/update.rhai | 10 ++++-- .../gstreamer1-vaapi/PLUGINS_BAD_release.txt | 1 + .../gstreamer1/gstreamer1-vaapi/update.rhai | 8 +++++ 6 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 anda/multimedia/gstreamer1/gstreamer1-plugins-bad/LCEVCdec_VERSION.txt create mode 100644 anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad-lcevcdec4.patch create mode 100644 anda/multimedia/gstreamer1/gstreamer1-vaapi/PLUGINS_BAD_release.txt diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/LCEVCdec_VERSION.txt b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/LCEVCdec_VERSION.txt new file mode 100644 index 0000000000..1454f6ed4b --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/LCEVCdec_VERSION.txt @@ -0,0 +1 @@ +4.0.1 diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad-lcevcdec4.patch b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad-lcevcdec4.patch new file mode 100644 index 0000000000..a04f9c1c9c --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad-lcevcdec4.patch @@ -0,0 +1,35 @@ +diff --git a/ext/lcevcdecoder/gstlcevcdec.c b/ext/lcevcdecoder/gstlcevcdec.c +index a1af5b11390b..3c9cb2ffdf2b 100644 +--- a/ext/lcevcdecoder/gstlcevcdec.c ++++ b/ext/lcevcdecoder/gstlcevcdec.c +@@ -539,7 +539,7 @@ send_enhancement_data (GstLcevcDec * lcevc, GstBuffer * input_buffer) + } + + if (LCEVC_SendDecoderEnhancementData (lcevc->decoder_handle, +- input_buffer->pts, TRUE, enhancement_info.data, ++ input_buffer->pts, enhancement_info.data, + enhancement_info.size) != LCEVC_Success) { + GST_INFO_OBJECT (lcevc, + "Could not send input buffer %" GST_TIME_FORMAT +@@ -581,7 +581,7 @@ send_base_picture (GstLcevcDec * lcevc, GstBuffer * input_buffer) + goto done; + } + +- if (LCEVC_SendDecoderBase (lcevc->decoder_handle, input_buffer->pts, TRUE, ++ if (LCEVC_SendDecoderBase (lcevc->decoder_handle, input_buffer->pts, + picture_handle, 1000000, NULL) != LCEVC_Success) { + GST_ELEMENT_ERROR (lcevc, STREAM, DECODE, (NULL), + ("Could not send input buffer %" GST_TIME_FORMAT " base picture", +diff --git a/ext/lcevcdecoder/meson.build b/ext/lcevcdecoder/meson.build +index ecc5be034a95..ead6b9e9a361 100644 +--- a/ext/lcevcdecoder/meson.build ++++ b/ext/lcevcdecoder/meson.build +@@ -26,7 +26,7 @@ plugin_sources += { + 'lcevcdecoder': pathsep.join(doc_sources) + } + +-lcevc_dec_dep = dependency ('lcevc_dec', required: get_option('lcevcdecoder')) ++lcevc_dec_dep = dependency ('lcevc_dec', version: '>= 4', required: get_option('lcevcdecoder')) + + if lcevc_dec_dep.found() + gstlcevcdecoder = library('gstlcevcdecoder', diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec index 2f1656f206..86d4c21cbf 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/gstreamer1-plugins-bad.spec @@ -4,7 +4,7 @@ Name: gstreamer1-plugins-bad Version: 1.26.5 -Release: 4%?dist +Release: 5%?dist Epoch: 2 Summary: GStreamer streaming media framework "bad" plugins License: LGPL-2.0-or-later and LGPL-2.0-only @@ -13,6 +13,10 @@ URL: http://gstreamer.freedesktop.org/ Source0: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz Source1: gstreamer-bad.metainfo.xml +# Add support for LCEVCdec 4. Based off: +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/1b041d8114b4de8341926fe1ae62a1d64781970d +Patch0: %{name}-lcevcdec4.patch + # Requires Provides with and without _isa defined due to package dependencies Obsoletes: %{name}-free < %{?epoch}:%{version}-%{release} Provides: %{name}-free = %{?epoch}:%{version}-%{release} diff --git a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai index 5265f08cc8..ca63da16cd 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai +++ b/anda/multimedia/gstreamer1/gstreamer1-plugins-bad/update.rhai @@ -9,5 +9,11 @@ let vr = bump::bodhi_vr("gstreamer1-plugins-bad-free", branch); rpm.version(vr[1]); rpm.release(vr[2]); -let opencv_ver = bump::bodhi("opencv", bodhi_branch); -open_file("anda/multimedia/gstreamer1/gstreamer1-plugins-bad/OPENCV_VERSION.txt", "w").write(opencv_ver); +open_file("anda/multimedia/gstreamer1/gstreamer1-plugins-bad/OPENCV_VERSION.txt", "w").write(bump::bodhi("opencv", bodhi_branch)); +open_file("anda/multimedia/gstreamer1/gstreamer1-plugins-bad/LCEVCdec_VERSION.txt", "w").write(bump::madoguchi("LCEVCdec", labels.branch)); + +let dir = sub(`/[^/]+$`, "", __script_path); +if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 { + let rel = spec::get_release(rpm).parse_int(); + rpm.release(rel + 1); +} diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/PLUGINS_BAD_release.txt b/anda/multimedia/gstreamer1/gstreamer1-vaapi/PLUGINS_BAD_release.txt new file mode 100644 index 0000000000..1204199104 --- /dev/null +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/PLUGINS_BAD_release.txt @@ -0,0 +1 @@ +2.fcrawhide diff --git a/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai index b852f108b2..67c7f347fe 100644 --- a/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai +++ b/anda/multimedia/gstreamer1/gstreamer1-vaapi/update.rhai @@ -3,3 +3,11 @@ import "andax/bump_extras.rhai" as bump; let vr = bump::bodhi_vr("gstreamer1-vaapi", bump::as_bodhi_ver(labels.branch)); rpm.version(vr[1]); rpm.release(vr[2]); + +open_file("anda/multimedia/gstreamer1/gstreamer1-vaapi/PLUGINS_BAD_release.txt", "w").write(bump::madoguchi_json("gstreamer1-plugins-bad", labels.branch).rel); + +let dir = sub(`/[^/]+$`, "", __script_path); +if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 { + let rel = spec::get_release(rpm).parse_int(); + rpm.release(rel + 1); +}