rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

drop vulkan support on s390x (#1902449)

Browse Source
This commit is contained in:
Rex Dieter 2020-11-29 01:14:45 -06:00
parent ab8ab2c460
commit c3b686ca07
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt5-qtbase.spec
View File

@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt5-qtbase Name: qt5-qtbase
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Version: 5.15.2 Version: 5.15.2
Release: 3%{?dist} Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -176,7 +176,10 @@ BuildRequires: pkgconfig(xcb-util)
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xkeyboard-config)
%ifnarch s390x
%global vulkan 1
BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(vulkan)
%endif
%if 0%{?fedora} || 0%{?rhel} > 6 %if 0%{?fedora} || 0%{?rhel} > 6
%global egl 1 %global egl 1
BuildRequires: libEGL-devel BuildRequires: libEGL-devel
@ -264,7 +267,9 @@ Requires: %{name}-gui%{?_isa}
Requires: libEGL-devel Requires: libEGL-devel
%endif %endif
Requires: pkgconfig(gl) Requires: pkgconfig(gl)
%if 0%{?vulkan}
Requires: pkgconfig(vulkan) Requires: pkgconfig(vulkan)
%endif
Requires: qt5-rpm-macros Requires: qt5-rpm-macros
%if 0%{?use_clang} %if 0%{?use_clang}
Requires: clang >= 3.7.0 Requires: clang >= 3.7.0
@ -1046,6 +1051,9 @@ fi
%changelog %changelog
* Sun Nov 29 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.15.2-4
- drop vulkan support on s390x (#1902449)
* Fri Nov 27 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3 * Fri Nov 27 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-3
- Require qt-settings only in Fedora builds - Require qt-settings only in Fedora builds