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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1219359 by ovitters,
Mon Apr 16 16:22:09 2018 UTC
+revision 1379265 by tmb,
Wed Mar 20 17:08:42 2019 UTC
 Line 1
- %bcond_without wayland
  # (cg) Cheater...
  %define Werror_cflags %nil
-Line 8
+Line 6
  # https://cgit.freedesktop.org/mesa/mesa/commit/?h=13.0&id=3bb0415ab96f74183f7aa58c1a543448653ccb3e
  %define git 0
- %define git_branch 18.0
+ %define git_branch 19.0
  %define opengl_ver 4.5
  # define version, RC & release
- %define main_version            18.0.0
+ %define main_version            19.0.0
- #define relc                    5
+ #define relc                    1
- %define rel                     7
+ %define rel                     4
  %define release                 %mkrel %{?relc:0.rc%{relc}.}%{rel}
-Line 39
+Line 37
  %define gbmname                 gbm
  %define waylandeglname          wayland-egl
  %define xaname                  xatracker
- %define vulkanname              vulkan
+ %define vulkanname              mesavulkan
  %define d3dmajor                1
  %define eglmajor                1
-Line 64
+Line 62
  %define libwaylandeglname       %mklibname %{waylandeglname} %{waylandeglmajor}
  %define libosmesaname           %mklibname osmesa %{osmesamajor}
  %define libxaname               %mklibname %{xaname} %{xamajor}
- %define libvulkanname           %mklibname %{vulkanname}
  %define dridrivers              %mklibname dri-drivers
+ %define vulkandrivers   %mklibname %{vulkanname}-drivers
+ %define vulkandevel             %mklibname %{vulkanname} -d
+ %define khrdevel                %mklibname mesakhr -d
  %define osmesadevel             %mklibname osmesa -d
  # Architecture-independent Virtual provides:
-Line 82
+Line 83
  %define libwaylandeglname_virt  lib%{waylandeglname}
  %define libxaname_virt          lib%{xaname}
- %define oldlibglname            %mklibname MesaGL 1
  %define mesasrcdir              %{_prefix}/src/Mesa/
  %define with_vaapi 1
- # (akien) Not adding on arm as it would break the build there
- %define enable_vulkan   0
  %ifarch %{ix86} x86_64
- %define enable_vulkan   1
+ %define vulkan_drivers  --with-vulkan-drivers=intel,radeon
+ %else
+ %define vulkan_drivers  --with-vulkan-drivers=radeon
  %endif
-Line 106
+Line 105
  %define platform_drivers ,i915,i965
  %define gallium_platform_drivers ,svga
  %endif
+ %define with_wayland_egl 0
  %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers}
  Name:           mesa
-Line 132 
 BuildRequires: pkgconfig(xcb-present)  >
+Line 134 
 BuildRequires: pkgconfig(xcb-present)  >
  BuildRequires:  pkgconfig(xext)         >= 1.1.1
  BuildRequires:  pkgconfig(xxf86vm)      >= 1.1.0
  BuildRequires:  pkgconfig(xi)           >= 1.3
+ BuildRequires:  pkgconfig(xrandr)
  BuildRequires:  pkgconfig(talloc)
+ BuildRequires:  python2-libxml2
+ BuildRequires:  python2-mako
  BuildRequires:  python3-libxml2
  BuildRequires:  python3-mako
  BuildRequires:  makedepend
-Line 145 
 BuildRequires:  pkgconfig(libudev)
+Line 150 
 BuildRequires:  pkgconfig(libudev)
  BuildRequires:  pkgconfig(libva)
  %endif
  BuildRequires:  pkgconfig(vdpau)
- %if %{with wayland}
  BuildRequires: pkgconfig(wayland-client)
  BuildRequires: pkgconfig(wayland-server)
  BuildRequires: pkgconfig(wayland-protocols)
- %endif
- %if %{enable_vulkan}
  BuildRequires:  libgcrypt-devel
- %endif
  BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
  URL:            http://www.mesa3d.org
