Accepting request 42058 from X11:XOrg

checked in (request 42058)

OBS-URL: https://build.opensuse.org/request/show/42058
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=114

Mesa.changes

@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Fri Jun 25 11:15:20 CEST 2010 - sndirsch@suse.de
-
-- Mesa 7.8.2
-  * Various i965 and i915 driver fixes.
-- adjusted Mesa_indirect_old_xserver_compatibility.diff,
-  egl-buildfix.diff
-
 -------------------------------------------------------------------
 Wed Jun  9 08:52:41 UTC 2010 - bg@novell.com
 

Mesa.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package Mesa (Version 7.8.2)
+# spec file for package Mesa (Version 7.8.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -33,8 +33,8 @@ Obsoletes:      XFree86-Mesa-64bit
 Obsoletes:      Mesa-64bit
 %endif
 #
-%define _version 7.8.2
-Version:        7.8.2
+%define _version 7.8.1
+Version:        7.8.1
 Release:        5
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
 Source:         MesaLib-%{_version}.tar.bz2

MesaDemos-7.8.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9f20b9345240064ac35ec914ebce63322a96d3f7c566963791d0daf7e7a93e5
+size 16264038

MesaDemos-7.8.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c
-size 16264816

MesaLib-7.8.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa
+size 5137426

MesaLib-7.8.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d
-size 5138463

Mesa_indirect_old_xserver_compatibility.diff

@@ -1,6 +1,6 @@
---- src/glx/glxext.c.orig	2010-06-15 19:43:47.000000000 +0200
-+++ src/glx/glxext.c	2010-06-25 11:27:16.000000000 +0200
-@@ -891,9 +891,11 @@ __glXInitialize(Display * dpy)
+--- src/glx/glxext.c.orig	2010-05-22 15:57:21.000000000 +0200
++++ src/glx/glxext.c	2010-05-22 15:57:37.000000000 +0200
+@@ -820,9 +820,11 @@ __glXInitialize(Display * dpy)
        dpyPriv->dri2Display = dri2CreateDisplay(dpy);
        dpyPriv->driDisplay = driCreateDisplay(dpy);
     }
@@ -9,6 +9,6 @@
        dpyPriv->driswDisplay = driswCreateDisplay(dpy);
  #endif
 +#endif
- #ifdef GLX_USE_APPLEGL
-    if (apple_init_glx(dpy) || !AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
- #else
+ 
+    if (!AllocAndFetchScreenConfigs(dpy, dpyPriv)) {
+       __glXUnlock();

egl-buildfix.diff

@@ -3,8 +3,8 @@
 @@ -11,6 +11,6 @@
  	-I$(TOP)/src/egl/main
  
- EGL_CFLAGS = $(X11_CFLAGS)
--EGL_LIBS = $(X11_LIBS) -lGL
-+EGL_LIBS = $(X11_LIBS) -l$(GL_LIB)
+ EGL_CFLAGS =
+-EGL_LIBS = -lX11 -lGL
++EGL_LIBS = -lX11 -l$(GL_LIB)
  
  include ../Makefile.template