/[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 1339667 by akien, Mon Dec 10 09:14:31 2018 UTC revision 1355920 by tmb, Sun Jan 13 14:22:00 2019 UTC
# Line 11  Line 11 
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            18.3.1
15  #define relc                    1  #define relc                    1
16  %define rel                     2  %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  %define khrdevel                %mklibname mesakhr -d
72  %define osmesadevel             %mklibname osmesa -d  %define osmesadevel             %mklibname osmesa -d
73    
# Line 85  Line 87 
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 151  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 169  Source3:       make-git-snapshot.sh
169  Patch000:       fix-linking.patch  Patch000:       fix-linking.patch
170    
171  # mesa staging/18.3 branch from 1  # mesa staging/18.3 branch from 1
172    Patch001:       0001-docs-add-sha256-checksums-for-18.3.1.patch
173    #Patch002:      0002-bin-get-pick-list.sh-rework-handing-of-sha-nominatio.patch
174    #Patch003:      0003-bin-get-pick-list.sh-warn-when-commit-lists-invalid-.patch
175    Patch004:       0004-freedreno-drm-fix-memory-leak.patch
176    Patch005:       0005-v3d-Fix-a-leak-of-the-transfer-helper-on-screen-dest.patch
177    Patch006:       0006-vc4-Fix-a-leak-of-the-transfer-helper-on-screen-dest.patch
178    Patch007:       0007-v3d-Fix-a-leak-of-the-disassembled-instruction-strin.patch
179    Patch008:       0008-loader-free-error-state-when-checking-the-drawable-t.patch
180    Patch009:       0009-mesa-st-nir-fix-missing-nir_compact_varyings.patch
181    #Patch010:      0010-cherry-ignore-meson-libfreedreno-depends-upon-libdrm.patch
182    Patch011:       0011-radv-switch-on-EOP-when-primitive-restart-is-enabled.patch
183    Patch012:       0012-virgl-wrap-vertex-element-state-in-a-struct.patch
184    Patch013:       0013-virgl-work-around-bad-assumptions-in-virglrenderer.patch
185    Patch014:       0014-glx-mandate-xf86vidmode-only-for-drm-dri-platforms.patch
186    Patch015:       0015-radv-xfb-fix-counter-buffer-bounds-checks.patch
187    Patch016:       0016-pci_ids-add-new-vega10-pci-ids.patch
188    Patch017:       0017-pci_ids-add-new-vega20-pci-id.patch
189    Patch018:       0018-v3d-Make-sure-that-a-thrsw-doesn-t-split-a-multop-fr.patch
190    Patch019:       0019-v3d-Add-missing-flagging-of-SYNCB-as-a-TSY-op.patch
191    Patch020:       0020-clover-Fix-build-after-clang-r348827.patch
192    Patch021:       0021-nir-constant_folding-Fix-source-bit-size-logic.patch
193    Patch022:       0022-radv-don-t-set-surf_index-for-stencil-only-images.patch
194    Patch023:       0023-i965-vec4-dce-Don-t-narrow-the-write-mask-if-the-fla.patch
195    Patch024:       0024-meson-Fix-ppc64-little-endian-detection.patch
196    Patch025:       0025-meson-Add-support-for-gnu-hurd.patch
197    Patch026:       0026-meson-Add-toggle-for-glx-direct.patch
198    Patch027:       0027-Revert-nir-lower_indirect-Bail-early-if-modes-0.patch
199    Patch028:       0028-meson-Fix-typo.patch
200    Patch029:       0029-meson-Fix-libsensors-detection.patch
201    Patch030:       0030-nir-properly-clear-the-entry-sources-in-copy_prop_va.patch
202    Patch031:       0031-nir-properly-find-the-entry-to-keep-in-copy_prop_var.patch
203    Patch032:       0032-meson-don-t-require-glx-egl-gbm-with-gallium-drivers.patch
204    Patch033:       0033-pipe-loader-meson-reference-correct-library.patch
205    Patch034:       0034-TODO-glx-meson-build-dri-based-glx-tests-only-with-D.patch
206    Patch035:       0035-glx-meson-drop-includes-from-a-link-only-library.patch
207    Patch036:       0036-glx-meson-wire-up-the-dispatch-index-check-test.patch
208    Patch037:       0037-glx-test-meson-assorted-include-fixes.patch
209    Patch038:       0038-pci_ids-add-new-VegaM-pci-id.patch
210    Patch039:       0039-st-nine-Fix-volumetexture-dtor-on-ctor-failure.patch
211    Patch040:       0040-st-nine-Bind-src-not-dst-in-nine_context_box_upload.patch
212    Patch041:       0041-st-nine-Add-src-reference-to-nine_context_range_uplo.patch
213    Patch042:       0042-anv-don-t-do-partial-resolve-on-layer-0.patch
214    Patch043:       0043-gallium-ttn-Fix-setup-of-outputs_written.patch
215    Patch044:       0044-virgl-vtest-fix-front-buffer-flush-with-protocol-ver.patch
216    Patch045:       0045-meson-Override-C-standard-to-gnu-11-when-building-wi.patch
217    Patch046:       0046-radv-Do-a-cache-flush-if-needed-before-reading-predi.patch
218    Patch047:       0047-tgsi-scan-fix-loop-exit-point-in-tgsi_scan_tess_ctrl.patch
219    Patch048:       0048-tgsi-scan-correctly-walk-instructions-in-tgsi_scan_t.patch
220    Patch049:       0049-egl-haiku-Fix-reference-to-disp-vs-dpy.patch
221    Patch050:       0050-meson-Error-out-if-building-nouveau-and-using-LLVM-w.patch
222    Patch051:       0051-i965-include-draw_params-derived_draw_params-for-VF-.patch
223    Patch052:       0052-i965-add-CS-stall-on-VF-invalidation-workaround.patch
224    Patch053:       0053-nir-remove-dead-code-from-copy_prop_vars.patch
225    Patch054:       0054-intel-blorp-Be-more-conservative-about-copying-clear.patch
226    Patch055:       0055-radv-Implement-buffer-stores-with-less-than-4-compon.patch
227    Patch056:       0056-anv-android-Do-not-reject-storage-images.patch
228    Patch057:       0057-glsl-correct-typo-in-GLSL-compilation-error-message.patch
229    Patch058:       0058-radv-Fix-rasterization-precision-bits.patch
230    Patch059:       0059-spirv-Fix-matrix-parameters-in-function-calls.patch
231    Patch060:       0060-spirv-Handle-any-bit-size-in-vector_insert-extract.patch
232    Patch061:       0061-anv-apply_pipeline_layout-Set-the-cursor-in-lower_re.patch
233    Patch062:       0062-spirv-Sign-extend-array-indices.patch
234    Patch063:       0063-anv-explictly-specify-format-for-blorp-ccs-mcs-op.patch
235    Patch064:       0064-anv-flush-fast-clear-colors-into-compressed-surfaces.patch
236    Patch065:       0065-autotools-Remove-tegra-vdpau-driver.patch
237    Patch066:       0066-ac-nir-radv-radeonsi-nir-use-correct-indices-for-int.patch
238    Patch067:       0067-radeonsi-Fix-use-of-1-or-2-component-GL_DOUBLE-vbo-s.patch
239    Patch068:       0068-st-mesa-don-t-leak-pipe_surface-if-pipe_context-is-n.patch
240    Patch069:       0069-intel-fs-Handle-source-modifiers-in-lower_integer_mu.patch
241    Patch070:       0070-intel-fs-Implement-quad-swizzles-on-ICL.patch
242    Patch071:       0071-intel-fs-Fix-bug-in-lower_simd_width-while-splitting.patch
243    Patch072:       0072-intel-eu-gen7-Fix-brw_MOV-with-DF-destination-and-st.patch
244    Patch073:       0073-intel-fs-Respect-CHV-BXT-regioning-restrictions-in-c.patch
245    Patch074:       0074-glsl-linker-specify-proper-direction-in-location-ali.patch
246    Patch075:       0075-intel-peephole_ffma-Fix-swizzle-propagation.patch
247    Patch076:       0076-nv50-ir-fix-use-after-free-in-ConstantFolding-visit.patch
248    Patch077:       0077-meson-link-LLVM-native-component-when-LLVM-is-availa.patch
249    Patch078:       0078-ac-split-16-bit-ssbo-loads-that-may-not-be-dword-ali.patch
250    
251  # mesa master branch from 101  # mesa master branch from 201
 Patch101:       mesa-pci_ids-add-new-vega10-pci-ids.patch  
 Patch102:       mesa-pci_ids-add-new-vega20-pci-id.patch  
   
252    
253  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
254    
# Line 363  Requires:      %{libxaname_virt} = %{version} Line 438  Requires:      %{libxaname_virt} = %{version}
438  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
439  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
440    
441  %if %{enable_vulkan}  %package -n %{vulkandrivers}
442  %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  
443  Group:          System/Libraries  Group:          System/Libraries
444    %ifarch %{ix86} x86_64
445    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
446    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
447    %endif
448    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
449    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
450    
451  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
452  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
453  Group:          Development/C  Group:          Development/C
454  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
455  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
456  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
457    
458  %package        common-devel  %package        common-devel
459  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 504  with the r600 driver. Line 579  with the r600 driver.
579  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
580  with the radeonsi driver.  with the radeonsi driver.
581    
582  %if %{enable_vulkan}  %description -n %{vulkandrivers}
583  %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.  
584    
585  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
586  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
587    
588  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
589    
# Line 528  autoreconf -vfi Line 598  autoreconf -vfi
598  automake --add-missing  automake --add-missing
599    
600  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
601                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
602                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
603                  --enable-egl \                  --enable-egl \
# Line 550  automake --add-missing Line 617  automake --add-missing
617                  --enable-xa \                  --enable-xa \
618                  --enable-nine \                  --enable-nine \
619                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
620            %{?vulkan_drivers} \
621          %{?dri_drivers}          %{?dri_drivers}
622                  # end of configure options                  # end of configure options
623    
# Line 586  rm -f %{buildroot}%{_libdir}/libwayland- Line 654  rm -f %{buildroot}%{_libdir}/libwayland-
654  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
655  %endif  %endif
656    
657    %ifnarch %{ix86} x86_64
658    # To have something to package for mesavulkan-devel on arm/aarch64 for now
659    mkdir %{buildroot}%{_includedir}/vulkan
660    %endif
661    
662  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
663    
664  %files  %files
# Line 712  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 785  rm -f %{buildroot}%{_libdir}/pkgconfig/w
785  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
786  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
787    
788  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
789  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
790  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
791    %ifarch %{ix86} x86_64
792  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
793  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
794    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
795  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
796  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
797    
798  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
799  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
800    %ifarch %{ix86} x86_64
801    %{_includedir}/vulkan/vulkan_intel.h
802  %endif  %endif

Legend:
Removed from v.1339667  
changed lines
  Added in v.1355920

  ViewVC Help
Powered by ViewVC 1.1.30