/[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 1366518 by tmb, Wed Feb 13 08:25:17 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            19.0.0
15  %define relc                    5  %define relc                    3
16  %define rel                     1  %define rel                     1
17    
18  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
# 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 170  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
 Patch001:       winsys-amdgpu-fix-a-buffer-leak-in-amdgpu_bo_from_handle.patch  
   
 # mesa master branch from 101  
172    
173    # mesa master branch from 201
174    
175  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
176    
# Line 188  Obsoletes:     Mesa < %{version} Line 185  Obsoletes:     Mesa < %{version}
185  %package -n     %{libglname}  %package -n     %{libglname}
186  Summary:        Files for Mesa (GL and GLX libs)  Summary:        Files for Mesa (GL and GLX libs)
187  Group:          System/Libraries  Group:          System/Libraries
 Obsoletes:      %{oldlibglname} < 6.4  
 Provides:       %{oldlibglname} = %{version}-%{release}  
188  Provides:       %{libglname_virt} = %{version}-%{release}  Provides:       %{libglname_virt} = %{version}-%{release}
189  Requires:       %{dridrivers} >= %{version}-%{release}  Requires:       %{dridrivers} >= %{version}-%{release}
190    
# Line 224  Provides:      libd3d-devel Line 219  Provides:      libd3d-devel
219  Summary:        Development files for Mesa (OpenGL compatible 3D lib)  Summary:        Development files for Mesa (OpenGL compatible 3D lib)
220  Group:          Development/C  Group:          Development/C
221  Requires:       %{libglname} = %{version}-%{release}  Requires:       %{libglname} = %{version}-%{release}
222    Requires:       %{khrdevel} = %{version}-%{release}
223  Provides:       lib%{glname}-devel = %{version}-%{release}  Provides:       lib%{glname}-devel = %{version}-%{release}
224  Provides:       %{glname}-devel = %{version}-%{release}  Provides:       %{glname}-devel = %{version}-%{release}
225  Provides:       GL-devel  Provides:       GL-devel
 Obsoletes:      %{oldlibglname}-devel < 6.4  
 Provides:       %{oldlibglname}-devel = %{version}-%{release}  
226  Provides:       libMesaGL-devel = %{version}-%{release}  Provides:       libMesaGL-devel = %{version}-%{release}
227  Provides:       MesaGL-devel = %{version}-%{release}  Provides:       MesaGL-devel = %{version}-%{release}
228  Provides:       libgl-devel  Provides:       libgl-devel
# Line 242  Provides:      %{libeglname_virt} = %{version Line 236  Provides:      %{libeglname_virt} = %{version
236  Summary:        Development files for Mesa (EGL libs)  Summary:        Development files for Mesa (EGL libs)
237  Group:          Development/C  Group:          Development/C
238  Requires:       %{libeglname} = %{version}-%{release}  Requires:       %{libeglname} = %{version}-%{release}
239    Requires:       %{khrdevel} = %{version}-%{release}
240  Provides:       EGL-devel  Provides:       EGL-devel
241  Provides:       lib%{eglname}-devel  Provides:       lib%{eglname}-devel
242  Provides:       %{eglname}-devel  Provides:       %{eglname}-devel
243  Provides:       libegl-devel  Provides:       libegl-devel
244    
245    %package -n %{khrdevel}
246    Summary:        Mesa Khronos development headers
247    Group:          Development/C
248    Provides:       mesakhr-devel = %{version}-%{release}
249    
250  %package -n %{libosmesaname}  %package -n %{libosmesaname}
251  Summary:        Mesa offscreen rendering library  Summary:        Mesa offscreen rendering library
252  Group:          System/Libraries  Group:          System/Libraries
# Line 279  Provides:      %{libglesv1name_virt} = %{vers Line 279  Provides:      %{libglesv1name_virt} = %{vers
279  Summary:        Development files for glesv1 libs  Summary:        Development files for glesv1 libs
280  Group:          Development/C  Group:          Development/C
281  Requires:       %{libglesv1name} = %{version}-%{release}  Requires:       %{libglesv1name} = %{version}-%{release}
282    Requires:       %{khrdevel} = %{version}-%{release}
283  Provides:       lib%{glesv1name}-devel  Provides:       lib%{glesv1name}-devel
284  Provides:       %{glesv1name}-devel  Provides:       %{glesv1name}-devel
285  Provides:       libglesv1-devel  Provides:       libglesv1-devel
# Line 292  Provides:      %{libglesv2name_virt} = %{vers Line 293  Provides:      %{libglesv2name_virt} = %{vers
293  Summary:        Development files for glesv2 libs  Summary:        Development files for glesv2 libs
294  Group:          Development/C  Group:          Development/C
295  Requires:       %{libglesv2name} = %{version}-%{release}  Requires:       %{libglesv2name} = %{version}-%{release}
296  Requires:       %{libeglname}-devel = %{version}-%{release}  Requires:       %{khrdevel} = %{version}-%{release}
297  Provides:       lib%{glesv2name}-devel  Provides:       lib%{glesv2name}-devel
298  Provides:       %{glesv2name}-devel  Provides:       %{glesv2name}-devel
299  Provides:       libglesv2-devel  Provides:       libglesv2-devel
# Line 359  Requires:      %{libxaname_virt} = %{version} Line 360  Requires:      %{libxaname_virt} = %{version}
360  Provides:       lib%{xaname}-devel  Provides:       lib%{xaname}-devel
361  Provides:       %{libxaname}-devel  Provides:       %{libxaname}-devel
362    
363  %if %{enable_vulkan}  %package -n %{vulkandrivers}
364  %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  
365  Group:          System/Libraries  Group:          System/Libraries
366    %ifarch %{ix86} x86_64
367    Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
368    Provides:       %{_lib}vulkan_intel = %{version}-%{release}
369    %endif
370    Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
371    Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
372    
373  %package -n %{libvulkanname}-devel  %package -n %{vulkandevel}
374  Summary:        Mesa's Vulkan development files  Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
375  Group:          Development/C  Group:          Development/C
376  Requires:       %{libvulkanname}_intel = %{version}-%{release}  Requires:       %{vulkandrivers} = %{version}-%{release}
377  Provides:       libvulkan-devel  Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
378  Provides:       libvulkan_intel-devel  Provides:   %{vulkanname}-devel = %{version}-%{release}
 %endif  
379    
380  %package        common-devel  %package        common-devel
381  Summary:        Meta package for mesa devel  Summary:        Meta package for mesa devel
# Line 425  well-defined subset profiles of OpenGL. Line 426  well-defined subset profiles of OpenGL.
426    
427  This package provides the OpenGL ES library version 1.  This package provides the OpenGL ES library version 1.
428    
429    %description -n %{khrdevel}
430    Mesa Khronos development headers.
431    
432  %description -n %{libosmesaname}  %description -n %{libosmesaname}
433  Mesa offscreen rendering libraries for rendering OpenGL into  Mesa offscreen rendering libraries for rendering OpenGL into
434  application-allocated blocks of memory.  application-allocated blocks of memory.
# Line 497  with the r600 driver. Line 501  with the r600 driver.
501  This packages provides a VPDAU plugin to enable video acceleration  This packages provides a VPDAU plugin to enable video acceleration
502  with the radeonsi driver.  with the radeonsi driver.
503    
504  %if %{enable_vulkan}  %description -n %{vulkandrivers}
505  %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.  
506    
507  %description -n %{libvulkanname}-devel  %description -n %{vulkandevel}
508  This package contains the development files for Mesa's Vulkan implementation.  This package contains the development files for Mesa's Vulkan implementation.
 %endif  
509    
510  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
511    
# Line 521  autoreconf -vfi Line 520  autoreconf -vfi
520  automake --add-missing  automake --add-missing
521    
522  %configure2_5x \  %configure2_5x \
 %if %{enable_vulkan}  
                 --with-vulkan-drivers=intel,radeon \  
 %endif  
523                  --enable-gallium-osmesa \                  --enable-gallium-osmesa \
524                  --with-dri-driverdir=%{_libdir}/dri \                  --with-dri-driverdir=%{_libdir}/dri \
525                  --enable-egl \                  --enable-egl \
# Line 542  automake --add-missing Line 538  automake --add-missing
538                  --enable-dri \                  --enable-dri \
539                  --enable-xa \                  --enable-xa \
540                  --enable-nine \                  --enable-nine \
541                  --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \                  --enable-autotools \
542                    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
543            %{?vulkan_drivers} \
544          %{?dri_drivers}          %{?dri_drivers}
545                  # end of configure options                  # end of configure options
546    
# Line 579  rm -f %{buildroot}%{_libdir}/libwayland- Line 577  rm -f %{buildroot}%{_libdir}/libwayland-
577  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc  rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
578  %endif  %endif
579    
580    %ifnarch %{ix86} x86_64
581    # To have something to package for mesavulkan-devel on arm/aarch64 for now
582    mkdir %{buildroot}%{_includedir}/vulkan
583    %endif
584    
585  #------------------------------------------------------------------------------  #------------------------------------------------------------------------------
586    
587  %files  %files
# Line 644  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 647  rm -f %{buildroot}%{_libdir}/pkgconfig/w
647    
648  %files -n %{libeglname}-devel  %files -n %{libeglname}-devel
649  %{_includedir}/EGL  %{_includedir}/EGL
 %{_includedir}/KHR  
650  %{_libdir}/libEGL.so  %{_libdir}/libEGL.so
651  %{_libdir}/pkgconfig/egl.pc  %{_libdir}/pkgconfig/egl.pc
652    
653    %files -n %{khrdevel}
654    %{_includedir}/KHR
655    
656  %files -n %{osmesadevel}  %files -n %{osmesadevel}
657  %dir %{_includedir}/GL  %dir %{_includedir}/GL
658  %{_includedir}/GL/osmesa.h  %{_includedir}/GL/osmesa.h
# Line 703  rm -f %{buildroot}%{_libdir}/pkgconfig/w Line 708  rm -f %{buildroot}%{_libdir}/pkgconfig/w
708  %files -n %{_lib}vdpau-driver-radeonsi  %files -n %{_lib}vdpau-driver-radeonsi
709  %{_libdir}/vdpau/libvdpau_radeonsi.so.*  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
710    
711  %if %{enable_vulkan}  %files -n %{vulkandrivers}
 %files -n %{libvulkanname}_intel  
712  %dir %{_datadir}/vulkan  %dir %{_datadir}/vulkan
713  %dir %{_datadir}/vulkan/icd.d  %dir %{_datadir}/vulkan/icd.d
714    %ifarch %{ix86} x86_64
715  %{_datadir}/vulkan/icd.d/intel_icd*.json  %{_datadir}/vulkan/icd.d/intel_icd*.json
 # (akien) No lib major?  
716  %{_libdir}/libvulkan_intel.so  %{_libdir}/libvulkan_intel.so
717    %endif
 %files -n %{libvulkanname}_radeon  
 %dir %{_datadir}/vulkan  
 %dir %{_datadir}/vulkan/icd.d  
718  %{_datadir}/vulkan/icd.d/radeon_icd*.json  %{_datadir}/vulkan/icd.d/radeon_icd*.json
 # (akien) No lib major?  
719  %{_libdir}/libvulkan_radeon.so  %{_libdir}/libvulkan_radeon.so
720    
721  %files -n %{libvulkanname}-devel  %files -n %{vulkandevel}
722  %{_includedir}/vulkan/  %dir %{_includedir}/vulkan
723    %ifarch %{ix86} x86_64
724    %{_includedir}/vulkan/vulkan_intel.h
725  %endif  %endif

Legend:
Removed from v.1336871  
changed lines
  Added in v.1366518

  ViewVC Help
Powered by ViewVC 1.1.26