The package rpms/mesa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mesa.git/commit/?id=1a2fde64df834...
https://src.fedoraproject.org/cgit/rpms/mesa.git/commit/?id=650dc1f8a8222....
Change:
+%ifarch %{ix86} x86_64
+%ifarch x86_64
Thanks.
Full change:
============
commit 8c5aa4596e0ac4d861dbbcbf65ff071d4262cbdd
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Oct 11 16:48:21 2017 +0100
Fix for vc4/Raspberry Pi
diff --git a/mesa.spec b/mesa.spec
index 99907f7..7aaa14b 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -59,7 +59,7 @@
Name: mesa
Summary: Mesa graphics libraries
Version: 17.2.2
-Release: 3%{?rctag:.%{rctag}}%{?dist}
+Release: 4%{?rctag:.%{rctag}}%{?dist}
License: MIT
URL:
http://www.mesa3d.org
@@ -78,6 +78,7 @@ Patch1: 0001-llvm-SONAME-without-version.patch
Patch2: 0002-hardware-gloat.patch
Patch3: 0003-evergreen-big-endian.patch
Patch4: 0004-bigendian-assert.patch
+Patch5: vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
# glvnd support patches
# non-upstreamed ones
@@ -693,6 +694,9 @@ popd
%endif
%changelog
+* Wed Oct 11 2017 Peter Robinson <pbrobinson(a)fedoraproject.org> 17.2.2-4
+- Fix for vc4/Raspberry Pi
+
* Mon Oct 09 2017 Dave Airlie <airlied(a)redhat.com> - 17.2.2-3
- enable vulkan on 32-bit x86
diff --git a/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
b/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
new file mode 100644
index 0000000..ec4e993
--- /dev/null
+++ b/vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch
@@ -0,0 +1,48 @@
+diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
+index 5743e13045..b39cc744e6 100644
+--- a/src/gallium/drivers/vc4/vc4_screen.c
++++ b/src/gallium/drivers/vc4/vc4_screen.c
+@@ -549,25 +549,30 @@ vc4_screen_query_dmabuf_modifiers(struct pipe_screen *pscreen,
+ unsigned int *external_only,
+ int *count)
+ {
++ int m, i;
++ uint64_t available_modifiers[] = {
++ DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
++ DRM_FORMAT_MOD_LINEAR,
++ };
++ struct vc4_screen *screen = vc4_screen(pscreen);
++ int num_modifiers = screen->has_tiling_ioctl ? 2 : 1;
++
+ if (!modifiers) {
+- *count = 2;
++ *count = num_modifiers;
+ return;
+ }
+
+- *count = MIN2(max, 2);
+-
++ *count = MIN2(max, num_modifiers);
++ m = screen->has_tiling_ioctl ? 0 : 1;
+ /* We support both modifiers (tiled and linear) for all sampler
+- * formats.
++ * formats, but if we don't have the DRM_VC4_GET_TILING ioctl
++ * we shouldn't advertise the tiled formats.
+ */
+- modifiers[0] = DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED;
+- if (external_only)
+- external_only[0] = false;
+- if (max < 2)
+- return;
+-
+- modifiers[1] = DRM_FORMAT_MOD_LINEAR;
+- if (external_only)
+- external_only[1] = false;
++ for (i = 0; i < *count; i++) {
++ modifiers[i] = available_modifiers[m++];
++ if (external_only)
++ external_only[i] = false;
++ }
+ }
+
+ #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))
commit 650dc1f8a8222afa7ed1fbd3e87af6a396d2c147
Author: Dave Airlie <airlied(a)redhat.com>
Date: Mon Oct 9 12:48:34 2017 +1000
Fix i686 vulkan packaging
diff --git a/mesa.spec b/mesa.spec
index 939e66a..99907f7 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -680,8 +680,13 @@ popd
%files vulkan-drivers
%{_libdir}/libvulkan_intel.so
%{_libdir}/libvulkan_radeon.so
+%ifarch x86_64
%{_datadir}/vulkan/icd.d/intel_icd.x86_64.json
%{_datadir}/vulkan/icd.d/radeon_icd.x86_64.json
+%else
+%{_datadir}/vulkan/icd.d/intel_icd.i686.json
+%{_datadir}/vulkan/icd.d/radeon_icd.i686.json
+%endif
%files vulkan-devel
%{_includedir}/vulkan/
commit 1a2fde64df83449bbeae33703b4775728f6c02c4
Author: Dave Airlie <airlied(a)redhat.com>
Date: Mon Oct 9 12:30:33 2017 +1000
enable vulkan on 32-bit x86
diff --git a/mesa.spec b/mesa.spec
index d603abd..939e66a 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -28,7 +28,7 @@
%define with_omx 1
%endif
-%ifarch x86_64
+%ifarch %{ix86} x86_64
%define with_vulkan 1
%else
%define with_vulkan 0
@@ -59,7 +59,7 @@
Name: mesa
Summary: Mesa graphics libraries
Version: 17.2.2
-Release: 2%{?rctag:.%{rctag}}%{?dist}
+Release: 3%{?rctag:.%{rctag}}%{?dist}
License: MIT
URL:
http://www.mesa3d.org
@@ -688,6 +688,9 @@ popd
%endif
%changelog
+* Mon Oct 09 2017 Dave Airlie <airlied(a)redhat.com> - 17.2.2-3
+- enable vulkan on 32-bit x86
+
* Tue Oct 03 2017 Adam Jackson <ajax(a)redhat.com> - 17.2.2-2
- Backport S3TC support from master