From b3e1e62c45f525cdd332073aaa34d8452cb23374 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 19 Nov 2012 10:47:23 +0100 Subject: git update 19 nov 2012 fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50 --- fontconfig/src/fcint.h | 22 + fontconfig/src/fcmatch.c | 63 +- fontconfig/src/fcpat.c | 146 +- libxcb/src/c_client.py | 8 +- mesalib/Makefile.am | 64 +- mesalib/acinclude.m4 | 2 +- mesalib/bin/get-pick-list.sh | 4 +- mesalib/configs/current.in | 2 +- mesalib/configure.ac | 8 +- mesalib/docs/README.VMS | 38 - mesalib/docs/index.html | 8 + mesalib/docs/relnotes-9.0.1.html | 167 ++ mesalib/docs/relnotes-9.1.html | 1 + mesalib/docs/relnotes.html | 1 + mesalib/include/EGL/eglext.h | 10 +- mesalib/include/GL/glx.h | 13 - mesalib/include/GL/vms_x_fix.h | 1224 ------------ mesalib/include/GLES/glext.h | 219 ++- mesalib/include/GLES2/gl2.h | 5 +- mesalib/include/GLES2/gl2ext.h | 318 +++- mesalib/src/gallium/auxiliary/Makefile | 1 + mesalib/src/gallium/auxiliary/util/u_blitter.c | 8 +- mesalib/src/gallium/auxiliary/util/u_debug.h | 2 +- mesalib/src/gallium/auxiliary/util/u_format.c | 26 +- mesalib/src/gallium/auxiliary/util/u_prim.h | 2 + mesalib/src/gallium/auxiliary/util/u_rect.h | 15 + mesalib/src/gallium/auxiliary/util/u_snprintf.c | 2 +- mesalib/src/gallium/auxiliary/util/u_string.h | 4 +- mesalib/src/gallium/auxiliary/util/u_surface.c | 88 +- mesalib/src/glsl/Android.mk | 4 +- mesalib/src/glsl/Makefile.am | 1 - mesalib/src/glsl/Makefile.sources | 10 +- mesalib/src/glsl/SConscript | 2 +- mesalib/src/glsl/builtin_compiler/Makefile.am | 3 +- mesalib/src/glsl/glcpp/Makefile.am | 2 + mesalib/src/glsl/glcpp/glcpp-parse.y | 83 +- mesalib/src/glsl/linker.cpp | 3 +- .../src/glsl/lower_vec_index_to_cond_assign.cpp | 16 +- .../mapi/glapi/gen/APPLE_vertex_array_object.xml | 6 +- .../src/mapi/glapi/gen/ARB_color_buffer_float.xml | 3 +- mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml | 9 +- .../src/mapi/glapi/gen/ARB_draw_buffers_blend.xml | 9 +- .../src/mapi/glapi/gen/ARB_framebuffer_object.xml | 71 +- .../src/mapi/glapi/gen/ARB_geometry_shader4.xml | 2 +- .../src/mapi/glapi/gen/ARB_instanced_arrays.xml | 2 +- .../mapi/glapi/gen/ARB_texture_buffer_object.xml | 2 +- .../src/mapi/glapi/gen/ARB_vertex_array_object.xml | 6 +- mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml | 12 +- .../src/mapi/glapi/gen/EXT_framebuffer_object.xml | 84 +- mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml | 46 +- .../src/mapi/glapi/gen/EXT_provoking_vertex.xml | 4 +- mesalib/src/mapi/glapi/gen/EXT_texture_array.xml | 5 +- mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml | 8 +- .../src/mapi/glapi/gen/EXT_transform_feedback.xml | 14 +- mesalib/src/mapi/glapi/gen/GL3x.xml | 86 +- .../src/mapi/glapi/gen/NV_conditional_render.xml | 4 +- .../src/mapi/glapi/gen/NV_primitive_restart.xml | 2 +- mesalib/src/mapi/glapi/gen/OES_fixed_point.xml | 191 +- .../src/mapi/glapi/gen/OES_single_precision.xml | 20 +- mesalib/src/mapi/glapi/gen/es_EXT.xml | 73 +- mesalib/src/mapi/glapi/gen/gl_API.dtd | 3 +- mesalib/src/mapi/glapi/gen/gl_API.xml | 1946 ++++++++++---------- mesalib/src/mapi/glapi/gen/gl_XML.py | 52 +- mesalib/src/mapi/glapi/gen/gl_and_es_API.xml | 172 +- mesalib/src/mapi/glapi/gen/gl_genexec.py | 5 +- mesalib/src/mesa/Android.gen.mk | 21 - mesalib/src/mesa/Android.libmesa_dricore.mk | 67 + mesalib/src/mesa/Android.libmesa_glsl_utils.mk | 59 + mesalib/src/mesa/Android.libmesa_st_mesa.mk | 65 + mesalib/src/mesa/Android.mesa_gen_matypes.mk | 48 + mesalib/src/mesa/Android.mk | 135 +- mesalib/src/mesa/Makefile.am | 28 +- mesalib/src/mesa/SConscript | 1 + mesalib/src/mesa/descrip.mms | 27 - mesalib/src/mesa/drivers/common/descrip.mms | 42 - mesalib/src/mesa/drivers/common/meta.c | 266 +-- mesalib/src/mesa/drivers/dri/common/utils.c | 22 +- mesalib/src/mesa/drivers/dri/swrast/swrast.c | 4 +- mesalib/src/mesa/main/api_arrayelt.c | 32 +- mesalib/src/mesa/main/api_loopback.c | 854 ++++----- mesalib/src/mesa/main/api_loopback.h | 416 ++--- mesalib/src/mesa/main/arbprogram.c | 10 +- mesalib/src/mesa/main/arbprogram.h | 6 +- mesalib/src/mesa/main/arrayobj.c | 4 +- mesalib/src/mesa/main/arrayobj.h | 4 +- mesalib/src/mesa/main/attrib.c | 40 +- mesalib/src/mesa/main/blend.c | 20 +- mesalib/src/mesa/main/blend.h | 16 +- mesalib/src/mesa/main/bufferobj.c | 40 +- mesalib/src/mesa/main/bufferobj.h | 22 +- mesalib/src/mesa/main/buffers.c | 4 +- mesalib/src/mesa/main/buffers.h | 2 +- mesalib/src/mesa/main/compiler.h | 6 +- mesalib/src/mesa/main/descrip.mms | 258 --- mesalib/src/mesa/main/dlist.c | 474 ++--- mesalib/src/mesa/main/drawtex.c | 12 +- mesalib/src/mesa/main/drawtex.h | 12 +- mesalib/src/mesa/main/enable.c | 6 +- mesalib/src/mesa/main/enable.h | 6 +- mesalib/src/mesa/main/es1_conversion.c | 100 +- mesalib/src/mesa/main/es1_conversion.h | 94 +- mesalib/src/mesa/main/fbobject.c | 54 +- mesalib/src/mesa/main/fbobject.h | 38 +- mesalib/src/mesa/main/ffvertex_prog.c | 2 - mesalib/src/mesa/main/get.c | 4 +- mesalib/src/mesa/main/get.h | 4 +- mesalib/src/mesa/main/hash.c | 371 ++-- mesalib/src/mesa/main/hash.h | 4 - mesalib/src/mesa/main/hash_table.c | 442 +++++ mesalib/src/mesa/main/hash_table.h | 107 ++ mesalib/src/mesa/main/imports.c | 5 +- mesalib/src/mesa/main/imports.h | 2 - mesalib/src/mesa/main/light.c | 2 +- mesalib/src/mesa/main/light.h | 2 +- mesalib/src/mesa/main/matrix.c | 8 +- mesalib/src/mesa/main/matrix.h | 8 +- mesalib/src/mesa/main/mtypes.h | 3 +- mesalib/src/mesa/main/multisample.c | 2 +- mesalib/src/mesa/main/multisample.h | 2 +- mesalib/src/mesa/main/querymatrix.c | 2 +- mesalib/src/mesa/main/querymatrix.h | 2 +- mesalib/src/mesa/main/queryobj.c | 40 +- mesalib/src/mesa/main/queryobj.h | 20 +- mesalib/src/mesa/main/rastpos.c | 32 +- mesalib/src/mesa/main/rastpos.h | 32 +- mesalib/src/mesa/main/readpix.c | 22 +- mesalib/src/mesa/main/shader_query.cpp | 6 +- mesalib/src/mesa/main/shaderapi.c | 36 +- mesalib/src/mesa/main/shaderapi.h | 18 +- mesalib/src/mesa/main/syncobj.c | 11 +- mesalib/src/mesa/main/texgetimage.c | 2 +- mesalib/src/mesa/main/texgetimage.h | 2 +- mesalib/src/mesa/main/teximage.c | 54 +- mesalib/src/mesa/main/teximage.h | 20 +- mesalib/src/mesa/main/texobj.c | 14 +- mesalib/src/mesa/main/texstate.c | 4 +- mesalib/src/mesa/main/texstate.h | 4 +- mesalib/src/mesa/main/texstorage.c | 4 +- mesalib/src/mesa/main/transformfeedback.c | 3 +- mesalib/src/mesa/main/transformfeedback.h | 3 +- mesalib/src/mesa/main/uniform_query.cpp | 2 +- mesalib/src/mesa/main/uniforms.c | 44 +- mesalib/src/mesa/main/uniforms.h | 46 +- mesalib/src/mesa/main/varray.c | 24 +- mesalib/src/mesa/main/varray.h | 22 +- mesalib/src/mesa/main/vsnprintf.c | 165 -- mesalib/src/mesa/math/descrip.mms | 47 - mesalib/src/mesa/program/.gitignore | 1 + mesalib/src/mesa/program/Android.mk | 84 + mesalib/src/mesa/program/Makefile.am | 57 + mesalib/src/mesa/program/descrip.mms | 93 - mesalib/src/mesa/program/prog_execute.c | 11 - mesalib/src/mesa/sources.mak | 47 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 100 +- mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 28 +- mesalib/src/mesa/swrast/descrip.mms | 82 - mesalib/src/mesa/swrast_setup/descrip.mms | 42 - mesalib/src/mesa/tnl/descrip.mms | 68 - mesalib/src/mesa/vbo/descrip.mms | 62 - pixman/pixman/pixman-arm-simd.c | 2 +- pixman/pixman/pixman-fast-path.c | 4 +- pixman/pixman/pixman-matrix.c | 15 +- pixman/pixman/pixman-mips-dspr2-asm.S | 424 +++++ pixman/pixman/pixman-mips-dspr2.c | 29 +- pixman/pixman/pixman-mips-dspr2.h | 82 + pixman/pixman/pixman-mmx.c | 60 +- pixman/pixman/pixman-ppc.c | 6 +- pixman/pixman/pixman-sse2.c | 120 +- pixman/pixman/pixman.c | 2 +- pixman/pixman/pixman.h | 3 + pixman/test/glyph-test.c | 4 +- pixman/test/utils.c | 6 +- xorg-server/Xi/xipassivegrab.c | 8 +- xorg-server/Xi/xiquerypointer.c | 17 +- xorg-server/dix/enterleave.c | 5 +- xorg-server/dix/eventconvert.c | 4 +- xorg-server/dix/events.c | 8 +- xorg-server/dix/getevents.c | 13 +- xorg-server/hw/xfree86/os-support/linux/lnx_init.c | 33 +- xorg-server/hw/xquartz/bundle/Info.plist.cpp | 2 + xorg-server/include/eventconvert.h | 2 - xorg-server/include/xkbsrv.h | 17 - xorg-server/test/xi2/protocol-eventconvert.c | 4 +- xorg-server/xfixes/cursor.c | 4 + xorg-server/xkb/Makefile.am | 3 +- xorg-server/xkb/ddxList.c | 302 --- xorg-server/xkb/xkb.c | 50 +- xorg-server/xkeyboard-config/rules/base.xml.in | 6 + xorg-server/xkeyboard-config/symbols/us | 69 + 189 files changed, 5944 insertions(+), 6431 deletions(-) delete mode 100644 mesalib/docs/README.VMS create mode 100644 mesalib/docs/relnotes-9.0.1.html delete mode 100644 mesalib/include/GL/vms_x_fix.h create mode 100644 mesalib/src/mesa/Android.libmesa_dricore.mk create mode 100644 mesalib/src/mesa/Android.libmesa_glsl_utils.mk create mode 100644 mesalib/src/mesa/Android.libmesa_st_mesa.mk create mode 100644 mesalib/src/mesa/Android.mesa_gen_matypes.mk delete mode 100644 mesalib/src/mesa/descrip.mms delete mode 100644 mesalib/src/mesa/drivers/common/descrip.mms delete mode 100644 mesalib/src/mesa/main/descrip.mms create mode 100644 mesalib/src/mesa/main/hash_table.c create mode 100644 mesalib/src/mesa/main/hash_table.h delete mode 100644 mesalib/src/mesa/main/vsnprintf.c delete mode 100644 mesalib/src/mesa/math/descrip.mms create mode 100644 mesalib/src/mesa/program/Android.mk create mode 100644 mesalib/src/mesa/program/Makefile.am delete mode 100644 mesalib/src/mesa/program/descrip.mms delete mode 100644 mesalib/src/mesa/swrast/descrip.mms delete mode 100644 mesalib/src/mesa/swrast_setup/descrip.mms delete mode 100644 mesalib/src/mesa/tnl/descrip.mms delete mode 100644 mesalib/src/mesa/vbo/descrip.mms delete mode 100644 xorg-server/xkb/ddxList.c diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index c07857502..e9f315f6b 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -923,15 +923,37 @@ FcObjectFini (void); FcPrivate FcValue FcValueCanonicalize (const FcValue *v); +FcPrivate FcValueListPtr +FcValueListCreate (void); + FcPrivate void FcValueListDestroy (FcValueListPtr l); +FcPrivate FcValueListPtr +FcValueListPrepend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding); + +FcPrivate FcValueListPtr +FcValueListAppend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding); + +FcPrivate FcValueListPtr +FcValueListDuplicate(FcValueListPtr orig); + FcPrivate FcPatternElt * FcPatternObjectFindElt (const FcPattern *p, FcObject object); FcPrivate FcPatternElt * FcPatternObjectInsertElt (FcPattern *p, FcObject object); +FcPrivate FcBool +FcPatternObjectListAdd (FcPattern *p, + FcObject object, + FcValueListPtr list, + FcBool append); + FcPrivate FcBool FcPatternObjectAddWithBinding (FcPattern *p, FcObject object, diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 623538bd3..970339201 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -432,7 +432,7 @@ FcFontRenderPrepare (FcConfig *config, FcPattern *new; int i; FcPatternElt *fe, *pe, *fel, *pel; - FcValue v, vl; + FcValue v; FcResult result; assert (pat != NULL); @@ -440,7 +440,7 @@ FcFontRenderPrepare (FcConfig *config, new = FcPatternCreate (); if (!new) - return 0; + return NULL; for (i = 0; i < font->num; i++) { fe = &FcPatternElts(font)[i]; @@ -478,47 +478,74 @@ FcFontRenderPrepare (FcConfig *config, FcPatternEltValues(fe), &v, NULL, NULL, &result)) { FcPatternDestroy (new); - return 0; + return NULL; } if (fel && pel) { int n = 1, j; + FcValueListPtr l1, l2, ln = NULL, ll = NULL; match = FcObjectToMatcher (pel->object, FcTrue); if (!FcCompareValueList (pel->object, match, FcPatternEltValues (pel), - FcPatternEltValues (fel), &vl, NULL, &n, &result)) + FcPatternEltValues (fel), NULL, NULL, &n, &result)) { FcPatternDestroy (new); return NULL; } - else - { - FcValueListPtr l; - for (j = 0, l = FcPatternEltValues (fe); - j < n && l != NULL; - j++, l = FcValueListNext (l)); - if (l) - v = FcValueCanonicalize (&l->value); + for (j = 0, l1 = FcPatternEltValues (fe), l2 = FcPatternEltValues (fel); + l1 != NULL || l2 != NULL; + j++, l1 = l1 ? FcValueListNext (l1) : NULL, l2 = l2 ? FcValueListNext (l2) : NULL) + { + if (j == n) + { + if (l1) + ln = FcValueListPrepend (ln, + FcValueCanonicalize (&l1->value), + FcValueBindingStrong); + if (l2) + ll = FcValueListPrepend (ll, + FcValueCanonicalize (&l2->value), + FcValueBindingStrong); + } else - v = FcValueCanonicalize (&FcPatternEltValues (fe)->value); + { + if (l1) + ln = FcValueListAppend (ln, + FcValueCanonicalize (&l1->value), + FcValueBindingStrong); + if (l2) + ll = FcValueListAppend (ll, + FcValueCanonicalize (&l2->value), + FcValueBindingStrong); + } } + FcPatternObjectListAdd (new, fe->object, ln, FcFalse); + FcPatternObjectListAdd (new, fel->object, ll, FcFalse); + + continue; } else if (fel) { - vl = FcValueCanonicalize (&FcPatternEltValues (fel)->value); + FcValueListPtr l1, l2; + + copy_lang: + l1 = FcValueListDuplicate (FcPatternEltValues (fe)); + l2 = FcValueListDuplicate (FcPatternEltValues (fel)); + FcPatternObjectListAdd (new, fe->object, l1, FcFalse); + FcPatternObjectListAdd (new, fel->object, l2, FcFalse); + + continue; } } else { - v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); if (fel) - vl = FcValueCanonicalize (&FcPatternEltValues (fel)->value); + goto copy_lang; + v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); } FcPatternObjectAdd (new, fe->object, v, FcFalse); - if (fel) - FcPatternObjectAdd (new, fel->object, vl, FcFalse); } for (i = 0; i < pat->num; i++) { diff --git a/fontconfig/src/fcpat.c b/fontconfig/src/fcpat.c index ebd6e57e2..62e47ca7e 100644 --- a/fontconfig/src/fcpat.c +++ b/fontconfig/src/fcpat.c @@ -120,6 +120,20 @@ FcValueSave (FcValue v) return v; } +FcValueListPtr +FcValueListCreate (void) +{ + FcValueListPtr ret; + + ret = calloc (1, sizeof (FcValueList)); + if (ret) + { + FcMemAlloc(FC_MEM_VALLIST, sizeof (FcValueList)); + } + + return ret; +} + void FcValueListDestroy (FcValueListPtr l) { @@ -151,6 +165,81 @@ FcValueListDestroy (FcValueListPtr l) } } +FcValueListPtr +FcValueListPrepend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding) +{ + FcValueListPtr new; + + if (value.type == FcTypeVoid) + return vallist; + new = FcValueListCreate (); + if (!new) + return vallist; + + new->value = FcValueSave (value); + new->binding = binding; + new->next = vallist; + + return new; +} + +FcValueListPtr +FcValueListAppend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding) +{ + FcValueListPtr new, last; + + if (value.type == FcTypeVoid) + return vallist; + new = FcValueListCreate (); + if (!new) + return vallist; + + new->value = FcValueSave (value); + new->binding = binding; + new->next = NULL; + + if (vallist) + { + for (last = vallist; FcValueListNext (last); last = FcValueListNext (last)); + + last->next = new; + } + else + vallist = new; + + return vallist; +} + +FcValueListPtr +FcValueListDuplicate(FcValueListPtr orig) +{ + FcValueListPtr new = NULL, l, t = NULL; + FcValue v; + + for (l = orig; l != NULL; l = FcValueListNext (l)) + { + if (!new) + { + t = new = FcValueListCreate(); + } + else + { + t->next = FcValueListCreate(); + t = FcValueListNext (t); + } + v = FcValueCanonicalize (&l->value); + t->value = FcValueSave (v); + t->binding = l->binding; + t->next = NULL; + } + + return new; +} + FcBool FcValueEqual (FcValue va, FcValue vb) { @@ -460,6 +549,59 @@ FcPatternEqualSubset (const FcPattern *pai, const FcPattern *pbi, const FcObject return FcTrue; } +FcBool +FcPatternObjectListAdd (FcPattern *p, + FcObject object, + FcValueListPtr list, + FcBool append) +{ + FcPatternElt *e; + FcValueListPtr l, *prev; + + if (p->ref == FC_REF_CONSTANT) + goto bail0; + + /* + * Make sure the stored type is valid for built-in objects + */ + for (l = list; l != NULL; l = FcValueListNext (l)) + { + if (!FcObjectValidType (object, l->value.type)) + { + if (FcDebug() & FC_DBG_OBJTYPES) + { + printf ("FcPattern object %s does not accept value ", + FcObjectName (object)); + FcValuePrint (l->value); + } + goto bail0; + } + } + + e = FcPatternObjectInsertElt (p, object); + if (!e) + goto bail0; + + if (append) + { + for (prev = &e->values; *prev; prev = &(*prev)->next) + ; + *prev = list; + } + else + { + for (prev = &list; *prev; prev = &(*prev)->next) + ; + *prev = e->values; + e->values = list; + } + + return FcTrue; + +bail0: + return FcFalse; +} + FcBool FcPatternObjectAddWithBinding (FcPattern *p, FcObject object, @@ -473,12 +615,10 @@ FcPatternObjectAddWithBinding (FcPattern *p, if (p->ref == FC_REF_CONSTANT) goto bail0; - new = malloc (sizeof (FcValueList)); + new = FcValueListCreate (); if (!new) goto bail0; - memset(new, 0, sizeof (FcValueList)); - FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList)); value = FcValueSave (value); if (value.type == FcTypeVoid) goto bail1; diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 27a01b193..ec66223f1 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -2616,7 +2616,7 @@ def _man_request(self, name, cookie_type, void, aux): (cookie_type, self.c_reply_name, base_func_name)) f.write('.SH ERRORS\n') if hasattr(self, "doc") and self.doc: - for errtype, errtext in self.doc.errors.iteritems(): + for errtype, errtext in self.doc.errors.items(): f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error')))) errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext) f.write('%s\n' % (errtext)) @@ -2634,7 +2634,7 @@ def _man_request(self, name, cookie_type, void, aux): see = ['.BR %s (3)' % 'xcb-requests'] if self.doc.example: see.append('.BR %s (3)' % 'xcb-examples') - for seename, seetype in self.doc.see.iteritems(): + for seename, seetype in self.doc.see.items(): if seetype == 'program': see.append('.BR %s (1)' % seename) elif seetype == 'event': @@ -2764,7 +2764,7 @@ def _man_event(self, name): see = ['.BR %s (3)' % 'xcb_generic_event_t'] if self.doc.example: see.append('.BR %s (3)' % 'xcb-examples') - for seename, seetype in self.doc.see.iteritems(): + for seename, seetype in self.doc.see.items(): if seetype == 'program': see.append('.BR %s (1)' % seename) elif seetype == 'event': @@ -2908,7 +2908,7 @@ Refer to the README file in xcb/proto for more info. # Ensure the man subdirectory exists try: os.mkdir('man') -except OSError, e: +except OSError as e: if e.errno != errno.EEXIST: raise diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 5e0071c04..b22458ec8 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -61,7 +61,15 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) EXTRA_FILES = \ aclocal.m4 \ configure \ + bin/ar-lib \ + bin/compile \ + bin/config.sub \ + bin/config.guess \ + bin/depcomp \ bin/install-sh \ + bin/ltmain.sh \ + bin/missing \ + bin/ylwrap \ src/glsl/glsl_parser.cc \ src/glsl/glsl_parser.h \ src/glsl/glsl_lexer.cc \ @@ -76,7 +84,59 @@ EXTRA_FILES = \ src/mesa/main/api_exec_es2_remap_helper.h \ src/mesa/program/lex.yy.c \ src/mesa/program/program_parse.tab.c \ - src/mesa/program/program_parse.tab.h + src/mesa/program/program_parse.tab.h \ + src/gallium/drivers/r600/Makefile.in \ + src/gallium/drivers/r300/Makefile.in \ + src/gallium/drivers/Makefile.in \ + src/gallium/Makefile.in \ + src/gallium/auxiliary/pipe-loader/Makefile.in \ + src/gallium/targets/opencl/Makefile.in \ + src/gallium/state_trackers/clover/Makefile.in \ + src/mapi/glapi/tests/Makefile.in \ + src/mapi/glapi/Makefile.in \ + src/mapi/glapi/gen/Makefile.in \ + src/mapi/es1api/Makefile.in \ + src/mapi/shared-glapi/tests/Makefile.in \ + src/mapi/shared-glapi/Makefile.in \ + src/mapi/vgapi/Makefile.in \ + src/mapi/es2api/Makefile.in \ + src/glsl/tests/Makefile.in \ + src/glsl/glcpp/Makefile.in \ + src/glsl/builtin_compiler/Makefile.in \ + src/glsl/Makefile.in \ + src/gtest/Makefile.in \ + src/egl/drivers/Makefile.in \ + src/egl/drivers/glx/Makefile.in \ + src/egl/drivers/dri2/Makefile.in \ + src/egl/Makefile.in \ + src/egl/main/Makefile.in \ + src/egl/wayland/Makefile.in \ + src/egl/wayland/wayland-drm/Makefile.in \ + src/egl/wayland/wayland-egl/Makefile.in \ + src/Makefile.in \ + src/glx/tests/Makefile.in \ + src/glx/Makefile.in \ + src/gbm/Makefile.in \ + src/mesa/drivers/Makefile.in \ + src/mesa/drivers/dri/common/Makefile.in \ + src/mesa/drivers/dri/i965/Makefile.in \ + src/mesa/drivers/dri/r200/Makefile.in \ + src/mesa/drivers/dri/Makefile.in \ + src/mesa/drivers/dri/radeon/Makefile.in \ + src/mesa/drivers/dri/swrast/Makefile.in \ + src/mesa/drivers/dri/nouveau/Makefile.in \ + src/mesa/drivers/dri/i915/Makefile.in \ + src/mesa/drivers/osmesa/Makefile.in \ + src/mesa/drivers/x11/Makefile.in \ + src/mesa/Makefile.in \ + src/mesa/libdricore/Makefile.in \ + src/mesa/x86-64/Makefile.in \ + src/mesa/program/Makefile.in \ + src/mesa/main/tests/Makefile.in \ + src/mesa/main/tests/hash_table/Makefile.in \ + src/mesa/x86/Makefile.in \ + Makefile.in + IGNORE_FILES = \ -x autogen.sh @@ -86,7 +146,7 @@ parsers: configure -@touch $(top_builddir)/configs/current $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h - $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h + $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h # Everything for new a Mesa release: ARCHIVES = $(PACKAGE_NAME).tar.gz \ diff --git a/mesalib/acinclude.m4 b/mesalib/acinclude.m4 index a5b389d5d..aba48a362 100644 --- a/mesalib/acinclude.m4 +++ b/mesalib/acinclude.m4 @@ -17,7 +17,7 @@ AC_DEFUN([MESA_PIC_FLAGS], AC_ARG_VAR([PIC_FLAGS], [compiler flags for PIC code]) AC_ARG_ENABLE([pic], [AS_HELP_STRING([--disable-pic], - [compile PIC objects @<:@default=enabled for shared builds + [don't compile PIC objects @<:@default=enabled for shared builds on supported platforms@:>@])], [enable_pic="$enableval" test "x$enable_pic" = x && enable_pic=auto], diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh index 72880907b..a141afe26 100644 --- a/mesalib/bin/get-pick-list.sh +++ b/mesalib/bin/get-pick-list.sh @@ -12,8 +12,8 @@ git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' while read sha do # Check to see whether the patch is on the ignore list. - if [ -f .git/cherry-ignore ] ; then - if grep -q ^$sha .git/cherry-ignore ; then + if [ -f bin/.cherry-ignore ] ; then + if grep -q ^$sha bin/.cherry-ignore ; then continue fi fi diff --git a/mesalib/configs/current.in b/mesalib/configs/current.in index 1802271f9..62edfa5da 100644 --- a/mesalib/configs/current.in +++ b/mesalib/configs/current.in @@ -144,7 +144,7 @@ GLAPI_LIB_DEPS = @GLAPI_LIB_DEPS@ DRI_LIB_DEPS = @DRI_LIB_DEPS@ GALLIUM_DRI_LIB_DEPS = @GALLIUM_DRI_LIB_DEPS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ -LIBDRM_LIB = @LIBDRM_LIBS@ +LIBDRM_LIBS = @LIBDRM_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ GLPROTO_CFLAGS = @GLPROTO_CFLAGS@ EXPAT_INCLUDES = @EXPAT_INCLUDES@ diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 9a3fde185..f484dc4d6 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -877,7 +877,7 @@ cygwin*) esac AC_ARG_ENABLE([driglx-direct], [AS_HELP_STRING([--disable-driglx-direct], - [enable direct rendering in GLX and EGL for DRI \ + [disable direct rendering in GLX and EGL for DRI \ @<:@default=auto@:>@])], [driglx_direct="$enableval"], [driglx_direct="$driglx_direct_default"]) @@ -1675,8 +1675,8 @@ if test "x$enable_gallium_llvm" = xyes; then fi LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` - LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags` - LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags` + LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g' -e 's/-Wcovered-switch-default//g'` + LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g' -e 's/-Wcovered-switch-default//g'` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` DEFINES="${DEFINES} -DHAVE_LLVM=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/0x0\10\2/g'`" @@ -2013,6 +2013,8 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/x11/Makefile src/mesa/libdricore/Makefile src/mesa/main/tests/Makefile + src/mesa/main/tests/hash_table/Makefile + src/mesa/program/Makefile src/mesa/x86-64/Makefile src/mesa/x86/Makefile]) diff --git a/mesalib/docs/README.VMS b/mesalib/docs/README.VMS deleted file mode 100644 index 6b02909d5..000000000 --- a/mesalib/docs/README.VMS +++ /dev/null @@ -1,38 +0,0 @@ - -VMS support contributed by Jouk Jansen (joukj@hrem.stm.tudelft.nl) - - -The latest version was tested on a VMSAlpha7.2 system using DECC6.0, but -probably also works for other versions. - -At the moment only the libraries LIBMESGL.EXE/LIBMESGL.OLB, -LIBMESAGLU.EXE/LIBMESAGLU.OLB and LIBGLUT.EXE/LIBGLUT.OLB and the demos of the -directory [.DEMOS] can be build. -However, feel free to create the missing "decrip.mms-files" in the other -directories. - - The make files were tested -using the DIGITAL make utility called MMS. There is also a public domain -clone available (MMK) and I think, but it is not tested, that this -utility will give (hardly) any problem. - -To make everything just type MMS (or MMK) in the main directory of -mesagl. For MMS the deafult makefile is called descrip.mms, and -that is what I have called it. I included alse some config files, -all having mms somewhere in the name which all the makefiles need -(just as your unix makefiles). - -On Alpha platforms at default a sharable images for the libraries are created. -To get a static library make it by typing MMS/MACRO=(NOSHARE=1). -On VAX platforms only static libraries can be build. - -23-sep-2005 -changed default compilation to use /float=ieee/ieee=denorm. The reason for -this is that it makes Mesa on OpenVMS better compatible with other platforms -and other packages for VMS that I maintain. -For more information see - http://nchrem.tnw.tudelft.nl/openvms - https://bugs.freedesktop.org/show_bug.cgi?id=4270 -You may want to compile Mesa to use VAX-floating point arithmetic, instead -of IEEE floating point by removing the /float=IEEE/denorm flag from the -compiler options in the descrip.mms files. diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index ba0b21044..546a32f53 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,14 @@