-Line 165 
 Source0:       https://mesa.freedesktop.org/ar
+Line 166 
 Source0:       https://mesa.freedesktop.org/ar
  %endif
  Source3:        make-git-snapshot.sh
- # Instructions to setup your repository clone
+ Patch000:       fix-linking.patch
- # git://git.freedesktop.org/git/mesa/mesa
- # git checkout mesa_7_5_branch
- # git branch mdv-cherry-picks
- # git am ../02??-*.patch
- # git branch mdv-redhat
- # git am ../03??-*.patch
- # git branch mdv-patches
- # git am ../09??-*.patch
- # In order to update to the branch via patches, issue this command:
- # git format-patch --start-number 100 mesa_7_5_1..mesa_7_5_branch | sed 's/^0\([0-9]\+\)-/Patch\1: 0\1-/'
- # Cherry picks
- # git format-patch --start-number 200 mesa_7_5_branch..mdv-cherry-picks
- # Patches "liberated" from Fedora:
- # http://pkgs.fedoraproject.org/cgit/rpms/mesa.git/
- # git format-patch --start-number 300 mdv-cherry-picks..mdv-redhat
- # https://cgit.freedesktop.org/~ajax/mesa/log/?h=mesa-17.2-s3tc
- # Patches from ChromiumOS
+ # mesa staging/19.0 branch from 1
- # http://git.chromium.org/gitweb/?p=chromiumos/overlays/chromiumos-overlay.git;a=tree;f=media-libs/mesa/files;hb=HEAD
+ Patch001:       0001-docs-Add-SHA256-sums-for-19.0.0.patch
+ Patch002:       0002-radv-set-the-maximum-number-of-IBs-per-submit-to-192.patch
+ Patch003:       0003-v3d-Fix-leak-of-the-renderonly-struct-on-screen-dest.patch
+ Patch004:       0004-intel-fs-Fix-opt_peephole_csel-to-not-throw-away-sat.patch
+ Patch005:       0005-glsl-lower_vector_derefs-Don-t-use-a-temporary-for-T.patch
+ Patch006:       0006-glsl-list-Add-a-list-variant-of-insert_after.patch
+ Patch007:       0007-egl-dri-Avoid-out-of-bounds-array-access.patch
+ Patch008:       0008-anv-pass-Flag-the-need-for-a-RT-flush-for-resolve-at.patch
+ Patch009:       0009-i965-Disable-ARB_fragment_shader_interlock-for-platf.patch
+ Patch010:       0010-radv-always-initialize-HTILE-when-the-src-layout-is-.patch
+ Patch011:       0011-d3d-meson-do-not-prefix-user-provided-d3d-drivers-pa.patch
+ Patch012:       0012-mesa-properly-report-the-length-of-truncated-log-mes.patch
+ Patch013:       0013-isl-fix-automake-build-when-sse41-is-not-supported.patch
+ Patch014:       0014-anv-Treat-zero-size-XFB-buffer-as-disabled.patch
+ #Patch015:      0015-cherry-ignore-Add-commit-that-doesn-t-apply.patch
+ Patch016:       0016-nir-builder-Add-a-vector-extract-helper.patch
+ Patch017:       0017-nir-Add-a-new-pass-to-lower-array-dereferences-on-ve.patch
+ Patch018:       0018-radv-Use-correct-image-view-comparison-for-fast-clea.patch
+ Patch019:       0019-glsl-correctly-validate-component-layout-qualifier-f.patch
+ Patch020:       0020-glsl-linker-don-t-fail-non-static-used-inputs-withou.patch
+ Patch021:       0021-glsl-linker-simplify-xfb_offset-vs-xfb_stride-overfl.patch
+ Patch022:       0022-Revert-glsl-relax-input-output-validation-for-SSO-pr.patch
+ Patch023:       0023-radv-fix-binding-transform-feedback-buffers.patch
+ Patch024:       0024-intel-nir-Lower-array-deref-of-vector-UBO-and-SSBO-l.patch
- # Mageia/Mandriva patches
+ # mesa master branch from 201
- # git format-patch --start-number 900 mdv-redhat..mdv-patches
  #------------------------------------------------------------------------------
