From 1a2fde64df83449bbeae33703b4775728f6c02c4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 9 Oct 2017 12:30:33 +1000 Subject: [PATCH 1/7] enable vulkan on 32-bit x86 --- mesa.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 - 17.2.2-3 +- enable vulkan on 32-bit x86 + * Tue Oct 03 2017 Adam Jackson - 17.2.2-2 - Backport S3TC support from master From 650dc1f8a8222afa7ed1fbd3e87af6a396d2c147 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 9 Oct 2017 12:48:34 +1000 Subject: [PATCH 2/7] Fix i686 vulkan packaging --- mesa.spec | 5 +++++ 1 file changed, 5 insertions(+) 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/ From 8c5aa4596e0ac4d861dbbcbf65ff071d4262cbdd Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 11 Oct 2017 16:48:21 +0100 Subject: [PATCH 3/7] Fix for vc4/Raspberry Pi --- mesa.spec | 6 ++- ...mabuf-modifiers-if-we-can-t-use-them.patch | 48 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 vc4-Don-t-advertise-tiled-dmabuf-modifiers-if-we-can-t-use-them.patch 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 17.2.2-4 +- Fix for vc4/Raspberry Pi + * Mon Oct 09 2017 Dave Airlie - 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))) From 2e4cbfbb1e929142a4d067093adcbdf94af8b298 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 19 Oct 2017 11:53:13 -0500 Subject: [PATCH 4/7] 17.2.3 --- mesa.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index 7aaa14b..c73f6bf 100644 --- a/mesa.spec +++ b/mesa.spec @@ -58,8 +58,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 17.2.2 -Release: 4%{?rctag:.%{rctag}}%{?dist} +Version: 17.2.3 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -694,7 +694,10 @@ popd %endif %changelog -* Wed Oct 11 2017 Peter Robinson 17.2.2-4 +* Thu Oct 19 2017 Gwyn Ciesla - 17.2.3-1 +- 17.2.3, bugfix release. + +* Wed Oct 11 2017 Peter Robinson - 17.2.2-4 - Fix for vc4/Raspberry Pi * Mon Oct 09 2017 Dave Airlie - 17.2.2-3 diff --git a/sources b/sources index 4b84cf1..67634aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-17.2.2.tar.xz) = 641342c68989b8d801c37e668b012d3b7c4ad43d8ca01b74f8cbb3a1ec25b7390f69fe7ebc84b29dab1c6a4ac01c882ec9fd4a6b331505629461bdbbe6aa3f7e +SHA512 (mesa-17.2.3.tar.xz) = 749a0a46b772974633e405804ace7f509afb79f47811dbbdd390333721d744f2ac64f985ff1fd6c5aa3019b700be70bc1f75f60745ed9f4c5b08a9a8f77dfc76 From f3c14bfa07ba2c5f3673e2bc58c919233fd975cd Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 23 Oct 2017 22:37:18 +0000 Subject: [PATCH 5/7] Rebuild for LLVM 5.0.0 --- mesa.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index c73f6bf..50f4f32 100644 --- a/mesa.spec +++ b/mesa.spec @@ -59,7 +59,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 17.2.3 -Release: 1%{?rctag:.%{rctag}}%{?dist} +Release: 2%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -694,6 +694,9 @@ popd %endif %changelog +* Mon Oct 23 2017 Tom Stellard - 17.2.3-2 +- Rebuild for LLVM 5.0.0 + * Thu Oct 19 2017 Gwyn Ciesla - 17.2.3-1 - 17.2.3, bugfix release. From 4c47ac4973b73d448344fdc77a21acabddf10674 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 31 Oct 2017 13:57:30 +0000 Subject: [PATCH 6/7] 17.2.4 --- mesa.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 50f4f32..54b1b3b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -58,8 +58,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 17.2.3 -Release: 2%{?rctag:.%{rctag}}%{?dist} +Version: 17.2.4 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -694,6 +694,9 @@ popd %endif %changelog +* Tue Oct 31 2017 Peter Robinson 17.2.4-1 +- Update to 17.2.4 GA + * Mon Oct 23 2017 Tom Stellard - 17.2.3-2 - Rebuild for LLVM 5.0.0 diff --git a/sources b/sources index 67634aa..6c144db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-17.2.3.tar.xz) = 749a0a46b772974633e405804ace7f509afb79f47811dbbdd390333721d744f2ac64f985ff1fd6c5aa3019b700be70bc1f75f60745ed9f4c5b08a9a8f77dfc76 +SHA512 (mesa-17.2.4.tar.xz) = 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085 From 6131d224815ccc58ef1a6e08b64ddde0076866cc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 10 Nov 2017 18:33:17 +0100 Subject: [PATCH 7/7] Sanitize tarball Signed-off-by: Igor Gnatenko --- Makefile | 23 +++++++++++++++++++++++ mesa.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8952971 --- /dev/null +++ b/Makefile @@ -0,0 +1,23 @@ +VERSION ?= 17.2.4 +SANITIZE ?= 1 + +DIRNAME = mesa-${VERSION} + +all: archive + +clean: + rm -rf $(DIRNAME)/ + rm -f mesa-${VERSION}.tar.xz + +clone: clean + curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz + tar xf mesa-${VERSION}.tar.xz + +sanitize: clone vl_mpeg12_decoder.c vl_decoder.c +ifdef SANITIZE + cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c + cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c +endif + +archive: clone sanitize + tar cf ${DIRNAME}.tar.xz ${DIRNAME} diff --git a/mesa.spec b/mesa.spec index 54b1b3b..b63e2d1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -59,20 +59,22 @@ Name: mesa Summary: Mesa graphics libraries Version: 17.2.4 -Release: 1%{?rctag:.%{rctag}}%{?dist} +Release: 2%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org -Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz +#Source0: https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz +Source0: %{name}-%{version}%{?rctag:-%{rctag}}.tar.xz Source1: vl_decoder.c Source2: vl_mpeg12_decoder.c +Source3: Makefile # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # Source4 contains email correspondence clarifying the license terms. # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. -Source3: Mesa-MLAA-License-Clarification-Email.txt +Source4: Mesa-MLAA-License-Clarification-Email.txt # https://cgit.freedesktop.org/~ajax/mesa/log/?h=mesa-17.2-s3tc -Patch0: 0001-mesa-Squash-merge-of-S3TC-support.patch +Patch0: 0001-mesa-Squash-merge-of-S3TC-support.patch Patch1: 0001-llvm-SONAME-without-version.patch Patch2: 0002-hardware-gloat.patch @@ -375,7 +377,7 @@ Headers for development with the Vulkan API. cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c %endif -cp %{SOURCE3} docs/ +cp %{SOURCE4} docs/ # this is a hack for S3TC support. r200_screen.c is symlinked to # radeon_screen.c in git, but is its own file in the tarball. @@ -694,6 +696,9 @@ popd %endif %changelog +* Fri Nov 10 2017 Igor Gnatenko - 17.2.4-2 +- Sanitize tarball + * Tue Oct 31 2017 Peter Robinson 17.2.4-1 - Update to 17.2.4 GA diff --git a/sources b/sources index 6c144db..ab4c2b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-17.2.4.tar.xz) = 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085 +SHA512 (mesa-17.2.4.tar.xz) = 57310f9e6dc4dca582e00b74f3b886094560a590fdc21cf8fa810773bcfd0bddca574e46be8723cf69b201f73e66844691b72b4a05fdd9f46a355a92a165db70