From 60ae3b2339ed71aba27882541ad7fc2a3f13d2ca Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 22 Oct 2020 08:48:51 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/gstreamer1-plugins-bad-free#65b65ae5e44318a1552d35e42ed732f9d8226e40 --- 0001-No-va-test-when-va-disabled.patch | 27 ++++++++++++++++++++++++++ gstreamer1-plugins-bad-free.spec | 11 ++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-No-va-test-when-va-disabled.patch diff --git a/0001-No-va-test-when-va-disabled.patch b/0001-No-va-test-when-va-disabled.patch new file mode 100644 index 0000000..1f1fd9c --- /dev/null +++ b/0001-No-va-test-when-va-disabled.patch @@ -0,0 +1,27 @@ +From 3e57512bea64ae9d231441caae96037a96aef2bf Mon Sep 17 00:00:00 2001 +From: Troy Dawson +Date: Mon, 19 Oct 2020 14:09:32 -0700 +Subject: [PATCH] No va test when va disabled + +--- + tests/examples/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/examples/meson.build b/tests/examples/meson.build +index a41fc16..a73c81d 100644 +--- a/tests/examples/meson.build ++++ b/tests/examples/meson.build +@@ -13,7 +13,9 @@ if not get_option('opencv').disabled() + subdir('opencv', if_found: opencv_dep) + endif + subdir('uvch264') +-subdir('va') ++if not get_option('va').disabled() ++ subdir('va') ++endif + subdir('waylandsink') + subdir('webrtc') + +-- +2.18.4 + diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec index fadcd89..fd92f15 100644 --- a/gstreamer1-plugins-bad-free.spec +++ b/gstreamer1-plugins-bad-free.spec @@ -14,7 +14,7 @@ Name: gstreamer1-plugins-bad-free Version: 1.18.0 -Release: 3%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: 5%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework "bad" plugins License: LGPLv2+ and LGPLv2 @@ -34,6 +34,8 @@ Source1: gst-p-bad-cleanup.sh # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1406 # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1570 Patch0: 0001-examples-only-check-opencv_dep-if-option-is-not-disa.patch +# Fix build failure with va disabled: +Patch1: 0001-No-va-test-when-va-disabled.patch BuildRequires: meson >= 0.48.0 BuildRequires: gcc-c++ @@ -234,6 +236,7 @@ aren't tested well enough, or the code is not of good enough quality. %prep %setup -q -n gst-plugins-bad-%{version} %patch0 -p1 +%patch1 -p1 %build %meson \ @@ -605,6 +608,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout %changelog +* Mon Oct 19 2020 Troy Dawson - 1.18.0-5 +- Do not run va tests when va is disabled + +* Sat Oct 17 2020 Dominik Mierzejewski - 1.18.0-4 +- rebuild for libdvdread-6.1 ABI bump + * Tue Sep 22 2020 Gwyn Ciesla - 1.18.0-3 - Obsolete/Provide gst-transcoder