diff --git a/.gitignore b/.gitignore index bf4d3a4..3d01925 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mesa-19.1.0-rc5.tar.xz +SOURCES/mesa-19.3.0-rc4.tar.xz diff --git a/.mesa.metadata b/.mesa.metadata index 9a10e8d..0dd6d67 100644 --- a/.mesa.metadata +++ b/.mesa.metadata @@ -1 +1 @@ -83a8cc4a4e450d65e9ce7eb5d46dbbdca574bca2 SOURCES/mesa-19.1.0-rc5.tar.xz +f4eeb09a7dece984364a509154170a85deee9ea0 SOURCES/mesa-19.3.0-rc4.tar.xz diff --git a/SOURCES/0001-llvmpipe-ppc-fix-if-ifdef-confusion-in-backport.patch b/SOURCES/0001-llvmpipe-ppc-fix-if-ifdef-confusion-in-backport.patch new file mode 100644 index 0000000..c2d5a67 --- /dev/null +++ b/SOURCES/0001-llvmpipe-ppc-fix-if-ifdef-confusion-in-backport.patch @@ -0,0 +1,26 @@ +From 27d0c526ec926de8eca10917b4a1b68080f45187 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Thu, 21 Nov 2019 05:53:03 +1000 +Subject: [PATCH] llvmpipe/ppc: fix if/ifdef confusion in backport. + +Fixes: 32aba91c07f (llvmpipe: use ppc64le/ppc64 Large code model for JIT-compiled shaders) +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index ee27f346254..89d3fb9133b 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -469,7 +469,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, + */ + builder.setCodeModel(CodeModel::Large); + +-#if PIPE_ARCH_LITTLE_ENDIAN ++#ifdef PIPE_ARCH_LITTLE_ENDIAN + /* + * Versions of LLVM prior to 4.0 lacked a table entry for "POWER8NVL", + * resulting in (big-endian) "generic" being returned on +-- +2.21.0 + diff --git a/SOURCES/Makefile b/SOURCES/Makefile index 8ff894d..a3b6b3b 100644 --- a/SOURCES/Makefile +++ b/SOURCES/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 19.1.0-rc5 +VERSION ?= 19.3.0-rc4 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/SOURCES/glesv2.pc b/SOURCES/glesv2.pc deleted file mode 100644 index 7af1555..0000000 --- a/SOURCES/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -libdir=${prefix}/lib64 -includedir=${prefix}/include - -Name: glesv2 -Description: Mesa OpenGL ES 2.0 library -Version: 19.1.0 -Libs: -L${libdir} -lGLESv2 -Libs.private: -lpthread -pthread -lm -ldl -Cflags: -I${includedir} diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec index 9b3cf96..571fc8d 100644 --- a/SPECS/mesa.spec +++ b/SPECS/mesa.spec @@ -36,12 +36,12 @@ %global sanitize 0 -%global rctag rc5 +%global rctag rc4 Name: mesa Summary: Mesa graphics libraries -Version: 19.1.0 -Release: 0.5%{?rctag:.%{rctag}}%{?dist} +Version: 19.3.0 +Release: 3%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -55,8 +55,7 @@ Source3: Makefile # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt -Source5: glesv2.pc - +Patch1: 0001-llvmpipe-ppc-fix-if-ifdef-confusion-in-backport.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -106,7 +105,7 @@ BuildRequires: python3-mako %ifarch %{valgrind_arches} BuildRequires: pkgconfig(valgrind) %endif -BuildRequires: pkgconfig(libglvnd) >= 0.2.0 +BuildRequires: pkgconfig(libglvnd) >= 1.2.0 %if 0%{?rhel} == 7 BuildRequires: llvm-toolset-7-runtime @@ -119,31 +118,24 @@ BuildRequires: llvm-toolset-7-runtime %package filesystem Summary: Mesa driver filesystem -Provides: mesa-dri-filesystem = %{?epoch:%{epoch}}%{version}-%{release} -Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}}%{version}-%{release} +Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} %description filesystem %{summary}. -%package khr-devel -Summary: Mesa Khronos development headers - -%description khr-devel -%{summary}. - %package libGL Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} -Requires: libglvnd-glx%{?_isa} >= 1:1.0.1-0.8 +Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-glx%{?_isa} >= 1:1.2.0-1 %description libGL %{summary}. %package libGL-devel Summary: Mesa libGL development package -Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 Provides: libGL-devel Provides: libGL-devel%{?_isa} @@ -152,44 +144,24 @@ Provides: libGL-devel%{?_isa} %package libEGL Summary: Mesa libEGL runtime libraries -Requires: libglvnd-egl%{?_isa} +Requires: libglvnd-egl%{?_isa} >= 1:1.2.0-1 %description libEGL %{summary}. %package libEGL-devel Summary: Mesa libEGL development package -Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel%{?_isa} >= 1:1.2.0-1 Provides: libEGL-devel Provides: libEGL-devel%{?_isa} %description libEGL-devel %{summary}. -%package libGLES -Summary: Mesa libGLES runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} -Requires: libglvnd-gles%{?_isa} - -%description libGLES -%{summary}. - -%package libGLES-devel -Summary: Mesa libGLES development package -Requires: %{name}-libGLES%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} -Requires: %{name}-khr-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libGLES-devel -Provides: libGLES-devel%{?_isa} - -%description libGLES-devel -%{summary}. - %package dri-drivers Summary: Mesa-based DRI drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description dri-drivers %{summary}. @@ -197,7 +169,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele %if 0%{?with_omx} %package omx-drivers Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description omx-drivers %{summary}. @@ -206,7 +178,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele %if 0%{?with_vdpau} %package vdpau-drivers Summary: Mesa-based VDPAU drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description vdpau-drivers %{summary}. @@ -214,7 +186,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}}%{version}-%{rele %package libOSMesa Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libOSMesa Provides: libOSMesa%{?_isa} @@ -223,7 +195,7 @@ Provides: libOSMesa%{?_isa} %package libOSMesa-devel Summary: Mesa offscreen rendering development package -Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libOSMesa-devel %{summary}. @@ -238,7 +210,7 @@ Provides: libgbm%{?_isa} %package libgbm-devel Summary: Mesa libgbm development package -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libgbm-devel Provides: libgbm-devel%{?_isa} @@ -277,7 +249,7 @@ Provides: libglapi%{?_isa} Summary: Mesa OpenCL runtime library Requires: ocl-icd%{?_isa} Requires: libclc%{?_isa} -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: opencl-filesystem %description libOpenCL @@ -285,7 +257,7 @@ Requires: opencl-filesystem %package libOpenCL-devel Summary: Mesa OpenCL development package -Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libOpenCL-devel %{summary}. @@ -300,7 +272,7 @@ Summary: Mesa Direct3D9 state tracker %package libd3d-devel Summary: Mesa Direct3D9 state tracker development package -Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description libd3d-devel %{summary}. @@ -316,7 +288,7 @@ The drivers with support for the Vulkan API. %package vulkan-devel Summary: Mesa Vulkan development files -Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release} +Requires: %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: vulkan-devel %description vulkan-devel @@ -336,7 +308,6 @@ Headers for development with the Vulkan API. %endif cp %{SOURCE4} docs/ -cp %{SOURCE5} . pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \ src/gallium/tools/trace/*.py \ @@ -346,7 +317,7 @@ pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \ %build export ASFLAGS="--generate-missing-build-notes=yes" -%meson -Dcpp_std=gnu++11 \ +%meson -Dcpp_std=gnu++14 \ -Db_ndebug=true \ -Dplatforms=x11,wayland,drm,surfaceless \ -Ddri3=true \ @@ -385,15 +356,13 @@ export ASFLAGS="--generate-missing-build-notes=yes" %install %meson_install -install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/ - # libvdpau opens the versioned name, don't bother including the unversioned -rm -f %{buildroot}%{_libdir}/vdpau/*.so +rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd -rm -f %{buildroot}%{_libdir}/libGLX_mesa.so -rm -f %{buildroot}%{_libdir}/libEGL_mesa.so +rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so +rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so # XXX can we just not build this -rm -f %{buildroot}%{_libdir}/libGLES* +rm -vf %{buildroot}%{_libdir}/libGLES* # glvnd needs a default provider for indirect rendering where it cannot # determine the vendor @@ -424,53 +393,22 @@ done %endif %endif -%files khr-devel -%dir %{_includedir}/KHR -%{_includedir}/KHR/khrplatform.h - %files libGL %{_libdir}/libGLX_mesa.so.0* %{_libdir}/libGLX_system.so.0* %files libGL-devel -%{_includedir}/GL/gl.h -%{_includedir}/GL/gl_mangle.h -%{_includedir}/GL/glext.h -%{_includedir}/GL/glx.h -%{_includedir}/GL/glx_mangle.h -%{_includedir}/GL/glxext.h -%{_includedir}/GL/glcorearb.h %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc %{_libdir}/libglapi.so -%{_libdir}/pkgconfig/gl.pc %files libEGL %{_datadir}/glvnd/egl_vendor.d/50_mesa.json %{_libdir}/libEGL_mesa.so.0* %files libEGL-devel %dir %{_includedir}/EGL -%{_includedir}/EGL/eglext.h -%{_includedir}/EGL/egl.h %{_includedir}/EGL/eglmesaext.h -%{_includedir}/EGL/eglplatform.h %{_includedir}/EGL/eglextchromium.h -%{_libdir}/pkgconfig/egl.pc - -%files libGLES -# No files, all provided by libglvnd -%files libGLES-devel -%dir %{_includedir}/GLES2 -%{_includedir}/GLES2/gl2platform.h -%{_includedir}/GLES2/gl2.h -%{_includedir}/GLES2/gl2ext.h -%dir %{_includedir}/GLES3 -%{_includedir}/GLES3/gl3platform.h -%{_includedir}/GLES3/gl3.h -%{_includedir}/GLES3/gl3ext.h -%{_includedir}/GLES3/gl31.h -%{_includedir}/GLES3/gl32.h -%{_libdir}/pkgconfig/glesv2.pc %post libglapi -p /sbin/ldconfig %postun libglapi -p /sbin/ldconfig @@ -600,6 +538,21 @@ done %endif %changelog +* Mon Nov 25 2019 Dave Airlie - 19.3.0-3 +- drop khr-devel subpackage from here + +* Fri Nov 22 2019 Dave Airlie - 19.3.0-2 +- sort out libglvnd requires + +* Thu Nov 21 2019 Dave Airlie - 19.3.0-1 +- mesa-19.3.0-rc4 + +* Fri Aug 09 2019 Dave Airlie - 19.1.4-2 +- Add CET support to asm files + +* Mon Aug 05 2019 Dave Airlie - 19.1.4-1 +- mesa-19.1.4 + * Thu Jun 06 2019 Dave Airlie - 19.1.0-0.5 - mesa-19.1.0-rc5