From 6555dc013a19798613bc912c65db600003bbb543a02076a7598a63bfd4893467 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 20 Jun 2011 07:27:21 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/Mesa revision 121.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=226b21b6715da247d043a4b1a12b1339 --- Mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mesa.spec b/Mesa.spec index a471d6c..e4ad10e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -23,7 +23,7 @@ %define _version 7.10.2 Version: 7.10.2 -Release: 10 +Release: 12 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel From 3bb4a341a95e842745a0ad876843782bc2ba944a0a907d14321d57c4bd1fd3de Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 20 Jun 2011 15:06:49 +0000 Subject: [PATCH 2/4] - libdrm-2.4.26-nouveau.diff * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ... --> https://bugs.freedesktop.org/show_bug.cgi?id=35562 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=158 --- Mesa.changes | 7 ++ Mesa.spec | 2 + libdrm-2.4.26-nouveau.diff | 153 +++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 libdrm-2.4.26-nouveau.diff diff --git a/Mesa.changes b/Mesa.changes index 980fe56..6ead2b2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 20 15:05:42 UTC 2011 - sndirsch@novell.com + +- libdrm-2.4.26-nouveau.diff + * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ... + --> https://bugs.freedesktop.org/show_bug.cgi?id=35562 + ------------------------------------------------------------------- Thu Jun 16 15:55:44 UTC 2011 - mhopf@novell.com diff --git a/Mesa.spec b/Mesa.spec index e4ad10e..c48ebfb 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -53,6 +53,7 @@ Source5: drirc Patch8: egl-buildfix.diff 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 +Patch12: libdrm-2.4.26-nouveau.diff # already upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -143,6 +144,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch8 %patch9 -p1 %patch11 -p1 +%patch12 -p1 %build diff --git a/libdrm-2.4.26-nouveau.diff b/libdrm-2.4.26-nouveau.diff new file mode 100644 index 0000000..24586e2 --- /dev/null +++ b/libdrm-2.4.26-nouveau.diff @@ -0,0 +1,153 @@ +Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ... + + --> https://bugs.freedesktop.org/show_bug.cgi?id=35562 + +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c.ark 2011-04-11 10:26:00.717291484 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_clear.c 2011-04-11 10:26:05.600624698 +0200 +@@ -24,6 +24,8 @@ + #include "pipe/p_defines.h" + #include "pipe/p_state.h" + ++#include ++ + #include "nv50_context.h" + + void +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c.ark 2011-04-11 10:25:55.913958268 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_context.c 2011-04-11 10:26:00.663958154 +0200 +@@ -23,6 +23,8 @@ + #include "draw/draw_context.h" + #include "pipe/p_defines.h" + ++#include ++ + #include "nv50_context.h" + #include "nv50_screen.h" + #include "nv50_resource.h" +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c.ark 2011-04-11 10:25:50.250625073 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_push.c 2011-04-11 10:25:55.873958269 +0200 +@@ -4,6 +4,8 @@ + #include "util/u_format.h" + #include "util/u_split_prim.h" + ++#include ++ + #include "nv50_context.h" + #include "nv50_resource.h" + +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c.ark 2011-04-11 10:25:44.790625206 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_query.c 2011-04-11 10:25:50.183958407 +0200 +@@ -23,6 +23,8 @@ + #include "pipe/p_context.h" + #include "util/u_inlines.h" + ++#include ++ + #include "nv50_context.h" + + struct nv50_query { +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c.ark 2011-04-11 10:25:32.790625497 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_screen.c 2011-04-11 10:25:38.633958688 +0200 +@@ -23,6 +23,8 @@ + #include "util/u_format_s3tc.h" + #include "pipe/p_screen.h" + ++#include ++ + #include "nv50_context.h" + #include "nv50_screen.h" + #include "nv50_resource.h" +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c.ark 2011-04-11 10:25:38.710625354 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_shader_state.c 2011-04-11 10:25:44.713958540 +0200 +@@ -26,6 +26,8 @@ + #include "pipe/p_state.h" + #include "util/u_inlines.h" + ++#include ++ + #include "nv50_context.h" + + static void +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c.ark 2011-04-11 10:25:27.520625626 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_state_validate.c 2011-04-11 10:25:32.737292166 +0200 +@@ -22,6 +22,7 @@ + + #include "util/u_format.h" + ++#include + #include "nv50_context.h" + #include "nv50_resource.h" + #include "nouveau/nouveau_stateobj.h" +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c.ark 2011-04-11 10:25:22.407292417 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_surface.c 2011-04-11 10:25:27.450625628 +0200 +@@ -22,6 +22,7 @@ + + #define __NOUVEAU_PUSH_H__ + #include ++#include + #include "nouveau/nouveau_pushbuf.h" + #include "nv50_context.h" + #include "nv50_resource.h" +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c.ark 2011-04-11 10:25:14.903959267 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_transfer.c 2011-04-11 10:25:22.353959086 +0200 +@@ -4,6 +4,8 @@ + #include "util/u_format.h" + #include "util/u_math.h" + ++#include ++ + #include "nv50_context.h" + #include "nv50_transfer.h" + #include "nv50_resource.h" +--- Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c.ark 2011-04-11 10:25:01.717292921 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nv50/nv50_vbo.c 2011-04-11 10:25:14.850625935 +0200 +@@ -26,6 +26,8 @@ + #include "util/u_format.h" + #include "util/u_split_prim.h" + ++#include ++ + #include "nv50_context.h" + #include "nv50_resource.h" + +--- Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c.ark 2011-04-11 10:23:22.800628664 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nv04_2d.c 2011-04-11 10:25:01.640626257 +0200 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "nv04_2d.h" + + #include "nouveau/nv_object.xml.h" +--- Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c.ark 2011-04-11 10:27:59.380621927 +0200 ++++ Mesa-7.10.1/src/gallium/drivers/nvfx/nvfx_screen.c 2011-04-11 10:28:02.833955176 +0200 +@@ -3,6 +3,7 @@ + #include "util/u_format_s3tc.h" + #include "util/u_simple_screen.h" + ++#include + #include "nouveau/nouveau_screen.h" + #include "nouveau/nv_object.xml.h" + #include "nvfx_context.h" +--- Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c.ark 2011-04-11 10:27:27.220622711 +0200 ++++ Mesa-7.10.1/src/mesa/drivers/dri/nouveau/nv04_context.c 2011-04-11 11:09:24.147228063 +0200 +@@ -24,6 +24,8 @@ + * + */ + ++#include ++#include + #include "nouveau_driver.h" + #include "nouveau_context.h" + #include "nouveau_fbo.h" +--- Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h.orig 2011-06-20 16:48:59.000000000 +0200 ++++ Mesa-7.10.2/src/mesa/drivers/dri/nouveau/nouveau_driver.h 2011-06-20 16:49:16.000000000 +0200 +@@ -37,6 +37,7 @@ + #undef NDEBUG + #include + ++#include + #include "nouveau_device.h" + #include "nouveau_pushbuf.h" + #include "nouveau_grobj.h" From 9250536c0fce25be5a243e89c6642a5f3e0c9760545a68ab8c1a44ccfc82e650 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 21 Jun 2011 12:43:46 +0000 Subject: [PATCH 3/4] * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 (fdo #35562) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=159 --- Mesa.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 6ead2b2..9f147cf 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -2,8 +2,8 @@ Mon Jun 20 15:05:42 UTC 2011 - sndirsch@novell.com - libdrm-2.4.26-nouveau.diff - * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 ... - --> https://bugs.freedesktop.org/show_bug.cgi?id=35562 + * Fixes build of Mesa 7.10.2 nouveau driver with libdrm 2.4.26 + (fdo #35562) ------------------------------------------------------------------- Thu Jun 16 15:55:44 UTC 2011 - mhopf@novell.com From bc6377907ec1433108045ddba0eaece8823c85528b6ab8a380f77dae42c75b03 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 4 Jul 2011 09:47:56 +0000 Subject: [PATCH 4/4] Accepting request 75206 from home:vlj:branches:X11:XOrg - Update Mesa 7.10.3 * Few crashes and rendering fixes. OBS-URL: https://build.opensuse.org/request/show/75206 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=160 --- Mesa.changes | 6 ++++++ Mesa.spec | 4 ++-- MesaLib-7.10.2.tar.bz2 | 3 --- MesaLib-7.10.3.tar.bz2 | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 MesaLib-7.10.2.tar.bz2 create mode 100644 MesaLib-7.10.3.tar.bz2 diff --git a/Mesa.changes b/Mesa.changes index 9f147cf..ff9eb3d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 3 13:21:31 UTC 2011 - vljn@ovi.com + +- Update Mesa 7.10.3 + * Few crashes and rendering fixes. + ------------------------------------------------------------------- Mon Jun 20 15:05:42 UTC 2011 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index c48ebfb..27719cd 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -20,9 +20,9 @@ %define enable_nouveau_gallium 1 %define enable_radeon_gallium 1 -%define _version 7.10.2 +%define _version 7.10.3 -Version: 7.10.2 +Version: 7.10.3 Release: 12 Name: Mesa diff --git a/MesaLib-7.10.2.tar.bz2 b/MesaLib-7.10.2.tar.bz2 deleted file mode 100644 index c75adfc..0000000 --- a/MesaLib-7.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1 -size 5863551 diff --git a/MesaLib-7.10.3.tar.bz2 b/MesaLib-7.10.3.tar.bz2 new file mode 100644 index 0000000..e6d61e0 --- /dev/null +++ b/MesaLib-7.10.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39b307fcf910e4f4f43e515097dc4fd40d19323163c8e8e9af757dc686eb5751 +size 6686992