-Line 205 
 Obsoletes:     Mesa < %{version}
+Line 209 
 Obsoletes:     Mesa < %{version}
  %package -n     %{libglname}
  Summary:        Files for Mesa (GL and GLX libs)
  Group:          System/Libraries
- Obsoletes:      %{oldlibglname} < 6.4
- Provides:       %{oldlibglname} = %{version}-%{release}
  Provides:       %{libglname_virt} = %{version}-%{release}
  Requires:       %{dridrivers} >= %{version}-%{release}
-Line 241 
 Provides:      libd3d-devel
+Line 243 
 Provides:      libd3d-devel
  Summary:        Development files for Mesa (OpenGL compatible 3D lib)
  Group:          Development/C
  Requires:       %{libglname} = %{version}-%{release}
+ Requires:       %{khrdevel} = %{version}-%{release}
  Provides:       lib%{glname}-devel = %{version}-%{release}
  Provides:       %{glname}-devel = %{version}-%{release}
  Provides:       GL-devel
- Obsoletes:      %{oldlibglname}-devel < 6.4
- Provides:       %{oldlibglname}-devel = %{version}-%{release}
  Provides:       libMesaGL-devel = %{version}-%{release}
  Provides:       MesaGL-devel = %{version}-%{release}
  Provides:       libgl-devel