News

+

November 16, 2012

+ +

+Mesa 9.0.1 is released. +This is a bug fix release. +

+ +

October 24, 2012

diff --git a/mesalib/docs/relnotes-9.0.1.html b/mesalib/docs/relnotes-9.0.1.html new file mode 100644 index 000000000..50e8b70fd --- /dev/null +++ b/mesalib/docs/relnotes-9.0.1.html @@ -0,0 +1,167 @@ + + + + + Mesa Release Notes + + + + +

+

The Mesa 3D Graphics Library

+
+ + +
+ +

Mesa 9.0.1 Release Notes / November 16th, 2012

+ +

+Mesa 9.0.1 is a bug fix release which fixes bugs found since the 9.0 release. +

+

+Mesa 9.0 implements the OpenGL 3.1 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.1. OpenGL +3.1 is only available if requested at context creation +because GL_ARB_compatibility is not supported. +

+ +

MD5 checksums

+
+97d6554c05ea7449398afe3a0ede7018  MesaLib-9.0.1.tar.bz2
+fd0fd5a6e56bc3dd210c80e42baef975  MesaLib-9.0.1.tar.gz
+c2683d957acd530a00f747f50317186f  MesaLib-9.0.1.zip
+
+ +

New features

+

None.

+ +

Bug fixes

