From 658b760b1b6a079ee48bdfc09d45ffc73cdf15f9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 26 Sep 2015 09:36:25 +0200 Subject: [PATCH] Revert "add patch for RHBZ #1265997" This reverts commit c6ea6505c2dcbf5bbd5f3583274f13be1ce3f669. --- ...ensions-restrict-GL_OES_EGL_image-to-GLES.patch | 14 -------------- mesa.spec | 4 ---- 2 files changed, 18 deletions(-) delete mode 100644 Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch diff --git a/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch b/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch deleted file mode 100644 index a0998e5..0000000 --- a/Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c -index 767c50e..b2c88c3 100644 ---- a/src/mesa/main/extensions.c -+++ b/src/mesa/main/extensions.c -@@ -307,7 +307,8 @@ static const struct extension extension_table[] = { - { "GL_OES_depth_texture_cube_map", o(OES_depth_texture_cube_map), ES2, 2012 }, - { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 }, - { "GL_OES_EGL_sync", o(dummy_true), ES1 | ES2, 2010 }, -- { "GL_OES_EGL_image", o(OES_EGL_image), ES1 | ES2, 2006 }, -+ /* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */ -+ { "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 }, - { "GL_OES_EGL_image_external", o(OES_EGL_image_external), ES1 | ES2, 2010 }, - { "GL_OES_element_index_uint", o(dummy_true), ES1 | ES2, 2005 }, - { "GL_OES_fbo_render_mipmap", o(dummy_true), ES1 | ES2, 2005 }, diff --git a/mesa.spec b/mesa.spec index e1aa304..6dcb6c1 100644 --- a/mesa.spec +++ b/mesa.spec @@ -79,8 +79,6 @@ Patch15: mesa-9.2-hardware-float.patch Patch20: mesa-10.2-evergreen-big-endian.patch Patch30: mesa-10.3-bigendian-assert.patch -Patch99: Mesa-dev-Revert-mesa-extensions-restrict-GL_OES_EGL_image-to-GLES.patch - # To have sha info in glxinfo BuildRequires: git-core @@ -356,8 +354,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