No va test when va disabled

This commit is contained in:
Troy Dawson 2020-10-19 14:29:14 -07:00
parent f4c41ea0a5
commit 65b65ae5e4
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From 3e57512bea64ae9d231441caae96037a96aef2bf Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
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

View File

@ -14,7 +14,7 @@
Name: gstreamer1-plugins-bad-free
Version: 1.18.0
Release: 4%{?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,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
%changelog
* Mon Oct 19 2020 Troy Dawson <tdawson@redhat.com> - 1.18.0-5
- Do not run va tests when va is disabled
* Sat Oct 17 2020 Dominik Mierzejewski <rpm@greysector.net> - 1.18.0-4
- rebuild for libdvdread-6.1 ABI bump