Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Tue Jun 14 10:55:33 CEST 2011.
-------- --- Mesa/Mesa.changes 2011-05-19 18:14:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2011-06-10 08:15:41.000000000 +0200 @@ -1,0 +2,35 @@ +Fri Jun 10 06:10:16 UTC 2011 - [email protected] + +- u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch: + Update this patch closing a giant memory leak. + +------------------------------------------------------------------- +Thu Jun 9 11:01:49 UTC 2011 - [email protected] + +- Replace patches: + * add: u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch + This patch falls back to indirect rendering if SWrast doesn't work + with older Xservers as no common configs/visuals can be found. + * remove: Mesa_indirect_old_xserver_compatibility.diff + this patch is superseded. + * rename: 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch + to u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch + +------------------------------------------------------------------- +Sat Jun 4 11:20:47 UTC 2011 - [email protected] + +- Remove: intel-add-gem-string.patch + This patch was barking up the wrong tree anyway. + As discussed with Martin Grässlin from the Kwin project + a patch from the upstream git master has been cherry-picked + and added to kdebase4-workspace which makes this patch unneciessary. + The patch to Kwin will become obsolete once Kwin is updated, + this will be noticed easily in kdebase4-workspace. + +------------------------------------------------------------------- +Tue May 24 19:49:12 UTC 2011 - [email protected] + +- Fix the driver directory search path in the spec file. + This makes dri_driver_dir.diff obsolete. + +------------------------------------------------------------------- @@ -5,0 +41,10 @@ + +------------------------------------------------------------------- +Tue May 17 07:31:21 UTC 2011 - [email protected] + +- Add packaging information for GLES2 devel files. + +------------------------------------------------------------------- +Mon May 16 18:23:39 UTC 2011 - [email protected] + +- Add GLES2 support. calling whatdependson for head-i586 Old: ---- 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Mesa_indirect_old_xserver_compatibility.diff dri_driver_dir.diff intel-add-gem-string.patch New: ---- u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.pM0RSR/_old 2011-06-14 10:53:50.000000000 +0200 +++ /var/tmp/diff_new_pack.pM0RSR/_new 2011-06-14 10:53:50.000000000 +0200 @@ -17,13 +17,13 @@ # norootforbuild -%define enable_nouveau 1 +%define enable_nouveau_gallium 1 %define enable_radeon_gallium 1 %define _version 7.10.2 Version: 7.10.2 -Release: 8 +Release: 10 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -50,13 +50,10 @@ Source3: README.updates Source4: manual-pages.tar.bz2 Source5: drirc -# add update path for dri drivers -Patch1: dri_driver_dir.diff -Patch2: intel-add-gem-string.patch # to be upstreamed Patch8: egl-buildfix.diff -Patch9: Mesa_indirect_old_xserver_compatibility.diff -Patch11: 0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch +Patch9: u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch +Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # already upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -144,12 +141,8 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} -%patch1 -%patch2 -sed -i 's/REPLACE/%_lib/g' src/glx/Makefile -sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 -%patch9 -p0 +%patch9 -p1 %patch11 -p1 %build @@ -161,14 +154,16 @@ autoreconf -fi ### libGL (disable savage/mga, bnc #402132/#403071; reenable mga, bnc #466635) %configure --disable-glw \ + --enable-gles2 \ --with-driver=dri \ + --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \ %ifarch %ix86 x86_64 %if 0%{?suse_version} >= 1130 --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast,nouveau,mga \ %else --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,swrast \ %endif -%if %enable_nouveau +%if %enable_nouveau_gallium --enable-gallium-nouveau \ %endif %if %enable_radeon_gallium @@ -182,7 +177,7 @@ %else --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,swrast \ %endif -%if %enable_nouveau +%if %enable_nouveau_gallium --enable-gallium-nouveau \ %endif %endif @@ -249,6 +244,8 @@ %defattr(-,root,root) %doc docs/*.html docs/*.spec %{_includedir}/GL +%{_includedir}/GLES +%{_includedir}/GLES2 %{_includedir}/EGL %{_includedir}/KHR %exclude %{_includedir}/GL/glew.h @@ -258,10 +255,14 @@ %{_libdir}/libGLU.so %{_libdir}/libOSMesa.so %{_libdir}/libEGL.so +%{_libdir}/libGLESv1_CM.so +%{_libdir}/libGLESv2.so %{_libdir}/pkgconfig/dri.pc %{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/gl.pc %{_libdir}/pkgconfig/glu.pc +%{_libdir}/pkgconfig/glesv1_cm.pc +%{_libdir}/pkgconfig/glesv2.pc %{_mandir}/man3/* %files nouveau3d ++++++ u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch ++++++ >From c588b0b65658821e6dbc6887ee07637a64d9c037 Mon Sep 17 00:00:00 2001 From: Egbert Eich <[email protected]> Date: Fri, 10 Jun 2011 07:59:21 +0200 Subject: [PATCH] [SWrast, BindTexImage] Fix crash in swrast when setting a texture for a pixmap. Patch-mainline: To be upstreamed When glXBindTexImageEXT is called and SWrast is used there will be a crash when sPriv->swrast_loader->getImage() is called from swrastSetTexBuffer2(). Reason: no memory has been allocated for the destination thus texImage->Data is NULL. Call ctx->Driver.TexImage2D() to initialize this. If memory has been allocated in a previous call free it first. Signed-off-by: Egbert Eich <[email protected]> --- src/mesa/drivers/dri/swrast/swrast.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index 719b406..02a668e 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -61,6 +61,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format, __DRIdrawable *dPriv) { + GET_CURRENT_CONTEXT(ctx); struct dri_context *dri_ctx; int x, y, w, h; __DRIscreen *sPriv = dPriv->driScreenPriv; @@ -90,6 +91,13 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage, w, h, 1, 0, internalFormat, texFormat); + if (texImage->Data) + ctx->Driver.FreeTexImageData(ctx, texImage); + + ctx->Driver.TexImage2D(ctx, target, 0, internalFormat, + w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, + NULL, &ctx->Unpack, texObj, texImage); + sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data, dPriv->loaderPrivate); -- 1.7.3.4 ++++++ u_GLX-SWrast-Make-GLX-with-SWrast-enabled-work-on-olde.patch ++++++ >From bb5ac44693cc6a50de068c729a089b7bdd6db4cd Mon Sep 17 00:00:00 2001 From: Egbert Eich <[email protected]> Date: Thu, 9 Jun 2011 12:42:59 +0200 Subject: [PATCH] [GLX/SWrast] Make GLX with SWrast enabled work on older Xservers. Patch-mainline: To be upstreamed Older Xservers don't offer a set of configs/visuals that is compatible with DRI. If no visuals or configs are found let driswCreateScreen() fail so that the next fallback path is take. Signed-off-by: Egbert Eich <[email protected]> --- src/glx/drisw_glx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 2eaa3c5..7bf29af 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -490,6 +490,9 @@ driswCreateScreen(int screen, struct glx_display *priv) psc->base.visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs); + if (psc->base.configs == NULL || psc->base.visuals == NULL) + goto handle_error; + psc->driver_configs = driver_configs; psc->base.vtable = &drisw_screen_vtable; -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
