From eee84703a2d05b5fb2357c7749a80537039d226a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 3 Apr 2018 19:41:49 +0000 Subject: [PATCH 1/5] Disable build of wayland packages. These have been obseleted by wayland-devel. --- mesa.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index a9ac8d5..5b8de59 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,4 +1,4 @@ -%bcond_without wayland +%bcond_with wayland # https://bugzilla.redhat.com/show_bug.cgi?id=1546714 %undefine _annotated_build @@ -53,7 +53,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 18.0.0 -Release: 2%{?rctag:.%{rctag}}%{?dist} +Release: 3%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -661,6 +661,9 @@ popd %endif %changelog +* Tue Apr 03 2018 Tom Stellard - 18.0.0-3 +- Disable build of wayland packages. These have been obseleted by wayland-devel. + * Wed Mar 28 2018 Adam Jackson - 18.0.0-2 - Unifarch OpenCL and OpenMAX (except ppc32 and s390 because llvm) - Simplify C/LDFLAGS setup to match From 9f97135799d23da89c2c802f140e4880873ac2de Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 9 Apr 2018 16:27:14 +0200 Subject: [PATCH 2/5] Re-enable wayland support Previous commit accidentally disabled all of wayland support, instead of just dropping mesa-libwayland-egl subpackage. This now re-enables wayland support and reworks the conditionals so that we only drop drop mesa-wayland-egl subpackage in F28+, where it is now part of wayland source package. https://bugzilla.redhat.com/show_bug.cgi?id=1564210 --- mesa.spec | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/mesa.spec b/mesa.spec index 5b8de59..6775276 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,5 +1,3 @@ -%bcond_with wayland - # https://bugzilla.redhat.com/show_bug.cgi?id=1546714 %undefine _annotated_build @@ -40,6 +38,12 @@ %define with_xa 1 %endif +%if 0%{?fedora} < 28 +%define with_wayland_egl 1 +%else +%define with_wayland_egl 0 +%endif + %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers} %if 0%{?with_vulkan} @@ -53,7 +57,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 18.0.0 -Release: 3%{?rctag:.%{rctag}}%{?dist} +Release: 4%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -111,11 +115,9 @@ BuildRequires: elfutils-libelf-devel BuildRequires: python3-libxml2 BuildRequires: libudev-devel BuildRequires: bison flex -%if %{with wayland} BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-protocols) -%endif %if 0%{?with_vdpau} BuildRequires: libvdpau-devel %endif @@ -260,7 +262,7 @@ Provides: libgbm-devel%{?_isa} %description libgbm-devel %{summary}. -%if %{with wayland} +%if %{?with_wayland_egl} %package libwayland-egl Summary: Mesa libwayland-egl runtime library Provides: libwayland-egl @@ -386,7 +388,7 @@ autoreconf -vfi --disable-xvmc \ %{?with_vdpau:--enable-vdpau} \ %{?with_vaapi:--enable-va} \ - --with-platforms=x11,drm,surfaceless%{?with_wayland:,wayland} \ + --with-platforms=x11,drm,surfaceless,wayland \ --enable-shared-glapi \ --enable-gbm \ %{?with_omx:--enable-omx-bellagio} \ @@ -425,6 +427,12 @@ rm -f %{buildroot}%{_libdir}/libEGL_mesa.so # XXX can we just not build this rm -f %{buildroot}%{_libdir}/libGLES* +# remove libwayland-egl on F28+ where it's built as part of wayland source package +%if !%{?with_wayland_egl} +rm -f %{buildroot}%{_libdir}/libwayland-egl.so* +rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc +%endif + # glvnd needs a default provider for indirect rendering where it cannot # determine the vendor ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 @@ -527,7 +535,7 @@ popd %{_includedir}/gbm.h %{_libdir}/pkgconfig/gbm.pc -%if %{with wayland} +%if %{?with_wayland_egl} %post libwayland-egl -p /sbin/ldconfig %postun libwayland-egl -p /sbin/ldconfig %files libwayland-egl @@ -661,6 +669,10 @@ popd %endif %changelog +* Mon Apr 09 2018 Kalev Lember - 18.0.0-4 +- Re-enable wayland support, conditionally drop mesa-wayland-egl subpackage + only in F28+ (#1564210) + * Tue Apr 03 2018 Tom Stellard - 18.0.0-3 - Disable build of wayland packages. These have been obseleted by wayland-devel. From 8f740e5d725292ce459dfa30d1a9178854d38f10 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 18 Apr 2018 13:36:37 -0400 Subject: [PATCH 3/5] Mesa 18.0.1 --- mesa.spec | 12 +++++++++--- sources | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mesa.spec b/mesa.spec index 6775276..3a0fad5 100644 --- a/mesa.spec +++ b/mesa.spec @@ -50,14 +50,14 @@ %define vulkan_drivers --with-vulkan-drivers=intel,radeon %endif -%global sanitize 1 +%global sanitize 0 #global rctag rc5 Name: mesa Summary: Mesa graphics libraries -Version: 18.0.0 -Release: 4%{?rctag:.%{rctag}}%{?dist} +Version: 18.0.1 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -364,6 +364,9 @@ Headers for development with the Vulkan API. %if 0%{sanitize} cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +%else + cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c + cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c %endif cp %{SOURCE4} docs/ @@ -669,6 +672,9 @@ popd %endif %changelog +* Wed Apr 18 2018 Adam Jackson - 18.0.1-1 +- Mesa 18.0.1 + * Mon Apr 09 2018 Kalev Lember - 18.0.0-4 - Re-enable wayland support, conditionally drop mesa-wayland-egl subpackage only in F28+ (#1564210) diff --git a/sources b/sources index 6830009..0bb96cb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (mesa-18.0.0.tar.xz) = 686c881ddad93e6f1ea48e07d7bc578999e0fc3371f22478e9de3ef1f3accdc866842bca90c2a53d8f5fa47c39aaabde1f3ee23b18322afc7250e322d2deabec +SHA512 (mesa-18.0.1.tar.xz) = 1db32b2d01a818778f0d299a06db9e088eb4d8a5bfa8945baa448751dfbe87468ce971743d6133d8e4033b07d9dbb166cfa5c01bc4294e1ec1a37de0f98d313d From 2f02d35654979d96aeaf62a309d52137c596413a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 24 Apr 2018 09:51:33 +0200 Subject: [PATCH 4/5] Disable rgb10 configs by default rgb10 configs are not handled very well by applications using clutter, and possibly other applications as well, so don't break those by disabling support for rgb10 configs by default. Also re-add python2 as a build requirement, as merge_driinfo.py depends on it. https://bugzilla.redhat.com/show_bug.cgi?id=1560481 --- ...ium-Disable-rgb10-configs-by-default.patch | 27 +++++++++++++++++++ mesa.spec | 14 +++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-gallium-Disable-rgb10-configs-by-default.patch diff --git a/0001-gallium-Disable-rgb10-configs-by-default.patch b/0001-gallium-Disable-rgb10-configs-by-default.patch new file mode 100644 index 0000000..09593a0 --- /dev/null +++ b/0001-gallium-Disable-rgb10-configs-by-default.patch @@ -0,0 +1,27 @@ +From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 24 Apr 2018 09:46:41 +0200 +Subject: [PATCH] gallium: Disable rgb10 configs by default + +Applications tend to not handle rgb10 configs very well, so lets +disable it for now. + +https://bugzilla.redhat.com/show_bug.cgi?id=1560481 +--- + src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +index 21dc599dc2..23f9194149 100644 +--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h ++++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END + DRI_CONF_SECTION_MISCELLANEOUS + DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false") + DRI_CONF_GLSL_ZERO_INIT("false") +- DRI_CONF_ALLOW_RGB10_CONFIGS("true") ++ DRI_CONF_ALLOW_RGB10_CONFIGS("false") + DRI_CONF_SECTION_END +-- +2.17.0 + diff --git a/mesa.spec b/mesa.spec index 3a0fad5..6bd53d1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -57,7 +57,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 18.0.1 -Release: 1%{?rctag:.%{rctag}}%{?dist} +Release: 2%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -76,6 +76,12 @@ Patch2: 0002-hardware-gloat.patch Patch3: 0003-evergreen-big-endian.patch Patch4: 0004-bigendian-assert.patch + +# Disable rgb10 configs by default: +# https://bugzilla.redhat.com/show_bug.cgi?id=1560481 +Patch7: 0001-gallium-Disable-rgb10-configs-by-default.patch + + # glvnd support patches # non-upstreamed ones Patch10: glvnd-fix-gl-dot-pc.patch @@ -104,6 +110,7 @@ BuildRequires: libXmu-devel BuildRequires: libxshmfence-devel BuildRequires: elfutils BuildRequires: python3 +BuildRequires: python2 BuildRequires: gettext %if 0%{?with_llvm} BuildRequires: llvm-devel >= 3.4-7 @@ -113,6 +120,7 @@ BuildRequires: clang-devel >= 3.0 %endif BuildRequires: elfutils-libelf-devel BuildRequires: python3-libxml2 +BuildRequires: python2-libxml2 BuildRequires: libudev-devel BuildRequires: bison flex BuildRequires: pkgconfig(wayland-client) @@ -135,6 +143,7 @@ BuildRequires: libclc-devel opencl-filesystem BuildRequires: vulkan-devel %endif BuildRequires: python3-mako +BuildRequires: python2-mako %ifarch %{valgrind_arches} BuildRequires: pkgconfig(valgrind) %endif @@ -672,6 +681,9 @@ popd %endif %changelog +* Tue Apr 24 2018 Jonas Ådahl - 18.0.1-2 +- Disable rgb10 configs by default (rhbz 1560481) + * Wed Apr 18 2018 Adam Jackson - 18.0.1-1 - Mesa 18.0.1 From 6e7ae213625e300bc5a1f71d076e15d178e3a7aa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 1 May 2018 09:49:00 +0100 Subject: [PATCH 5/5] 18.0.2 --- Makefile | 2 +- mesa.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 34a0fdc..a429ad4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 18.0.0 +VERSION ?= 18.0.2 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 6bd53d1..0645516 100644 --- a/mesa.spec +++ b/mesa.spec @@ -56,8 +56,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 18.0.1 -Release: 2%{?rctag:.%{rctag}}%{?dist} +Version: 18.0.2 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -681,6 +681,9 @@ popd %endif %changelog +* Tue May 1 2018 Peter Robinson 18.0.2-1 +- Mesa 18.0.2 + * Tue Apr 24 2018 Jonas Ådahl - 18.0.1-2 - Disable rgb10 configs by default (rhbz 1560481) diff --git a/sources b/sources index 0bb96cb..6156a6d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (mesa-18.0.0.tar.xz) = 686c881ddad93e6f1ea48e07d7bc578999e0fc3371f22478e9de3ef1f3accdc866842bca90c2a53d8f5fa47c39aaabde1f3ee23b18322afc7250e322d2deabec -SHA512 (mesa-18.0.1.tar.xz) = 1db32b2d01a818778f0d299a06db9e088eb4d8a5bfa8945baa448751dfbe87468ce971743d6133d8e4033b07d9dbb166cfa5c01bc4294e1ec1a37de0f98d313d +SHA512 (mesa-18.0.2.tar.xz) = de7debe457d8b5fd1d5c88ca052fa3e3c77882840fb0a506be87739ef0a73191f9fc89717b94ffdcfc05306c8c9e82c22bdbefbdc4d26d81733169a0315535c8