/[packages]/cauldron/mesa/current/SPECS/mesa.spec
ViewVC logotype

Diff of /cauldron/mesa/current/SPECS/mesa.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1328786 by tv, Wed Nov 7 16:00:08 2018 UTC revision 1379153 by tmb, Wed Mar 20 09:55:12 2019 UTC
# Line 6  Line 6 
6    
7  # https://cgit.freedesktop.org/mesa/mesa/commit/?h=13.0&id=3bb0415ab96f74183f7aa58c1a543448653ccb3e  # https://cgit.freedesktop.org/mesa/mesa/commit/?h=13.0&id=3bb0415ab96f74183f7aa58c1a543448653ccb3e
8  %define git 0  %define git 0
9  %define git_branch 18.0  %define git_branch 19.0
10    
11  %define opengl_ver 4.5  %define opengl_ver 4.5
12    
13  # define version, RC & release  # define version, RC & release
14  %define main_version            18.3.0  %define main_version            19.0.0
15  %define relc                    1  #define relc                    1
16  %define rel                     1  %define rel                     3
17    
18  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
19    
# Line 37  Line 37 
37  %define gbmname                 gbm  %define gbmname                 gbm
38  %define waylandeglname          wayland-egl  %define waylandeglname          wayland-egl
39  %define xaname                  xatracker  %define xaname                  xatracker
40  %define vulkanname              vulkan  %define vulkanname              mesavulkan
41    
42  %define d3dmajor                1  %define d3dmajor                1
43  %define eglmajor                1  %define eglmajor                1
# Line 62  Line 62 
62  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}
63  %define libosmesaname           %mklibname osmesa %{osmesamajor}  %define libosmesaname           %mklibname osmesa %{osmesamajor}
64  %define libxaname               %mklibname %{xaname} %{xamajor}  %define libxaname               %mklibname %{xaname} %{xamajor}
 %define libvulkanname           %mklibname %{vulkanname}  
65    
66  %define dridrivers              %mklibname dri-drivers  %define dridrivers              %mklibname dri-drivers
67    
68    %define vulkandrivers   %mklibname %{vulkanname}-drivers
69    %define vulkandevel             %mklibname %{vulkanname} -d
70    
71    %define khrdevel                %mklibname mesakhr -d
72  %define osmesadevel             %mklibname osmesa -d  %define osmesadevel             %mklibname osmesa -d
73    
74  # Architecture-independent Virtual provides:  # Architecture-independent Virtual provides:
# Line 80  Line 83 
83  %define libwaylandeglname_virt  lib%{waylandeglname}  %define libwaylandeglname_virt  lib%{waylandeglname}
84  %define libxaname_virt          lib%{xaname}  %define libxaname_virt          lib%{xaname}
85    
 %define oldlibglname            %mklibname MesaGL 1  
   
86  %define mesasrcdir              %{_prefix}/src/Mesa/  %define mesasrcdir              %{_prefix}/src/Mesa/
87    
88  %define with_vaapi 1  %define with_vaapi 1
89    
 # (akien) Not adding on arm as it would break the build there  
 %define enable_vulkan   0  
90  %ifarch %{ix86} x86_64  %ifarch %{ix86} x86_64
91  %define enable_vulkan   1  %define vulkan_drivers  --with-vulkan-drivers=intel,radeon
92    %else
93    %define vulkan_drivers  --with-vulkan-drivers=radeon
94  %endif  %endif
95    
96    
# Line 152  BuildRequires:  pkgconfig(vdpau) Line 153  BuildRequires:  pkgconfig(vdpau)
153  BuildRequires: pkgconfig(wayland-client)  BuildRequires: pkgconfig(wayland-client)
154  BuildRequires: pkgconfig(wayland-server)  BuildRequires: pkgconfig(wayland-server)
155  BuildRequires: pkgconfig(wayland-protocols)  BuildRequires: pkgconfig(wayland-protocols)
 %if %{enable_vulkan}  
156  BuildRequires:  libgcrypt-devel  BuildRequires:  libgcrypt-devel
 %endif  
