rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 70726 from home:namtrac:branches:X11:XOrg

Browse Source 
Add intel-add-gem-string.patch. This reverts http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=b0a7492aebeb4517346f0da2362d6991a7385b59
because it breaks kwin, see http://blog.martin-graesslin.com/blog/2011/04/why-blur-does-not-work-in-kubuntu-natty-with-intel/

OBS-URL: https://build.opensuse.org/request/show/70726
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=152
This commit is contained in:
Stefan Dirsch 2011-05-20 12:23:37 +00:00 committed by Git OBS Bridge
parent ad062f7994
commit 343e848d3d
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 19 18:10:53 UTC 2011 - idoenmez@novell.com
- Add intel-add-gem-string.patch: Add back "GEM" string to Intel
driver's version output to fix OpenGL effects in kwin.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 6 16:46:21 UTC 2011 - mhopf@novell.com Fri May 6 16:46:21 UTC 2011 - mhopf@novell.com

2
Mesa.spec
View File

@ -52,6 +52,7 @@ Source4: manual-pages.tar.bz2
Source5: drirc Source5: drirc
# add update path for dri drivers # add update path for dri drivers
Patch1: dri_driver_dir.diff Patch1: dri_driver_dir.diff
Patch2: intel-add-gem-string.patch
# to be upstreamed # to be upstreamed
Patch8: egl-buildfix.diff Patch8: egl-buildfix.diff
Patch9: Mesa_indirect_old_xserver_compatibility.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff
@ -144,6 +145,7 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
# remove some docs # remove some docs
rm -rf docs/README.{VMS,WIN32,OS2} rm -rf docs/README.{VMS,WIN32,OS2}
%patch1 %patch1
%patch2
sed -i 's/REPLACE/%_lib/g' src/glx/Makefile sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
%patch8 %patch8

24
intel-add-gem-string.patch Normal file
View File

@ -0,0 +1,24 @@
Reverts http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=b0a7492aebeb4517346f0da2362d6991a7385b59
because it breaks kwin, see http://blog.martin-graesslin.com/blog/2011/04/why-blur-does-not-work-in-kubuntu-natty-with-intel/
--- src/mesa/drivers/dri/intel/intel_context.c 2011-03-01 22:35:03.000000000 +0100
+++ src/mesa/drivers/dri/intel/intel_context.c 2011-04-20 11:03:25.982000309 +0200
@@ -61,6 +61,8 @@
int INTEL_DEBUG = (0);
#endif
+#define DRIVER_DATE "20100330 DEVELOPMENT"
+#define DRIVER_DATE_GEM "GEM " DRIVER_DATE
static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
@@ -178,7 +180,7 @@
break;
}
- (void) driGetRendererString(buffer, chipset, "", 0);
+ (void) driGetRendererString(buffer, chipset, DRIVER_DATE_GEM, 0);
return (GLubyte *) buffer;
default: