/[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 1336871 by tmb, Fri Nov 30 10:03:04 2018 UTC revision 1379265 by tmb, Wed Mar 20 17:08:42 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                    5  #define relc                    1
16  %define rel                     1  %define rel                     4
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 169  Source3:       make-git-snapshot.sh Line 168  Source3:       make-git-snapshot.sh
168    
169  Patch000:       fix-linking.patch  Patch000:       fix-linking.patch
170    
171  # mesa staging/18.3 branch from 1  # mesa staging/19.0 branch from 1
172  Patch001:       winsys-amdgpu-fix-a-buffer-leak-in-amdgpu_bo_from_handle.patch  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  # mesa master branch from 101  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    Patch023:       0023-radv-fix-binding-transform-feedback-buffers.patch
195    Patch024:       0024-intel-nir-Lower-array-deref-of-vector-UBO-and-SSBO-l.patch
196    
197    # mesa master branch from 201
198    
199  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
200    
# Line 188  Obsoletes:     Mesa < %{version} Line 209  Obsoletes:     Mesa < %{version}
209  %package -n     %{libglname}  %package -n     %{libglname}
210  Summary:        Files for Mesa (GL and GLX libs)  Summary:        Files for Mesa (GL and GLX libs)
211  Group:          System/Libraries  Group:          System/Libraries
 Obsoletes:      %{oldlibglname} < 6.4  
 Provides:       %{oldlibglname} = %{version}-%{release}  
212  Provides:       %{libglname_virt} = %{version}-%{release}  Provides:       %{libglname_virt} = %{version}-%{release}
213  Requires:       %{dridrivers} >= %{version}-%{release}  Requires:       %{dridrivers} >= %{version}-%{release}
214    
# Line 224  Provides:      libd3d-devel Line 243  Provides:      libd3d-devel
243  Summary:        Development files for Mesa (OpenGL compatible 3D lib)  Summary:        Development files for Mesa (OpenGL compatible 3D lib)
244  Group:          Development/C  Group:          Development/C
245  Requires:       %{libglname} = %{version}-%{release}  Requires:       %{libglname} = %{version}-%{release}
246    Requires:       %{khrdevel} = %{version}-%{release}
247  Provides:       lib%{glname}-devel = %{version}-%{release}  Provides:       lib%{glname}-devel = %{version}-%{release}
248  Provides:       %{glname}-devel = %{version}-%{release}  Provides:       %{glname}-devel = %{version}-%{release}
249  Provides:       GL-devel  Provides:       GL-devel
 Obsoletes:      %{oldlibglname}-devel < 6.4  
 Provides:       %{oldlibglname}-devel = %{version}-%{release}  
250  Provides:       libMesaGL-devel = %{version}-%{release}  Provides:       libMesaGL-devel = %{version}-%{release}
251  Provides:       MesaGL-devel = %{version}-%{release}  Provides:       MesaGL-devel = %{version}-%{release}
252  Provides:       libgl-devel  Provides:       libgl-devel
# Line 242  Provides:      %{libeglname_virt} = %{version Line 260  Provides:      %{libeglname_virt} = %{version
260  Summary:        Development files for Mesa (EGL libs)  Summary:        Development files for Mesa (EGL libs)
261  Group:          Development/C  Group:          Development/C
262  Requires:       %{libeglname} = %{version}-%{release}  Requires:       %{libeglname} = %{version}-%{release}
263    Requires:       %{khrdevel} = %{version}-%{release}
264  Provides:       EGL-devel  Provides:       EGL-devel
265  Provides:       lib%{eglname}-devel  Provides:       lib%{eglname}-devel
266  Provides:       %{eglname}-devel  Provides:       %{eglname}-devel
267  Provides:       libegl-devel  Provides:       libegl-devel
268    
269    %package -n %{khrdevel}
270    Summary:        Mesa Khronos development headers
271    Group:          Development/C
272    Provides:       mesakhr-devel = %{version}-%{release}
273    
274  %package -n %{libosmesaname}  %package -n %{libosmesaname}
275  Summary:        Mesa offscreen rendering library  Summary:        Mesa offscreen rendering library
276  Group:          System/Libraries  Group:          System/Libraries
# Line 279  Provides:      %{libglesv1name_virt} = %{vers Line 303  Provides:      %{libglesv1name_virt} = %{vers
303  Summary:        Development files for glesv1 libs  Summary:        Development files for glesv1 libs
304  Group:          Development/C  Group:          Development/C
305  Requires:       %{libglesv1name} = %{version}-%{release}  Requires:       %{libglesv1name} = %{version}-%{release}
306    Requires:       %{khrdevel} = %{version}-%{release}
307  Provides:       lib%{glesv1name}-devel  Provides:       lib%{glesv1name}-devel
308  Provides:       %{glesv1name}-devel  Provides:       %{glesv1name}-devel
309  Provides:       libglesv1-devel  Provides:       libglesv1-devel
# Line 292  Provides:      %{libglesv2name_virt} = %{vers Line 317  Provides:      %{libglesv2name_virt} = %{vers
317  Summary:        Development files for glesv2 libs  Summary:        Development files for glesv2 libs
318  Group:          Development/C  Group:          Development/C
319  Requires:       %{libglesv2name} = %{version}-%{release}  Requires:       %{libglesv2name} = %{version}-%{release}
320  Requires:       %{libeglname}-devel = %{version}-%{release}  Requires:       %{khrdevel} = %{version}-%{release}
321  Provides:       lib%{glesv2name}-devel  Provides:       lib%{glesv2name}-devel
322  Provides:       %{glesv2name}-devel  Provides:       %{glesv2name}-devel
323  Provides:       libglesv2-devel  Provides:       libglesv2-devel
# Line 359  Requires:      %{libxaname_virt} = %{version} Line 384  Requires:      %{libxaname_virt} = %{version}
384  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
385  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
386    
387  %if %{enable_vulkan}  %package -n %{vulkandrivers}
388  %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  
389  Group:          System/Libraries  Group:          System/Libraries
390    %ifarch %{ix86} x86_64
391    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
392    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
393    %endif
394    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
395    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
396    
397  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
398  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
399  Group:          Development/C  Group:          Development/C
400  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
401  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
402  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
403    
404  %package        common-devel  %package        common-devel
405  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 425  well-defined subset profiles of OpenGL. Line 450  well-defined subset profiles of OpenGL.
450    
451  This package provides the OpenGL ES library version 1.  This package provides the OpenGL ES library version 1.
452    
453    %description -n %{khrdevel}
454    Mesa Khronos development headers.
455    
456  %description -n %{libosmesaname}  %description -n %{libosmesaname}
457  Mesa offscreen rendering libraries for rendering OpenGL into  Mesa offscreen rendering libraries for rendering OpenGL into
458  application-allocated blocks of memory.  application-allocated blocks of memory.
# Line 497  with the r600 driver. Line 525  with the r600 driver.
525  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
526  with the radeonsi driver.  with the radeonsi driver.
527    
528  %if %{enable_vulkan}  %description -n %{vulkandrivers}
529  %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.  
530    
531  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
532  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
533    
534  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
535    
# Line 521  autoreconf -vfi Line 544  autoreconf -vfi
544  automake --add-missing  automake --add-missing
545    
546  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
547                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
548                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
549                  --enable-egl \                  --enable-egl \
# Line 542  automake --add-missing Line 562  automake --add-missing
562                  --enable-dri \                  --enable-dri \
563                  --enable-xa \                  --enable-xa \
564                  --enable-nine \                  --enable-nine \
565                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \                  --enable-autotools \
566                    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
567            %{?vulkan_drivers} \
568          %{?dri_drivers}          %{?dri_drivers}
569                  # end of configure options                  # end of configure options
570    
# Line 579  rm -f %{buildroot}%{_libdir}/libwayland- Line 601  rm -f %{buildroot}%{_libdir}/libwayland-
601  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
602  %endif  %endif
603    
604    %ifnarch %{ix86} x86_64
605    # To have something to package for mesavulkan-devel on arm/aarch64 for now
606    mkdir %{buildroot}%{_includedir}/vulkan
607    %endif
608    
609  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
610    
611  %files  %files
# Line 644  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 671  rm -f %{buildroot}%{_libdir}/pkgconfig/w
671    
672  %files -n %{libeglname}-devel  %files -n %{libeglname}-devel
673  %{_includedir}/EGL  %{_includedir}/EGL
 %{_includedir}/KHR  
674  %{_libdir}/libEGL.so  %{_libdir}/libEGL.so
675  %{_libdir}/pkgconfig/egl.pc  %{_libdir}/pkgconfig/egl.pc
676    
677    %files -n %{khrdevel}
678    %{_includedir}/KHR
679    
680  %files -n %{osmesadevel}  %files -n %{osmesadevel}
681  %dir %{_includedir}/GL  %dir %{_includedir}/GL
682  %{_includedir}/GL/osmesa.h  %{_includedir}/GL/osmesa.h
# Line 703  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 732  rm -f %{buildroot}%{_libdir}/pkgconfig/w
732  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
733  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
734    
735  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
736  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
737  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
738    %ifarch %{ix86} x86_64
739  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
740  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
741    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
742  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
743  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
744    
745  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
746  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
747    %ifarch %{ix86} x86_64
748    %{_includedir}/vulkan/vulkan_intel.h
749  %endif  %endif
Legend:
Removed from v.1336871  
changed lines
  Added in v.1379265
  ViewVC Help
Powered by ViewVC 1.1.30