-Line 259 
 Provides:      %{libeglname_virt} = %{version
+Line 260 
 Provides:      %{libeglname_virt} = %{version
  Summary:        Development files for Mesa (EGL libs)
  Group:          Development/C
  Requires:       %{libeglname} = %{version}-%{release}
+ Requires:       %{khrdevel} = %{version}-%{release}
  Provides:       EGL-devel
  Provides:       lib%{eglname}-devel
  Provides:       %{eglname}-devel
  Provides:       libegl-devel
+ %package -n %{khrdevel}
+ Summary:        Mesa Khronos development headers
+ Group:          Development/C
+ Provides:       mesakhr-devel = %{version}-%{release}
  %package -n %{libosmesaname}
  Summary:        Mesa offscreen rendering library
  Group:          System/Libraries
-Line 296 
 Provides:      %{libglesv1name_virt} = %{vers
+Line 303 
 Provides:      %{libglesv1name_virt} = %{vers
  Summary:        Development files for glesv1 libs
  Group:          Development/C
  Requires:       %{libglesv1name} = %{version}-%{release}
+ Requires:       %{khrdevel} = %{version}-%{release}
  Provides:       lib%{glesv1name}-devel
  Provides:       %{glesv1name}-devel
  Provides:       libglesv1-devel
-Line 309 
 Provides:      %{libglesv2name_virt} = %{vers
+Line 317 
 Provides:      %{libglesv2name_virt} = %{vers
  Summary:        Development files for glesv2 libs
  Group:          Development/C
  Requires:       %{libglesv2name} = %{version}-%{release}
- Requires:       %{libeglname}-devel = %{version}-%{release}
+ Requires:       %{khrdevel} = %{version}-%{release}
  Provides:       lib%{glesv2name}-devel
  Provides:       %{glesv2name}-devel
  Provides:       libglesv2-devel
-Line 326 
 Requires:      %{libgbmname} = %{version}-%{r
+Line 334 
 Requires:      %{libgbmname} = %{version}-%{r
  Provides:       lib%{gbmname}-devel
  Provides:       %{gbmname}-devel
- %if %{with wayland}
+ %if %{?with_wayland_egl}
  %package -n     %{libwaylandeglname}
  Summary:        Files for Mesa (Wayland EGL libs)
  Group:          System/Libraries
-Line 376 
 Requires:      %{libxaname_virt} = %{version}
+Line 384 
 Requires:      %{libxaname_virt} = %{version}
  Provides:       lib%{xaname}-devel
  Provides:       %{libxaname}-devel
- %if %{enable_vulkan}
+ %package -n %{vulkandrivers}
- %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
  Group:          System/Libraries
+ %ifarch %{ix86} x86_64
+ Obsoletes:      %{_lib}vulkan_intel < 18.3.0-4
+ Provides:       %{_lib}vulkan_intel = %{version}-%{release}
+ %endif
+ Obsoletes:      %{_lib}vulkan_radeon < 18.3.0-4
+ Provides:       %{_lib}vulkan_radeon = %{version}-%{release}
- %package -n %{libvulkanname}-devel
+ %package -n %{vulkandevel}
- Summary:        Mesa's Vulkan development files
+ Summary:        Mesa's Vulkan development files for Intel and Radeon drivers
  Group:          Development/C
- Requires:       %{libvulkanname}_intel = %{version}-%{release}
+ Requires:       %{vulkandrivers} = %{version}-%{release}
- Provides:       libvulkan-devel
+ Obsoletes:      %{_lib}vulkan-devel < 0:18.3.0-4
- Provides:       libvulkan_intel-devel
+ Provides:   %{vulkanname}-devel = %{version}-%{release}
- %endif
  %package        common-devel
  Summary:        Meta package for mesa devel
-Line 442 
 well-defined subset profiles of OpenGL.
+Line 450 
 well-defined subset profiles of OpenGL.
  This package provides the OpenGL ES library version 1.
+ %description -n %{khrdevel}
+ Mesa Khronos development headers.
  %description -n %{libosmesaname}
  Mesa offscreen rendering libraries for rendering OpenGL into
  application-allocated blocks of memory.
-Line 482 
 GBM (Graphics Buffer Manager) parts.
+Line 493 
 GBM (Graphics Buffer Manager) parts.
  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
  GBM (Graphics Buffer Manager) development parts.
- %if %{with wayland}
+ %if %{?with_wayland_egl}
  %description -n %{libwaylandeglname}
  Mesa is an OpenGL %{opengl_ver} compatible 3D graphics library.
  Wayland EGL platform parts.
-Line 514 
 with the r600 driver.
+Line 525 
 with the r600 driver.
  This packages provides a VPDAU plugin to enable video acceleration
  with the radeonsi driver.
- %if %{enable_vulkan}
+ %description -n %{vulkandrivers}
- %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
+ %description -n %{vulkandevel}
- This package contains the Vulkan parts for Mesa's Radeon driver.
- %description -n %{libvulkanname}-devel
  This package contains the development files for Mesa's Vulkan implementation.
- %endif
  #------------------------------------------------------------------------------
-Line 538 
 autoreconf -vfi
+Line 544 
 autoreconf -vfi
  automake --add-missing
  %configure2_5x \
- %if %{enable_vulkan}
-                 --with-vulkan-drivers=intel,radeon \
- %endif
                  --enable-gallium-osmesa \
                  --with-dri-driverdir=%{_libdir}/dri \
                  --enable-egl \
-Line 549 
 automake --add-missing
+Line 552 
 automake --add-missing
                  --disable-xvmc \
                  --enable-vdpau \
                  %{?with_vaapi:--enable-va} \
-                 --with-platforms=x11,drm,surfaceless%{?with_wayland:,wayland} \
+                 --with-platforms=x11,drm,surfaceless,wayland \
                  --enable-shared-glapi \
                  --enable-gbm \
                  --enable-glx \
-Line 559 
 automake --add-missing
+Line 562 
 automake --add-missing
                  --enable-dri \
                  --enable-xa \
                  --enable-nine \
-                 --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,imx,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
+                 --enable-autotools \
+                 --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast,%{?with_freedreno:freedreno,}%{?with_etnaviv:etnaviv,}%{?with_vc4:vc4,}virgl%{?gallium_platform_drivers} \
+         %{?vulkan_drivers} \
          %{?dri_drivers}
                  # end of configure options
-Line 590 
 rm -f %{buildroot}%{_includedir}/GL/w*.h
+Line 595 
 rm -f %{buildroot}%{_includedir}/GL/w*.h
  # remove .la files
  find %{buildroot} -name '*.la' -delete
+ # remove libwayland-egl on F28+ where it's built as part of wayland source package
+ %if !%{?with_wayland_egl}
+ rm -f %{buildroot}%{_libdir}/libwayland-egl.so*
+ rm -f %{buildroot}%{_libdir}/pkgconfig/wayland-egl.pc
+ %endif
+ %ifnarch %{ix86} x86_64
+ # To have something to package for mesavulkan-devel on arm/aarch64 for now
+ mkdir %{buildroot}%{_includedir}/vulkan
+ %endif
  #------------------------------------------------------------------------------
  %files
- %config(noreplace) %{_sysconfdir}/drirc
+ /usr/share/drirc.d/
  %files -n %{dridrivers}
  %dir %{_libdir}/dri
-Line 627 
 find %{buildroot} -name '*.la' -delete
+Line 643 
 find %{buildroot} -name '*.la' -delete
  %{_libdir}/libgbm.so.%{gbmmajor}
  %{_libdir}/libgbm.so.%{gbmmajor}.*
- %if %{with wayland}
+ %if %{?with_wayland_egl}
  %files -n %{libwaylandeglname}
  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}
  %{_libdir}/libwayland-egl.so.%{waylandeglmajor}.*
-Line 655 
 find %{buildroot} -name '*.la' -delete
+Line 671 
 find %{buildroot} -name '*.la' -delete
  %files -n %{libeglname}-devel
  %{_includedir}/EGL
- %{_includedir}/KHR
  %{_libdir}/libEGL.so
  %{_libdir}/pkgconfig/egl.pc
+ %files -n %{khrdevel}
+ %{_includedir}/KHR
  %files -n %{osmesadevel}
  %dir %{_includedir}/GL
  %{_includedir}/GL/osmesa.h
-Line 689 
 find %{buildroot} -name '*.la' -delete
+Line 707 
 find %{buildroot} -name '*.la' -delete
  %{_includedir}/gbm.h
  %{_libdir}/pkgconfig/gbm.pc
- %if %{with wayland}
+ %if %{?with_wayland_egl}
  %files -n %{libwaylandeglname}-devel
  %{_libdir}/libwayland-egl.so
  %{_libdir}/pkgconfig/wayland-egl.pc
-Line 714 
 find %{buildroot} -name '*.la' -delete
+Line 732 
 find %{buildroot} -name '*.la' -delete
  %files -n %{_lib}vdpau-driver-radeonsi
  %{_libdir}/vdpau/libvdpau_radeonsi.so.*
- %if %{enable_vulkan}
+ %files -n %{vulkandrivers}
- %files -n %{libvulkanname}_intel
  %dir %{_datadir}/vulkan
  %dir %{_datadir}/vulkan/icd.d
+ %ifarch %{ix86} x86_64
  %{_datadir}/vulkan/icd.d/intel_icd*.json
- # (akien) No lib major?
  %{_libdir}/libvulkan_intel.so
+ %endif
- %files -n %{libvulkanname}_radeon
- %dir %{_datadir}/vulkan
- %dir %{_datadir}/vulkan/icd.d
  %{_datadir}/vulkan/icd.d/radeon_icd*.json
- # (akien) No lib major?
  %{_libdir}/libvulkan_radeon.so
- %files -n %{libvulkanname}-devel
+ %files -n %{vulkandevel}
- %{_includedir}/vulkan/
+ %dir %{_includedir}/vulkan
+ %ifarch %{ix86} x86_64
+ %{_includedir}/vulkan/vulkan_intel.h
  %endif

 Legend:



Removed from v.1219359
 


changed lines


 
Added in v.1379265
 Legend:



Removed from v.1219359
 


changed lines


 
Added in v.1379265
-Removed from v.1219359
+Added in v.1379265

	ViewVC Help
Powered by ViewVC 1.1.30