diff --git a/Mesa.changes b/Mesa.changes index 6f0e39b..8e1d08c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Aug 29 05:05:58 CEST 2010 - sndirsch@suse.de + +- Mesa git master #2dfd348 (2010-08-28) +- obsoletes libdrm_nouveau.diff.bz2, mesa-commit-06c72da.diff +- adjusted Mesa_indirect_old_xserver_compatibility.diff, + dri_driver_dir.diff +- added libtalloc-devel bison flex libxml2-python to BuildRequires +- pkgconfig file for egl + ------------------------------------------------------------------- Fri Jul 23 22:52:14 CEST 2010 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index 7dd9646..c2534b0 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -26,6 +26,7 @@ Release: 3 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel +BuildRequires: libtalloc-devel bison flex libxml2-python %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -42,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}.tar.bz2 +Source: MesaLib-%{_version}-2dfd348.tar.bz2 Source1: MesaDemos-%{_version}.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -53,8 +54,6 @@ Patch1: dri_driver_dir.diff # to be upstreamed Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff -Patch10: mesa-commit-06c72da.diff -Patch11: libdrm_nouveau.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -146,8 +145,6 @@ sed -i 's/REPLACE/%_lib/g' src/glx/Makefile sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 -%patch10 -p1 -%patch11 -p1 %build @@ -247,6 +244,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %{_libdir}/libEGL.so %{_libdir}/pkgconfig/dri.pc +%{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/gl.pc %{_libdir}/pkgconfig/glu.pc %{_mandir}/man3/* diff --git a/MesaLib-7.8.2-2dfd348.tar.bz2 b/MesaLib-7.8.2-2dfd348.tar.bz2 new file mode 100644 index 0000000..ff952cd --- /dev/null +++ b/MesaLib-7.8.2-2dfd348.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5067ec55c04cfc5b16d0fcb533c13452bee02fa1e2c6f805c117982d3f8af031 +size 6160002 diff --git a/MesaLib-7.8.2.tar.bz2 b/MesaLib-7.8.2.tar.bz2 deleted file mode 100644 index 1e5fb30..0000000 --- a/MesaLib-7.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d -size 5138463 diff --git a/Mesa_indirect_old_xserver_compatibility.diff b/Mesa_indirect_old_xserver_compatibility.diff index ac6317d..baef3de 100644 --- a/Mesa_indirect_old_xserver_compatibility.diff +++ b/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-08-29 00:02:42.000000000 +0200 ++++ src/glx/glxext.c 2010-08-29 04:35:37.000000000 +0200 +@@ -858,9 +858,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 (!applegl_create_display(dpyPriv)) { diff --git a/dri_driver_dir.diff b/dri_driver_dir.diff index 005bfd4..476421d 100644 --- a/dri_driver_dir.diff +++ b/dri_driver_dir.diff @@ -1,16 +1,16 @@ ---- src/egl/drivers/dri2/Makefile -+++ src/egl/drivers/dri2/Makefile +--- src/egl/drivers/dri2/Makefile.orig 2010-08-29 00:00:43.000000000 +0200 ++++ src/egl/drivers/dri2/Makefile 2010-08-29 04:25:53.000000000 +0200 @@ -10,7 +10,7 @@ -I$(TOP)/include \ -I$(TOP)/src/egl/main \ - -I$(TOP)/src/mesa \ + -I$(TOP)/src/mapi \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ + -DDEFAULT_DRIVER_DIR=\"/usr/REPLACE/dri/updates:/usr/REPLACE/dri\" \ - $(EGL_DRI2_CFLAGS) - - EGL_LIBS = $(EGL_DRI2_LIBS) ---- src/glx/Makefile -+++ src/glx/Makefile + $(XCB_DRI2_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ + $(LIBDRM_CFLAGS) +--- src/glx/Makefile.orig 2010-08-29 00:02:39.000000000 +0200 ++++ src/glx/Makefile 2010-08-29 04:30:33.000000000 +0200 @@ -2,7 +2,7 @@ include $(TOP)/configs/current @@ -19,4 +19,4 @@ + -DDEFAULT_DRIVER_DIR=\"/usr/REPLACE/dri/updates:/usr/REPLACE/dri\" SOURCES = \ - glcontextmodes.c \ + clientattrib.c \ diff --git a/libdrm_nouveau.diff.bz2 b/libdrm_nouveau.diff.bz2 deleted file mode 100644 index 184a4eb..0000000 --- a/libdrm_nouveau.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0490134931762050b739cd735ea70e2605c53b1031e580a2d0092abd05583704 -size 38449 diff --git a/mesa-commit-06c72da.diff b/mesa-commit-06c72da.diff deleted file mode 100644 index c1d92df..0000000 --- a/mesa-commit-06c72da.diff +++ /dev/null @@ -1,20 +0,0 @@ -commit 06c72da97a1bce87bc4b3fb8e7e18bf966926acb -Author: Kristian Høgsberg -Date: Tue May 4 13:35:23 2010 -0400 - - intel: Update renderbuffers unconditionally in intelSetTexBuffer2() - -diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c -index 9db96ac..a0e734b 100644 ---- a/src/mesa/drivers/dri/intel/intel_tex_image.c -+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c -@@ -728,8 +728,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, - if (!intelObj) - return; - -- if (dPriv->lastStamp != dPriv->dri2.stamp) -- intel_update_renderbuffers(pDRICtx, dPriv); -+ intel_update_renderbuffers(pDRICtx, dPriv); - - rb = intel_get_renderbuffer(fb, BUFFER_FRONT_LEFT); - /* If the region isn't set, then intel_update_renderbuffers was unable