From 789515fb02d6b7eba07676033e836c96de7bd7f0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 2 Dec 2015 12:52:20 +0100 Subject: [PATCH] drop applied virgl patch Signed-off-by: Igor Gnatenko --- ...pe_virgl_create_screen-is-not-static.patch | 27 ------------------- mesa.spec | 5 ---- 2 files changed, 32 deletions(-) delete mode 100644 0001-virgl-pipe_virgl_create_screen-is-not-static.patch diff --git a/0001-virgl-pipe_virgl_create_screen-is-not-static.patch b/0001-virgl-pipe_virgl_create_screen-is-not-static.patch deleted file mode 100644 index 1d8ceb0..0000000 --- a/0001-virgl-pipe_virgl_create_screen-is-not-static.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d94d9236e40f8fdf93dd791c8ead803caeb0fbdc Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 22 Nov 2015 10:10:01 +0100 -Subject: [PATCH] virgl: pipe_virgl_create_screen is not static - -Reference: https://bugs.freedesktop.org/show_bug.cgi?id=93063 -Signed-off-by: Igor Gnatenko ---- - src/gallium/auxiliary/target-helpers/drm_helper.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h -index 73a80b6..332b1cb 100644 ---- a/src/gallium/auxiliary/target-helpers/drm_helper.h -+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h -@@ -223,7 +223,7 @@ pipe_freedreno_create_screen(int fd) - #include "virgl/drm/virgl_drm_public.h" - #include "virgl/virgl_public.h" - --static struct pipe_screen * -+struct pipe_screen * - pipe_virgl_create_screen(int fd) - { - struct virgl_winsys *vws; --- -2.6.3 - diff --git a/mesa.spec b/mesa.spec index 855e1e4..15a6840 100644 --- a/mesa.spec +++ b/mesa.spec @@ -74,9 +74,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -# http://lists.freedesktop.org/archives/mesa-dev/2015-November/101074.html -Patch99: 0001-virgl-pipe_virgl_create_screen-is-not-static.patch - # To have sha info in glxinfo BuildRequires: git-core @@ -352,8 +349,6 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1 %patch20 -p1 -b .egbe %patch30 -p1 -b .beassert -%patch99 -p1 - %if 0%{with_private_llvm} sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac