From 693191364e7e84700a2fb9e97c5297259775d10399b5bc9bd2bd094fcfb48765 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 12 Dec 2018 15:38:41 +0000 Subject: [PATCH] Accepting request 657598 from home:dimstar:cycle - Only BuildRequire pkgconfig(vdpau) and pass --enable-vdpau to configure when building the drivers. Helps us break a build cycle. - Only BuildRequire pkgconfig(vdpau) and pass --enable-vdpau to configure when building the drivers. Helps us break a build cycle. OBS-URL: https://build.opensuse.org/request/show/657598 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=795 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 4 ++++ Mesa.changes | 7 +++++++ Mesa.spec | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 077b6e4..428a67c 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 12 15:29:53 UTC 2018 - Dominique Leuenberger + +- Only BuildRequire pkgconfig(vdpau) and pass --enable-vdpau to + configure when building the drivers. Helps us break a build + cycle. + ------------------------------------------------------------------- Wed Dec 12 11:00:56 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 829eaf0..11266e0 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -168,7 +168,9 @@ BuildRequires: pkgconfig(libglvnd) >= 0.1.0 BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(presentproto) +%if %{drivers} BuildRequires: pkgconfig(vdpau) >= 1.1 +%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-dri2) @@ -800,7 +802,9 @@ export PYTHON2=%{_bindir}/python3 --enable-llvm \ --enable-llvm-shared-libs \ %endif +%if %{drivers} --enable-vdpau \ +%endif --enable-va \ --enable-xvmc \ %if 0%{with_vulkan} diff --git a/Mesa.changes b/Mesa.changes index 077b6e4..428a67c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 12 15:29:53 UTC 2018 - Dominique Leuenberger + +- Only BuildRequire pkgconfig(vdpau) and pass --enable-vdpau to + configure when building the drivers. Helps us break a build + cycle. + ------------------------------------------------------------------- Wed Dec 12 11:00:56 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index bc3164e..e5596cd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -167,7 +167,9 @@ BuildRequires: pkgconfig(libglvnd) >= 0.1.0 BuildRequires: pkgconfig(libkms) >= 1.0.0 BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(presentproto) +%if %{drivers} BuildRequires: pkgconfig(vdpau) >= 1.1 +%endif BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-dri2) @@ -799,7 +801,9 @@ export PYTHON2=%{_bindir}/python3 --enable-llvm \ --enable-llvm-shared-libs \ %endif +%if %{drivers} --enable-vdpau \ +%endif --enable-va \ --enable-xvmc \ %if 0%{with_vulkan}