]> git.pld-linux.org Git - packages/Mesa.git/blobdiff - Mesa.spec
projects / packages / Mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- don't mess libGL versions; nvidia libs don't even provide libGL in default linker...
[packages/Mesa.git] / Mesa.spec
diff --git a/Mesa.spec b/Mesa.spec
index 2deb8faf75bcf636d0886bb46a40740c062b8ab3..5e438da0c889de7ba0e95cd0962ac5256fcee08e 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -29,11 +29,11 @@
 # (until they start to be somehow versioned themselves)
 %define                glapi_ver               7.1.0
 # other packages
-%define                libdrm_ver              2.4.102
+%define                libdrm_ver              2.4.105
 %define                dri2proto_ver           2.8
 %define                glproto_ver             1.4.14
 %define                zlib_ver                1.2.8
-%define                wayland_ver             1.15
+%define                wayland_ver             1.18
 %define                llvm_ver                8.0.0
 %define                gcc_ver                 6:4.8.0
 
@@ -69,16 +69,16 @@
 Summary:       Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
-Version:       20.3.1
-Release:       3
+Version:       21.1.0
+Release:       1
 License:       MIT (core) and others - see license.html file
 Group:         X11/Libraries
 #Source0:      ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
 ## Source0-md5:        7c61a801311fb8d2f7b3cceb7b5cf308
 Source0:       https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
-# Source0-md5: a3bd3f3e958060257e049968d40836be
+# Source0-md5: 7482dd659c3708bdda247c96449d9d79
 Patch0:                nouveau_no_rtti.patch
-Patch1:                i9x5-tex-ignore-the-diff-between-GL_TEXTURE_2D-and-GL_TEXTURE_RECTANGLE.patch
+Patch1:                zink_x32.patch
 URL:           http://www.mesa3d.org/
 %{?with_opencl_spirv:BuildRequires:    SPIRV-LLVM-Translator-devel >= 8.0.1.3}
 %{?with_gallium_zink:BuildRequires:    Vulkan-Loader-devel}
@@ -112,7 +112,7 @@ BuildRequires:      pkgconfig(xcb-present) >= 1.13
 BuildRequires: pkgconfig(xcb-randr) >= 1.12
 BuildRequires: python3 >= 1:3.2
 BuildRequires: python3-Mako >= 0.8.0
-BuildRequires: rpmbuild(macros) >= 1.470
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sed >= 4.0
 %{?with_opencl_spirv:BuildRequires:    spirv-tools-devel >= 2018.0}
 # wayland-{client,server}
@@ -120,7 +120,6 @@ BuildRequires:      sed >= 4.0
 %{?with_wayland:BuildRequires: wayland-protocols >= 1.8}
 %{?with_wayland:BuildRequires: wayland-egl-devel >= %{wayland_ver}}
 BuildRequires: xorg-lib-libX11-devel
-BuildRequires: xorg-lib-libXdamage-devel >= 1.1
 BuildRequires: xorg-lib-libXext-devel >= 1.0.5
 BuildRequires: xorg-lib-libXfixes-devel >= 2.0
 BuildRequires: xorg-lib-libXrandr-devel >= 1.3
@@ -166,7 +165,7 @@ Requires:   %{name}-libglapi = %{version}-%{release}
 Requires:      OpenGL >= 1.2
 Requires:      libdrm >= %{libdrm_ver}
 Requires:      libxcb >= 1.13
-%{?with_wayland:Requires:      wayland >= 1.11.0}
+%{?with_wayland:Requires:      wayland >= %{wayland_ver}}
 %if %{with gbm}
 Requires:      %{name}-libgbm = %{version}-%{release}
 %endif
@@ -192,7 +191,6 @@ Requires:   %{name}-khrplatform-devel = %{version}-%{release}
 Requires:      %{name}-libEGL = %{version}-%{release}
 Requires:      libdrm-devel >= %{libdrm_ver}
 Requires:      xorg-lib-libX11-devel
-Requires:      xorg-lib-libXdamage-devel >= 1.1
 Requires:      xorg-lib-libXext-devel >= 1.0.5
 Requires:      xorg-lib-libXfixes-devel >= 2.0
 Requires:      xorg-lib-libXxf86vm-devel