157  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
158    
159  URL:            http://www.mesa3d.org  URL:            http://www.mesa3d.org
# Line 167  Source0:       https://mesa.freedesktop.org/ar Line 166  Source0:       https://mesa.freedesktop.org/ar
166  %endif  %endif
167  Source3:        make-git-snapshot.sh  Source3:        make-git-snapshot.sh
168    
169  # mesa staging/18.2 branch from 1  Patch000:       fix-linking.patch
170    
171  # mesa master branch from 101  # mesa staging/19.0 branch from 1
172    Patch001:       0001-docs-Add-SHA256-sums-for-19.0.0.patch
173    Patch002:       0002-radv-set-the-maximum-number-of-IBs-per-submit-to-192.patch
174    Patch003:       0003-v3d-Fix-leak-of-the-renderonly-struct-on-screen-dest.patch
175    Patch004:       0004-intel-fs-Fix-opt_peephole_csel-to-not-throw-away-sat.patch
176    Patch005:       0005-glsl-lower_vector_derefs-Don-t-use-a-temporary-for-T.patch
177    Patch006:       0006-glsl-list-Add-a-list-variant-of-insert_after.patch
178    Patch007:       0007-egl-dri-Avoid-out-of-bounds-array-access.patch
179    Patch008:       0008-anv-pass-Flag-the-need-for-a-RT-flush-for-resolve-at.patch
180    Patch009:       0009-i965-Disable-ARB_fragment_shader_interlock-for-platf.patch
181    Patch010:       0010-radv-always-initialize-HTILE-when-the-src-layout-is-.patch
182    Patch011:       0011-d3d-meson-do-not-prefix-user-provided-d3d-drivers-pa.patch
183    Patch012:       0012-mesa-properly-report-the-length-of-truncated-log-mes.patch
184    Patch013:       0013-isl-fix-automake-build-when-sse41-is-not-supported.patch
185    Patch014:       0014-anv-Treat-zero-size-XFB-buffer-as-disabled.patch
186    #Patch015:      0015-cherry-ignore-Add-commit-that-doesn-t-apply.patch
187    Patch016:       0016-nir-builder-Add-a-vector-extract-helper.patch
188    Patch017:       0017-nir-Add-a-new-pass-to-lower-array-dereferences-on-ve.patch
189    Patch018:       0018-radv-Use-correct-image-view-comparison-for-fast-clea.patch
190    Patch019:       0019-glsl-correctly-validate-component-layout-qualifier-f.patch
191    Patch020:       0020-glsl-linker-don-t-fail-non-static-used-inputs-withou.patch
192    Patch021:       0021-glsl-linker-simplify-xfb_offset-vs-xfb_stride-overfl.patch
193    Patch022:       0022-Revert-glsl-relax-input-output-validation-for-SSO-pr.patch
194    
195    # mesa master branch from 201
196    
197  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
198    
# Line 185  Obsoletes:     Mesa < %{version} Line 207  Obsoletes:     Mesa < %{version}
207  %package -n     %{libglname}  %package -n     %{libglname}
208  Summary:        Files for Mesa (GL and GLX libs)  Summary:        Files for Mesa (GL and GLX libs)
209  Group:          System/Libraries  Group:          System/Libraries
 Obsoletes:      %{oldlibglname} < 6.4  
 Provides:       %{oldlibglname} = %{version}-%{release}  
210  Provides:       %{libglname_virt} = %{version}-%{release}  Provides:       %{libglname_virt} = %{version}-%{release}
211  Requires:       %{dridrivers} >= %{version}-%{release}  Requires:       %{dridrivers} >= %{version}-%{release}
212    
# Line 221  Provides:      libd3d-devel Line 241  Provides:      libd3d-devel
241  Summary:        Development files for Mesa (OpenGL compatible 3D lib)  Summary:        Development files for Mesa (OpenGL compatible 3D lib)
242  Group:          Development/C  Group:          Development/C
243  Requires:       %{libglname} = %{version}-%{release}  Requires:       %{libglname} = %{version}-%{release}
244    Requires:       %{khrdevel} = %{version}-%{release}
245  Provides:       lib%{glname}-devel = %{version}-%{release}  Provides:       lib%{glname}-devel = %{version}-%{release}
246  Provides:       %{glname}-devel = %{version}-%{release}  Provides:       %{glname}-devel = %{version}-%{release}
247  Provides:       GL-devel  Provides:       GL-devel
 Obsoletes:      %{oldlibglname}-devel < 6.4  
 Provides:       %{oldlibglname}-devel = %{version}-%{release}  
