From 3ee798bef1728e248ed42f2549f1e942422b1892 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Wed, 15 Jun 2022 09:23:11 -0400 Subject: [PATCH] fixup conditionals to be less obtuse --- chromium.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/chromium.spec b/chromium.spec index 9f7289ac..90881e8d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -47,18 +47,16 @@ %endif # We'd like to always have this on... +%global use_vaapi 1 # ... but the libva in EL7 (and EL8) is too old. -# ... and EL9 doesn't ship libva-devel on aarch64? %if 0%{?rhel} == 7 || 0%{?rhel} == 8 %global use_vaapi 0 -%else -%if 0%{?rhel} == 9 -%ifarch aarch64 -%global use_vaapi 0 -%endif -%else -%global use_vaapi 1 %endif +# ... and EL9 doesn't ship libva-devel on aarch64? +%if 0%{?rhel} == 9 + %ifarch aarch64 + %global use_vaapi 0 + %endif %endif # Seems like we might need this sometimes @@ -546,7 +544,7 @@ BuildRequires: libudev-devel Requires: libusbx >= 1.0.21-0.1.git448584a BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a %endif -%if 0%{?use_vaapi} +%if 0%{use_vaapi} BuildRequires: libva-devel %endif # We don't use libvpx anymore because Chromium loves to