-
Notifications
You must be signed in to change notification settings - Fork 1
/
0001-SPEC-adjusted-to-build-on-armv5.patch
94 lines (85 loc) · 2.92 KB
/
0001-SPEC-adjusted-to-build-on-armv5.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
From 5189dee29aa86888874f7bbf2f7c313abfb06126 Mon Sep 17 00:00:00 2001
From: Jacco Ligthart <jacco@redsleeve.org>
Date: Sat, 2 Feb 2019 14:11:49 +0100
Subject: [PATCH] SPEC adjusted to build on armv5
---
SPECS/mesa.spec | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 40c88d9..4e3eab4 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -7,7 +7,7 @@
%define with_vdpau 1
%define with_wayland 1
-%ifnarch ppc
+%ifnarch ppc %{arm}
%define with_radeonsi 1
%endif
@@ -61,7 +61,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 18.0.5
-Release: 4%{?dist}
+Release: 4%{?dist}.redsleeve.1
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -116,7 +116,8 @@ BuildRequires: python-mako
BuildRequires: gettext
%if 0%{?with_llvm}
%if 0%{?with_private_llvm}
-BuildRequires: llvm-private-devel >= 6.0
+#BuildRequires: llvm-private-devel >= 6.0
+BuildRequires: mesa-private-llvm-devel
%else
BuildRequires: llvm-devel >= 3.0
%endif
@@ -341,8 +342,8 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
%patch21 -p1 -b .glpc
%if 0%{with_private_llvm}
-sed -i 's/\[llvm-config\]/\[llvm-private-config-%{__isa_bits}\]/g' configure.ac
-sed -i 's/`$LLVM_CONFIG --version`/$LLVM_VERSION_MAJOR.$LLVM_VERSION_MINOR-rhel/' configure.ac
+sed -i 's/\[llvm-config\]/\[mesa-private-llvm-config-%{__isa_bits}\]/g' configure.ac
+sed -i 's/`$LLVM_CONFIG --version`/$LLVM_VERSION_MAJOR.$LLVM_VERSION_MINOR-mesa/' configure.ac
%endif
# need to use libdrm_nouveau2 on F17
@@ -394,7 +395,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-rtti -fno-exceptions"
--enable-dri \
%if %{with_hardware}
%{?with_vmware:--enable-xa} \
- --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,r300,}%{?with_freedreno:freedreno,}nouveau,virgl \
+ --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r300,}%{?with_freedreno:freedreno,}nouveau,virgl \
%else
--with-gallium-drivers=%{?with_llvm:swrast} \
%endif
@@ -514,7 +515,7 @@ rm -rf $RPM_BUILD_ROOT
%endif
%if 0%{?with_llvm}
%{_libdir}/dri/r300_dri.so
-%{_libdir}/dri/r600_dri.so
+#%{_libdir}/dri/r600_dri.so
%if 0%{?with_radeonsi}
%{_libdir}/dri/radeonsi_dri.so
%endif
@@ -548,8 +549,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/vdpau/libvdpau_nouveau.so.1*
%if 0%{?with_llvm}
-%{_libdir}/vdpau/libvdpau_r600.so.1*
-%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
+#%{_libdir}/vdpau/libvdpau_r600.so.1*
+#%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
%endif
%endif
%endif
@@ -664,6 +665,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Feb 02 2019 Jacco Ligthart <jacco@redsleeve.org> - 18.0.5-4.redsleeve
+- small changes to the spec to make it build on armv5
+
* Sat Dec 15 2018 Dave Airlie <airlied@redhat.com> - 18.0.5-4
- disable shm put/get for now it caused regressions
--
1.8.3.1