248  Provides:       libMesaGL-devel = %{version}-%{release}  Provides:       libMesaGL-devel = %{version}-%{release}
249  Provides:       MesaGL-devel = %{version}-%{release}  Provides:       MesaGL-devel = %{version}-%{release}
250  Provides:       libgl-devel  Provides:       libgl-devel
# Line 239  Provides:      %{libeglname_virt} = %{version Line 258  Provides:      %{libeglname_virt} = %{version
258  Summary:        Development files for Mesa (EGL libs)  Summary:        Development files for Mesa (EGL libs)
259  Group:          Development/C  Group:          Development/C
260  Requires:       %{libeglname} = %{version}-%{release}  Requires:       %{libeglname} = %{version}-%{release}
261    Requires:       %{khrdevel} = %{version}-%{release}
262  Provides:       EGL-devel  Provides:       EGL-devel
263  Provides:       lib%{eglname}-devel  Provides:       lib%{eglname}-devel
264  Provides:       %{eglname}-devel  Provides:       %{eglname}-devel
265  Provides:       libegl-devel  Provides:       libegl-devel
266    
267    %package -n %{khrdevel}
268    Summary:        Mesa Khronos development headers
269    Group:          Development/C
270    Provides:       mesakhr-devel = %{version}-%{release}
271    
272  %package -n %{libosmesaname}  %package -n %{libosmesaname}
273  Summary:        Mesa offscreen rendering library  Summary:        Mesa offscreen rendering library
274  Group:          System/Libraries  Group:          System/Libraries
# Line 276  Provides:      %{libglesv1name_virt} = %{vers Line 301  Provides:      %{libglesv1name_virt} = %{vers
301  Summary:        Development files for glesv1 libs  Summary:        Development files for glesv1 libs
302  Group:          Development/C  Group:          Development/C
303  Requires:       %{libglesv1name} = %{version}-%{release}  Requires:       %{libglesv1name} = %{version}-%{release}
304    Requires:       %{khrdevel} = %{version}-%{release}
305  Provides:       lib%{glesv1name}-devel  Provides:       lib%{glesv1name}-devel
306  Provides:       %{glesv1name}-devel  Provides:       %{glesv1name}-devel
307  Provides:       libglesv1-devel  Provides:       libglesv1-devel
# Line 289  Provides:      %{libglesv2name_virt} = %{vers Line 315  Provides:      %{libglesv2name_virt} = %{vers
315  Summary:        Development files for glesv2 libs  Summary:        Development files for glesv2 libs
316  Group:          Development/C  Group:          Development/C
317  Requires:       %{libglesv2name} = %{version}-%{release}  Requires:       %{libglesv2name} = %{version}-%{release}
318  Requires:       %{libeglname}-devel = %{version}-%{release}  Requires:       %{khrdevel} = %{version}-%{release}
319  Provides:       lib%{glesv2name}-devel  Provides:       lib%{glesv2name}-devel
320  Provides:       %{glesv2name}-devel  Provides:       %{glesv2name}-devel
321  Provides:       libglesv2-devel  Provides:       libglesv2-devel
# Line 356  Requires:      %{libxaname_virt} = %{version} Line 382  Requires:      %{libxaname_virt} = %{version}
382  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
383  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
384    
385  %if %{enable_vulkan}  %package -n %{vulkandrivers}
386  %package -n %{libvulkanname}_intel  Summary:        Mesa Vulkan driver for Intel and Radeon GPUs
 Summary:        Mesa vulkan driver for Intel GPU  
 Group:          System/Libraries  
   
 %package -n %{libvulkanname}_radeon  
 Summary:        Mesa vulkan driver for Radeon GPU  
