From 8664417a720c357c897f983793d6faa2e7388e258fed1d78065d7722bdf5adc8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 15 Sep 2010 04:19:54 +0000 Subject: [PATCH 1/6] - Mesa git master #fd328a (2010-09-11) - commit-4ebf07a.diff * glx: Don't destroy DRI2 drawables for legacy glx drawables (bfo #30109) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=123 --- Mesa.changes | 8 ++++++ Mesa.spec | 5 +++- MesaLib-7.8.2-2dfd348.tar.bz2 | 3 --- MesaLib-7.8.2-afd328a.tar.bz2 | 3 +++ commit-4ebf07a.diff | 51 +++++++++++++++++++++++++++++++++++ dri_driver_dir.diff | 4 +-- 6 files changed, 68 insertions(+), 6 deletions(-) delete mode 100644 MesaLib-7.8.2-2dfd348.tar.bz2 create mode 100644 MesaLib-7.8.2-afd328a.tar.bz2 create mode 100644 commit-4ebf07a.diff diff --git a/Mesa.changes b/Mesa.changes index 7a54372..f581712 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 15 03:54:37 UTC 2010 - sndirsch@novell.com + +- Mesa git master #fd328a (2010-09-11) +- commit-4ebf07a.diff + * glx: Don't destroy DRI2 drawables for legacy glx drawables + (bfo #30109) + ------------------------------------------------------------------- Thu Sep 9 12:45:55 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index 747632d..c233462 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-2dfd348.tar.bz2 +Source: MesaLib-%{_version}-afd328a.tar.bz2 Source1: MesaDemos-%{_version}.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -54,6 +54,8 @@ Patch1: dri_driver_dir.diff # to be upstreamed Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff +# already upstream +Patch10: commit-4ebf07a.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -145,6 +147,7 @@ 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 %build diff --git a/MesaLib-7.8.2-2dfd348.tar.bz2 b/MesaLib-7.8.2-2dfd348.tar.bz2 deleted file mode 100644 index ff952cd..0000000 --- a/MesaLib-7.8.2-2dfd348.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5067ec55c04cfc5b16d0fcb533c13452bee02fa1e2c6f805c117982d3f8af031 -size 6160002 diff --git a/MesaLib-7.8.2-afd328a.tar.bz2 b/MesaLib-7.8.2-afd328a.tar.bz2 new file mode 100644 index 0000000..818c437 --- /dev/null +++ b/MesaLib-7.8.2-afd328a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32f9a9f0f51318bc4fe9f99a52a6ab5d5a59ecb58c5c313fe672bb056d13be86 +size 6325581 diff --git a/commit-4ebf07a.diff b/commit-4ebf07a.diff new file mode 100644 index 0000000..88a9b33 --- /dev/null +++ b/commit-4ebf07a.diff @@ -0,0 +1,51 @@ +commit 4ebf07a426771b62123e5fcb5a8be0de24037af1 +Author: Kristian Høgsberg +Date: Mon Sep 13 08:39:42 2010 -0400 + + glx: Don't destroy DRI2 drawables for legacy glx drawables + + For GLX 1.3 drawables, we can destroy the DRI2 drawable when the GLX + drawable is destroyed. However, for legacy drawables, there os no + good way of knowing when the application is done with it, so we just + let the DRI2 drawable linger on the server. The server will destroy + the DRI2 drawable when it destroys the X drawable or the client exits + anyway. + + https://bugs.freedesktop.org/show_bug.cgi?id=30109 + +diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c +index e38a40c..8247588 100644 +--- a/src/glx/dri2_glx.c ++++ b/src/glx/dri2_glx.c +@@ -210,7 +210,17 @@ dri2DestroyDrawable(__GLXDRIdrawable *base) + + __glxHashDelete(pdp->dri2Hash, pdraw->base.xDrawable); + (*psc->core->destroyDrawable) (pdraw->driDrawable); +- DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); ++ ++ /* If it's a GLX 1.3 drawables, we can destroy the DRI2 drawable ++ * now, as the application explicitly asked to destroy the GLX ++ * drawable. Otherwise, for legacy drawables, we let the DRI2 ++ * drawable linger on the server, since there's no good way of ++ * knowing when the application is done with it. The server will ++ * destroy the DRI2 drawable when it destroys the X drawable or the ++ * client exits anyway. */ ++ if (pdraw->base.xDrawable != pdraw->base.drawable) ++ DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); ++ + Xfree(pdraw); + } + +diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c +index 1759e57..60b999f 100644 +--- a/src/mesa/vbo/vbo_exec_array.c ++++ b/src/mesa/vbo/vbo_exec_array.c +@@ -490,6 +490,8 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count) + if (!_mesa_validate_DrawArrays( ctx, mode, start, count )) + return; + ++ vbo_exec_FlushVertices_internal( ctx, GL_FALSE ); ++ + FLUSH_CURRENT( ctx, 0 ); + + if (!_mesa_valid_to_render(ctx, "glDrawArrays")) { diff --git a/dri_driver_dir.diff b/dri_driver_dir.diff index 476421d..3eaf99b 100644 --- a/dri_driver_dir.diff +++ b/dri_driver_dir.diff @@ -12,9 +12,9 @@ --- 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 + endif - EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \ + EXTRA_DEFINES = $(EXTRA_DEFINES_XF86VIDMODE) -D_REENTRANT \ - -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" + -DDEFAULT_DRIVER_DIR=\"/usr/REPLACE/dri/updates:/usr/REPLACE/dri\" From 9da57c981968d0566eeadf9ca8ee63e569fa435cf9f225d23eed5a14a6e526ad Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 15 Sep 2010 12:58:32 +0000 Subject: [PATCH 2/6] - Mesa git master #83f5f50 (2010-09-14) - obsoletes commit-4ebf07a.diff OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=124 --- Mesa.changes | 6 +++++ Mesa.spec | 4 +-- MesaLib-7.8.2-83f5f50.tar.bz2 | 3 +++ MesaLib-7.8.2-afd328a.tar.bz2 | 3 --- commit-4ebf07a.diff | 51 ----------------------------------- 5 files changed, 10 insertions(+), 57 deletions(-) create mode 100644 MesaLib-7.8.2-83f5f50.tar.bz2 delete mode 100644 MesaLib-7.8.2-afd328a.tar.bz2 delete mode 100644 commit-4ebf07a.diff diff --git a/Mesa.changes b/Mesa.changes index f581712..a814786 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 15 12:29:11 UTC 2010 - sndirsch@novell.com + +- Mesa git master #83f5f50 (2010-09-14) +- obsoletes commit-4ebf07a.diff + ------------------------------------------------------------------- Wed Sep 15 03:54:37 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index c233462..cfbf5c2 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-afd328a.tar.bz2 +Source: MesaLib-%{_version}-83f5f50.tar.bz2 Source1: MesaDemos-%{_version}.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -55,7 +55,6 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-4ebf07a.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -147,7 +146,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 %build diff --git a/MesaLib-7.8.2-83f5f50.tar.bz2 b/MesaLib-7.8.2-83f5f50.tar.bz2 new file mode 100644 index 0000000..6b1e400 --- /dev/null +++ b/MesaLib-7.8.2-83f5f50.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49829a9959e30ba4fd0cb88ca373152da28a089725ba615b2de6bf1cf4ed3629 +size 6337242 diff --git a/MesaLib-7.8.2-afd328a.tar.bz2 b/MesaLib-7.8.2-afd328a.tar.bz2 deleted file mode 100644 index 818c437..0000000 --- a/MesaLib-7.8.2-afd328a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32f9a9f0f51318bc4fe9f99a52a6ab5d5a59ecb58c5c313fe672bb056d13be86 -size 6325581 diff --git a/commit-4ebf07a.diff b/commit-4ebf07a.diff deleted file mode 100644 index 88a9b33..0000000 --- a/commit-4ebf07a.diff +++ /dev/null @@ -1,51 +0,0 @@ -commit 4ebf07a426771b62123e5fcb5a8be0de24037af1 -Author: Kristian Høgsberg -Date: Mon Sep 13 08:39:42 2010 -0400 - - glx: Don't destroy DRI2 drawables for legacy glx drawables - - For GLX 1.3 drawables, we can destroy the DRI2 drawable when the GLX - drawable is destroyed. However, for legacy drawables, there os no - good way of knowing when the application is done with it, so we just - let the DRI2 drawable linger on the server. The server will destroy - the DRI2 drawable when it destroys the X drawable or the client exits - anyway. - - https://bugs.freedesktop.org/show_bug.cgi?id=30109 - -diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c -index e38a40c..8247588 100644 ---- a/src/glx/dri2_glx.c -+++ b/src/glx/dri2_glx.c -@@ -210,7 +210,17 @@ dri2DestroyDrawable(__GLXDRIdrawable *base) - - __glxHashDelete(pdp->dri2Hash, pdraw->base.xDrawable); - (*psc->core->destroyDrawable) (pdraw->driDrawable); -- DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); -+ -+ /* If it's a GLX 1.3 drawables, we can destroy the DRI2 drawable -+ * now, as the application explicitly asked to destroy the GLX -+ * drawable. Otherwise, for legacy drawables, we let the DRI2 -+ * drawable linger on the server, since there's no good way of -+ * knowing when the application is done with it. The server will -+ * destroy the DRI2 drawable when it destroys the X drawable or the -+ * client exits anyway. */ -+ if (pdraw->base.xDrawable != pdraw->base.drawable) -+ DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); -+ - Xfree(pdraw); - } - -diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c -index 1759e57..60b999f 100644 ---- a/src/mesa/vbo/vbo_exec_array.c -+++ b/src/mesa/vbo/vbo_exec_array.c -@@ -490,6 +490,8 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count) - if (!_mesa_validate_DrawArrays( ctx, mode, start, count )) - return; - -+ vbo_exec_FlushVertices_internal( ctx, GL_FALSE ); -+ - FLUSH_CURRENT( ctx, 0 ); - - if (!_mesa_valid_to_render(ctx, "glDrawArrays")) { From 62d7c9e6ebb3fbe1f7906394786684b8b8ab5a51ff393a4ff043a0b33795c184 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 17 Sep 2010 19:04:05 +0000 Subject: [PATCH 3/6] Updating link to change in openSUSE:Factory/Mesa revision 96.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=cfed3f75dfa9a52e3b02c0f2af11ae15 --- Mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesa.spec b/Mesa.spec index cfbf5c2..8c500c8 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -22,7 +22,7 @@ %define _version 7.8.2 Version: 7.8.2 -Release: 6 +Release: 7 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel From 76dabd49b891ef603d948ef892ab2f77077b83246e4c7afffc5668697fbb3933 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 27 Sep 2010 19:27:00 +0000 Subject: [PATCH 4/6] - updated to MesaLib 7.9-RC1 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=126 --- Mesa.changes | 5 +++++ Mesa.spec | 15 +++++++-------- MesaDemos-7.8.2.tar.bz2 | 4 ++-- MesaLib-7.8.2-83f5f50.tar.bz2 | 3 --- MesaLib-7.9-rc1.tar.bz2 | 3 +++ 5 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 MesaLib-7.8.2-83f5f50.tar.bz2 create mode 100644 MesaLib-7.9-rc1.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index a814786..0b22201 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 27 18:28:46 UTC 2010 - sndirsch@novell.com + +- updated to MesaLib 7.9-RC1 + ------------------------------------------------------------------- Wed Sep 15 12:29:11 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index 8c500c8..68fb2ae 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.8.2) +# spec file for package Mesa (Version 7.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,10 @@ %define enable_nouveau 1 -%define _version 7.8.2 - -Version: 7.8.2 -Release: 7 +%define _version 7.9 +Version: 7.9 +Release: 6 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel BuildRequires: bison flex libtalloc-devel libxml2-python @@ -43,8 +42,8 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-83f5f50.tar.bz2 -Source1: MesaDemos-%{_version}.tar.bz2 +Source: MesaLib-%{_version}-rc1.tar.bz2 +Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -134,7 +133,7 @@ Authors: Francisco Jerez %prep -%setup -n %{name}-%{_version} -b1 -b4 -q +%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut diff --git a/MesaDemos-7.8.2.tar.bz2 b/MesaDemos-7.8.2.tar.bz2 index 681691b..636a0f8 100644 --- a/MesaDemos-7.8.2.tar.bz2 +++ b/MesaDemos-7.8.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c -size 16264816 +oid sha256:d577cf50cd5341c4bcdaf1528fe7090aca79e6b8486b7c9ffb3c166f3aa87716 +size 16293142 diff --git a/MesaLib-7.8.2-83f5f50.tar.bz2 b/MesaLib-7.8.2-83f5f50.tar.bz2 deleted file mode 100644 index 6b1e400..0000000 --- a/MesaLib-7.8.2-83f5f50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49829a9959e30ba4fd0cb88ca373152da28a089725ba615b2de6bf1cf4ed3629 -size 6337242 diff --git a/MesaLib-7.9-rc1.tar.bz2 b/MesaLib-7.9-rc1.tar.bz2 new file mode 100644 index 0000000..09d74e9 --- /dev/null +++ b/MesaLib-7.9-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:436d9a6597ca5bea292c6779ee60fc885ee484d48a06814b360041cadd00e745 +size 6250898 From d1ce452e4979027f4830292ea5ca974a13e3a9a8e76c5001a2381017588b936a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 27 Sep 2010 22:04:15 +0000 Subject: [PATCH 5/6] Accepting request 49266 from X11:XOrg checked in (request 49266) OBS-URL: https://build.opensuse.org/request/show/49266 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=127 --- Mesa.changes | 11 -------- Mesa.spec | 17 +++++++----- MesaDemos-7.8.2.tar.bz2 | 4 +-- MesaLib-7.8.2-afd328a.tar.bz2 | 3 +++ MesaLib-7.9-rc1.tar.bz2 | 3 --- commit-4ebf07a.diff | 51 +++++++++++++++++++++++++++++++++++ 6 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 MesaLib-7.8.2-afd328a.tar.bz2 delete mode 100644 MesaLib-7.9-rc1.tar.bz2 create mode 100644 commit-4ebf07a.diff diff --git a/Mesa.changes b/Mesa.changes index 0b22201..f581712 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Mon Sep 27 18:28:46 UTC 2010 - sndirsch@novell.com - -- updated to MesaLib 7.9-RC1 - -------------------------------------------------------------------- -Wed Sep 15 12:29:11 UTC 2010 - sndirsch@novell.com - -- Mesa git master #83f5f50 (2010-09-14) -- obsoletes commit-4ebf07a.diff - ------------------------------------------------------------------- Wed Sep 15 03:54:37 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index 68fb2ae..c8bee26 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.9) +# spec file for package Mesa (Version 7.8.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,11 @@ %define enable_nouveau 1 -%define _version 7.9 +%define _version 7.8.2 + +Version: 7.8.2 +Release: 7 -Version: 7.9 -Release: 6 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel BuildRequires: bison flex libtalloc-devel libxml2-python @@ -42,8 +43,8 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-rc1.tar.bz2 -Source1: MesaDemos-7.8.2.tar.bz2 +Source: MesaLib-%{_version}-afd328a.tar.bz2 +Source1: MesaDemos-%{_version}.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -54,6 +55,7 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream +Patch10: commit-4ebf07a.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -133,7 +135,7 @@ Authors: Francisco Jerez %prep -%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q +%setup -n %{name}-%{_version} -b1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut @@ -145,6 +147,7 @@ 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 %build diff --git a/MesaDemos-7.8.2.tar.bz2 b/MesaDemos-7.8.2.tar.bz2 index 636a0f8..681691b 100644 --- a/MesaDemos-7.8.2.tar.bz2 +++ b/MesaDemos-7.8.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d577cf50cd5341c4bcdaf1528fe7090aca79e6b8486b7c9ffb3c166f3aa87716 -size 16293142 +oid sha256:ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c +size 16264816 diff --git a/MesaLib-7.8.2-afd328a.tar.bz2 b/MesaLib-7.8.2-afd328a.tar.bz2 new file mode 100644 index 0000000..818c437 --- /dev/null +++ b/MesaLib-7.8.2-afd328a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32f9a9f0f51318bc4fe9f99a52a6ab5d5a59ecb58c5c313fe672bb056d13be86 +size 6325581 diff --git a/MesaLib-7.9-rc1.tar.bz2 b/MesaLib-7.9-rc1.tar.bz2 deleted file mode 100644 index 09d74e9..0000000 --- a/MesaLib-7.9-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:436d9a6597ca5bea292c6779ee60fc885ee484d48a06814b360041cadd00e745 -size 6250898 diff --git a/commit-4ebf07a.diff b/commit-4ebf07a.diff new file mode 100644 index 0000000..88a9b33 --- /dev/null +++ b/commit-4ebf07a.diff @@ -0,0 +1,51 @@ +commit 4ebf07a426771b62123e5fcb5a8be0de24037af1 +Author: Kristian Høgsberg +Date: Mon Sep 13 08:39:42 2010 -0400 + + glx: Don't destroy DRI2 drawables for legacy glx drawables + + For GLX 1.3 drawables, we can destroy the DRI2 drawable when the GLX + drawable is destroyed. However, for legacy drawables, there os no + good way of knowing when the application is done with it, so we just + let the DRI2 drawable linger on the server. The server will destroy + the DRI2 drawable when it destroys the X drawable or the client exits + anyway. + + https://bugs.freedesktop.org/show_bug.cgi?id=30109 + +diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c +index e38a40c..8247588 100644 +--- a/src/glx/dri2_glx.c ++++ b/src/glx/dri2_glx.c +@@ -210,7 +210,17 @@ dri2DestroyDrawable(__GLXDRIdrawable *base) + + __glxHashDelete(pdp->dri2Hash, pdraw->base.xDrawable); + (*psc->core->destroyDrawable) (pdraw->driDrawable); +- DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); ++ ++ /* If it's a GLX 1.3 drawables, we can destroy the DRI2 drawable ++ * now, as the application explicitly asked to destroy the GLX ++ * drawable. Otherwise, for legacy drawables, we let the DRI2 ++ * drawable linger on the server, since there's no good way of ++ * knowing when the application is done with it. The server will ++ * destroy the DRI2 drawable when it destroys the X drawable or the ++ * client exits anyway. */ ++ if (pdraw->base.xDrawable != pdraw->base.drawable) ++ DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); ++ + Xfree(pdraw); + } + +diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c +index 1759e57..60b999f 100644 +--- a/src/mesa/vbo/vbo_exec_array.c ++++ b/src/mesa/vbo/vbo_exec_array.c +@@ -490,6 +490,8 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count) + if (!_mesa_validate_DrawArrays( ctx, mode, start, count )) + return; + ++ vbo_exec_FlushVertices_internal( ctx, GL_FALSE ); ++ + FLUSH_CURRENT( ctx, 0 ); + + if (!_mesa_valid_to_render(ctx, "glDrawArrays")) { From e6af22d4fe6904309e270fd6bba67d6e62bccd905233766a2af4a476ed8d0995 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 27 Sep 2010 22:04:19 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/Mesa revision 97.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=e9e590b1a5df186a614d13a5c71d0dbd --- Mesa.changes | 11 ++++++++ Mesa.spec | 16 +++++------ MesaDemos-7.8.2.tar.bz2 | 4 +-- MesaLib-7.8.2-afd328a.tar.bz2 | 3 --- MesaLib-7.9-rc1.tar.bz2 | 3 +++ commit-4ebf07a.diff | 51 ----------------------------------- 6 files changed, 23 insertions(+), 65 deletions(-) delete mode 100644 MesaLib-7.8.2-afd328a.tar.bz2 create mode 100644 MesaLib-7.9-rc1.tar.bz2 delete mode 100644 commit-4ebf07a.diff diff --git a/Mesa.changes b/Mesa.changes index f581712..0b22201 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Sep 27 18:28:46 UTC 2010 - sndirsch@novell.com + +- updated to MesaLib 7.9-RC1 + +------------------------------------------------------------------- +Wed Sep 15 12:29:11 UTC 2010 - sndirsch@novell.com + +- Mesa git master #83f5f50 (2010-09-14) +- obsoletes commit-4ebf07a.diff + ------------------------------------------------------------------- Wed Sep 15 03:54:37 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index c8bee26..e233574 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.8.2) +# spec file for package Mesa (Version 7.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ %define enable_nouveau 1 -%define _version 7.8.2 +%define _version 7.9 -Version: 7.8.2 -Release: 7 +Version: 7.9 +Release: 1 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -43,8 +43,8 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-afd328a.tar.bz2 -Source1: MesaDemos-%{_version}.tar.bz2 +Source: MesaLib-%{_version}-rc1.tar.bz2 +Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -55,7 +55,6 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-4ebf07a.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +134,7 @@ Authors: Francisco Jerez %prep -%setup -n %{name}-%{_version} -b1 -b4 -q +%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut @@ -147,7 +146,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 %build diff --git a/MesaDemos-7.8.2.tar.bz2 b/MesaDemos-7.8.2.tar.bz2 index 681691b..636a0f8 100644 --- a/MesaDemos-7.8.2.tar.bz2 +++ b/MesaDemos-7.8.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c -size 16264816 +oid sha256:d577cf50cd5341c4bcdaf1528fe7090aca79e6b8486b7c9ffb3c166f3aa87716 +size 16293142 diff --git a/MesaLib-7.8.2-afd328a.tar.bz2 b/MesaLib-7.8.2-afd328a.tar.bz2 deleted file mode 100644 index 818c437..0000000 --- a/MesaLib-7.8.2-afd328a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32f9a9f0f51318bc4fe9f99a52a6ab5d5a59ecb58c5c313fe672bb056d13be86 -size 6325581 diff --git a/MesaLib-7.9-rc1.tar.bz2 b/MesaLib-7.9-rc1.tar.bz2 new file mode 100644 index 0000000..09d74e9 --- /dev/null +++ b/MesaLib-7.9-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:436d9a6597ca5bea292c6779ee60fc885ee484d48a06814b360041cadd00e745 +size 6250898 diff --git a/commit-4ebf07a.diff b/commit-4ebf07a.diff deleted file mode 100644 index 88a9b33..0000000 --- a/commit-4ebf07a.diff +++ /dev/null @@ -1,51 +0,0 @@ -commit 4ebf07a426771b62123e5fcb5a8be0de24037af1 -Author: Kristian Høgsberg -Date: Mon Sep 13 08:39:42 2010 -0400 - - glx: Don't destroy DRI2 drawables for legacy glx drawables - - For GLX 1.3 drawables, we can destroy the DRI2 drawable when the GLX - drawable is destroyed. However, for legacy drawables, there os no - good way of knowing when the application is done with it, so we just - let the DRI2 drawable linger on the server. The server will destroy - the DRI2 drawable when it destroys the X drawable or the client exits - anyway. - - https://bugs.freedesktop.org/show_bug.cgi?id=30109 - -diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c -index e38a40c..8247588 100644 ---- a/src/glx/dri2_glx.c -+++ b/src/glx/dri2_glx.c -@@ -210,7 +210,17 @@ dri2DestroyDrawable(__GLXDRIdrawable *base) - - __glxHashDelete(pdp->dri2Hash, pdraw->base.xDrawable); - (*psc->core->destroyDrawable) (pdraw->driDrawable); -- DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); -+ -+ /* If it's a GLX 1.3 drawables, we can destroy the DRI2 drawable -+ * now, as the application explicitly asked to destroy the GLX -+ * drawable. Otherwise, for legacy drawables, we let the DRI2 -+ * drawable linger on the server, since there's no good way of -+ * knowing when the application is done with it. The server will -+ * destroy the DRI2 drawable when it destroys the X drawable or the -+ * client exits anyway. */ -+ if (pdraw->base.xDrawable != pdraw->base.drawable) -+ DRI2DestroyDrawable(psc->base.dpy, pdraw->base.xDrawable); -+ - Xfree(pdraw); - } - -diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c -index 1759e57..60b999f 100644 ---- a/src/mesa/vbo/vbo_exec_array.c -+++ b/src/mesa/vbo/vbo_exec_array.c -@@ -490,6 +490,8 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count) - if (!_mesa_validate_DrawArrays( ctx, mode, start, count )) - return; - -+ vbo_exec_FlushVertices_internal( ctx, GL_FALSE ); -+ - FLUSH_CURRENT( ctx, 0 ); - - if (!_mesa_valid_to_render(ctx, "glDrawArrays")) {