@@ -230,7 +228,6 @@ Group:              X11/Libraries
 Requires:      %{name}-libglapi = %{version}-%{release}
 Requires:      libdrm >= %{libdrm_ver}
 Requires:      libxcb >= 1.13
-Requires:      xorg-lib-libXdamage >= 1.1
 Provides:      OpenGL = 4.6
 Provides:      OpenGL-GLX = 1.4
 Obsoletes:     Mesa
@@ -265,11 +262,9 @@ Summary:   Header files for Mesa3D libGL library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libGL z projektu Mesa3D
 License:       MIT
 Group:         X11/Development/Libraries
-# loose dependency on libGL to use with other libGL binaries
-Requires:      OpenGL >= 1.5
+Requires:      %{name}-libGL = %{version}-%{release}
 Requires:      libdrm-devel >= %{libdrm_ver}
 Requires:      xorg-lib-libX11-devel
-Requires:      xorg-lib-libXdamage-devel >= 1.1
 Requires:      xorg-lib-libXext-devel >= 1.0.5
 Requires:      xorg-lib-libXxf86vm-devel
 Requires:      xorg-proto-dri2proto-devel >= %{dri2proto_ver}
@@ -1383,6 +1378,7 @@ Requires: wayland >= %{wayland_ver}
 Requires:      zlib >= %{zlib_ver}
 Suggests:      vulkan(loader)
 Provides:      vulkan(icd) = 1.0.3
+Obsoletes:     Mesa-vulkan-icd-intel-devel < 21.1.0
 
 %description vulkan-icd-intel
 Mesa Vulkan driver for Intel GPUs.
@@ -1390,19 +1386,6 @@ Mesa Vulkan driver for Intel GPUs.
 %description vulkan-icd-intel -l pl.UTF-8
 Sterownik Vulkan dla GPU Intela.
 
-%package vulkan-icd-intel-devel
-Summary:       Header files for Mesa Intel GPU Vulkan driver
-Summary(pl.UTF-8):     Pliki nagłówkowe sterownika Vulkan dla GPU Intela
-License:       MIT
-Group:         Development/Libraries
-Requires:      %{name}-vulkan-icd-intel = %{version}-%{release}
-
-%description vulkan-icd-intel-devel
-eader files for Mesa Intel GPU Vulkan driver.
-
-%description vulkan-icd-intel-devel -l pl.UTF-8
-Pliki nagłówkowe sterownika Vulkan dla GPU Intel.
-
 %package vulkan-icd-lavapipe
 Summary:       lavapipe - Mesa software Vulkan driver
 Summary(pl.UTF-8):     lavapipe - programowy sterownik Vulkan
@@ -1482,7 +1465,6 @@ nouveau
 %ifarch %{arm} aarch64
 etnaviv \
 freedreno \
-kmsro \
 lima \
 panfrost \
 %{?with_gallium_nouveau:tegra} \
@@ -1532,20 +1514,20 @@ vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
        -Dlibunwind=enabled \
        -Dlmsensors=%{?with_lm_sensors:enabled}%{!?with_lm_sensors:disabled} \
        %{?with_opencl_spirv:-Dopencl-spirv=true} \
-       -Dosmesa=%{?with_gallium:gallium}%{!?with_gallium:classic} \
+       -Dosmesa=true \
        -Dselinux=true \
        -Dva-libs-path=%{_libdir}/libva/dri \
        -Dvulkan-drivers=${vulkan_drivers} \
        -Dvulkan-icd-dir=/usr/share/vulkan/icd.d
 
-%meson_build -C build
+%ninja_build -C build
 
-%{?with_tests:%meson_test -C build}
+%{?with_tests:%ninja_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 # not used externally
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libglapi.so
@@ -2047,10 +2029,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvulkan_intel.so
 %{_datadir}/vulkan/icd.d/intel_icd.*.json
-
-%files vulkan-icd-intel-devel
-%defattr(644,root,root,755)
-%{_includedir}/vulkan/vulkan_intel.h
 %endif
 
 %files vulkan-icd-lavapipe
Free OpenGL implementation
This page took 0.029027 seconds and 4 git commands to generate.