387  Group:          System/Libraries  Group:          System/Libraries
388    %ifarch %{ix86} x86_64
389    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
390    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
391    %endif
392    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
393    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
394    
395  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
396  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
397  Group:          Development/C  Group:          Development/C
398  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
399  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
400  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
401    
402  %package        common-devel  %package        common-devel
403  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 422  well-defined subset profiles of OpenGL. Line 448  well-defined subset profiles of OpenGL.
448    
449  This package provides the OpenGL ES library version 1.  This package provides the OpenGL ES library version 1.
450    
451    %description -n %{khrdevel}
452    Mesa Khronos development headers.
453    
454  %description -n %{libosmesaname}  %description -n %{libosmesaname}
455  Mesa offscreen rendering libraries for rendering OpenGL into  Mesa offscreen rendering libraries for rendering OpenGL into
456  application-allocated blocks of memory.  application-allocated blocks of memory.
# Line 494  with the r600 driver. Line 523  with the r600 driver.
523  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
524  with the radeonsi driver.  with the radeonsi driver.
525    
526  %if %{enable_vulkan}  %description -n %{vulkandrivers}
527  %description -n %{libvulkanname}_intel  This package contains the Vulkan parts for Mesa's Intel and Radeon drivers.
 This package contains the Vulkan parts for Mesa's Intel driver.  
   
 %description -n %{libvulkanname}_radeon  
 This package contains the Vulkan parts for Mesa's Radeon driver.  
528    
529  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
530  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
531    
532  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
533    
# Line 518  autoreconf -vfi Line 542  autoreconf -vfi
542  automake --add-missing  automake --add-missing
543    
544  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
545                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
546                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
547                  --enable-egl \                  --enable-egl \
# Line 539  automake --add-missing Line 560  automake --add-missing
560                  --enable-dri \                  --enable-dri \
561                  --enable-xa \                  --enable-xa \
562                  --enable-nine \                  --enable-nine \
563                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \                  --enable-autotools \
564                    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
565            %{?vulkan_drivers} \
566          %{?dri_drivers}          %{?dri_drivers}
567                  # end of configure options                  # end of configure options
568    
# Line 576  rm -f %{buildroot}%{_libdir}/libwayland- Line 599  rm -f %{buildroot}%{_libdir}/libwayland-
599  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
600  %endif  %endif
601    
602    %ifnarch %{ix86} x86_64
603    # To have something to package for mesavulkan-devel on arm/aarch64 for now
604    mkdir %{buildroot}%{_includedir}/vulkan
605    %endif
606    
607  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
608    
609  %files  %files
# Line 641  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 669  rm -f %{buildroot}%{_libdir}/pkgconfig/w
669    
670  %files -n %{libeglname}-devel  %files -n %{libeglname}-devel
671  %{_includedir}/EGL  %{_includedir}/EGL
 %{_includedir}/KHR  
672  %{_libdir}/libEGL.so  %{_libdir}/libEGL.so
673  %{_libdir}/pkgconfig/egl.pc  %{_libdir}/pkgconfig/egl.pc
674    
675    %files -n %{khrdevel}
676    %{_includedir}/KHR
677    
678  %files -n %{osmesadevel}  %files -n %{osmesadevel}
679  %dir %{_includedir}/GL  %dir %{_includedir}/GL
680  %{_includedir}/GL/osmesa.h  %{_includedir}/GL/osmesa.h
# Line 700  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 730  rm -f %{buildroot}%{_libdir}/pkgconfig/w
730  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
731  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
732    
733  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
734  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
735  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
736    %ifarch %{ix86} x86_64
737  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
738  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
739    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
740  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
741  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
742    
743  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
744  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
745    %ifarch %{ix86} x86_64
746    %{_includedir}/vulkan/vulkan_intel.h
747  %endif  %endif

Legend:
Removed from v.1328786  
changed lines
  Added in v.1379153

  ViewVC Help
Powered by ViewVC 1.1.30