+ +

This list is likely incomplete.

+ + + + +

Changes

+

The full set of changes can be viewed by using the following GIT command:

+ +
+  git log mesa-9.0..mesa-9.0.1
+
+ +

Adam Jackson (1):

+ + +

Andreas Boll (7):

+ + +

Brian Paul (2):

+ + +

Fredrik Höglund (1):

+ + +

Ian Romanick (5):

+ + +

Imre Deak (7):

+ + +

Jonas Ådahl (1):

+ + +

Kenneth Graunke (1):

+ + +

Kristian Høgsberg (5):

+ + +

Marcin Slusarz (1):

+ + +

Matt Turner (4):

+ + +

Michel Dänzer (2):

+ + +

Owen W. Taylor (1):

+ + +

Quentin Glidic (1):

+ + +

Tomeu Vizoso (1):

+ + +
+ + diff --git a/mesalib/docs/relnotes-9.1.html b/mesalib/docs/relnotes-9.1.html index 97247fb3a..3a8c77bfc 100644 --- a/mesalib/docs/relnotes-9.1.html +++ b/mesalib/docs/relnotes-9.1.html @@ -61,6 +61,7 @@ Note: some of the new features are only available with certain drivers.
  • Removed i965's broken hardware implementation of GL_NV_vertex_program
  • Removed swrast support for GL_NV_vertex_program
  • Removed swrast support for GL_NV_fragment_program
    • +
  • Removed OpenVMS support (unmaintained and broken)
    • diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index ab8a70671..a4654025e 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -22,6 +22,7 @@ The release notes summarize what's new or changed in each Mesa release.