summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Palus2022-12-15 08:49:24 (GMT)
committerJan Palus2022-12-15 08:49:24 (GMT)
commit6195673d480519afd5b3ec7acef7b2bbbfbbc78e (patch)
tree0d18244ed7bbb2b16e2bd45e5e7c2809f411b2c9
parent958c933ebc086e0e568bc061cb651f89213699d1 (diff)
downloadMesa-6195673d480519afd5b3ec7acef7b2bbbfbbc78e.zip
Mesa-6195673d480519afd5b3ec7acef7b2bbbfbbc78e.tar.gz
-rw-r--r--Mesa.spec6
-rw-r--r--vdpau-virgl-only.patch31
2 files changed, 2 insertions, 35 deletions
diff --git a/Mesa.spec b/Mesa.spec
index 7309035..8204bc2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -73,15 +73,14 @@
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 22.3.0
+Version: 22.3.1
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://archive.mesa3d.org/mesa-%{version}.tar.xz
-# Source0-md5: f44da76e397e35a5dd9b35caa0a09dea
-Patch0: vdpau-virgl-only.patch
+# Source0-md5: 5644bca27c9be0092c98f1ec0e1bedd5
URL: https://www.mesa3d.org/
%if %{with opencl_spirv} || %{with gallium_rusticl}
BuildRequires: SPIRV-LLVM-Translator-devel >= 8.0.1.3
@@ -1460,7 +1459,6 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
%prep
%setup -q -n mesa-%{version}
-%patch0 -p1
%build
%if %{with opencl}
diff --git a/vdpau-virgl-only.patch b/vdpau-virgl-only.patch
deleted file mode 100644
index 5e602b6..0000000
--- a/vdpau-virgl-only.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 38acfe2b413242e436a2a715aa0071650d7bbd96 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Thu, 1 Dec 2022 18:32:53 +0100
-Subject: [PATCH] vdpau: allow building vdpau st with virgl only
-
-Fixes: 6b5aecb1955 ("virgl: add support for hardware video acceleration")
-
-Signed-off-by: Jan Palus <jpalus@fastmail.com>
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0118fdb9708..e636caa88f9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -666,9 +666,9 @@ elif not with_platform_x11
- _vdpau = 'disabled'
- endif
- elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
-- with_gallium_nouveau or with_gallium_d3d12_video)
-+ with_gallium_nouveau or with_gallium_d3d12_video or with_gallium_virgl)
- if _vdpau == 'enabled'
-- error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video).')
-+ error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video, virgl).')
- else
- _vdpau = 'disabled'
- endif
---
-2.38.1
-