From 889d7dd8e94a5538f388cc619115bf5c0b6fc0b7 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 10 Sep 2013 09:01:25 +0200 Subject: fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013 xserver commit 47ff382d1fce25a8b097d45b79489e891f1f1228 libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9 libX11 commit cb107760df33ffc8630677e66e2e50aa37950a5c libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 fontconfig commit a61e145304da86c8c35b137493bbd8fd5dd1e7f5 mesa commit 395b9410860371a64d6b5f2d50679f29eb41729e --- fontconfig/src/fcfreetype.c | 15 +- libX11/configure.ac | 2 +- libXmu/COPYING | 5 +- libXmu/configure.ac | 2 +- libxcb/src/xcb.h | 1 - libxcb/src/xcb_conn.c | 4 +- mesalib/configure.ac | 32 - mesalib/docs/devinfo.html | 23 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/9.3.html | 61 + mesalib/docs/specs/MESA_shader_integer_mix.spec | 135 + mesalib/include/GL/internal/dri_interface.h | 1 + mesalib/m4/ax_prog_cc_for_build.m4 | 125 - mesalib/m4/ax_prog_cxx_for_build.m4 | 109 - mesalib/src/glsl/.gitignore | 2 - mesalib/src/glsl/Android.mk | 26 - mesalib/src/glsl/Makefile.am | 17 +- mesalib/src/glsl/Makefile.sources | 18 +- mesalib/src/glsl/SConscript | 66 +- mesalib/src/glsl/ast_function.cpp | 35 +- mesalib/src/glsl/ast_to_hir.cpp | 2 +- mesalib/src/glsl/builtin_compiler/.gitignore | 5 - mesalib/src/glsl/builtin_compiler/Makefile.am | 98 - .../src/glsl/builtin_compiler/builtin_stubs.cpp | 39 - mesalib/src/glsl/builtin_functions.cpp | 3542 ++++++++++++++++++++ mesalib/src/glsl/glcpp/glcpp-parse.y | 3 + mesalib/src/glsl/glsl_parser_extras.cpp | 3 +- mesalib/src/glsl/glsl_parser_extras.h | 4 +- mesalib/src/glsl/ir.cpp | 71 +- mesalib/src/glsl/ir.h | 58 +- mesalib/src/glsl/ir_builder.cpp | 129 +- mesalib/src/glsl/ir_builder.h | 28 +- mesalib/src/glsl/ir_clone.cpp | 2 +- mesalib/src/glsl/ir_constant_expression.cpp | 10 +- mesalib/src/glsl/ir_function.cpp | 19 +- mesalib/src/glsl/ir_reader.cpp | 18 +- mesalib/src/glsl/ir_validate.cpp | 7 + mesalib/src/glsl/link_functions.cpp | 9 +- mesalib/src/glsl/linker.cpp | 8 +- mesalib/src/glsl/lower_packed_varyings.cpp | 2 +- mesalib/src/glsl/main.cpp | 2 +- mesalib/src/glsl/opt_dead_builtin_varyings.cpp | 8 +- mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/mtypes.h | 3 +- mesalib/src/mesa/main/queryobj.c | 2 +- mesalib/src/mesa/main/samplerobj.c | 3 +- mesalib/src/mesa/main/texstate.c | 8 + mesalib/src/mesa/program/ir_to_mesa.cpp | 3 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 +- mesalib/src/mesa/vbo/vbo_exec.c | 12 + xorg-server/Makefile.am | 2 + xorg-server/configure.ac | 1 + xorg-server/hw/xquartz/Makefile.am | 4 +- xorg-server/hw/xquartz/pseudoramiX.c | 516 --- xorg-server/hw/xquartz/pseudoramiX.h | 10 - xorg-server/hw/xwin/InitInput.c | 1 - xorg-server/hw/xwin/InitOutput.c | 4 + xorg-server/hw/xwin/Makefile.am | 1 + xorg-server/hw/xwin/winauth.c | 7 +- xorg-server/hw/xwin/winclipboard.h | 3 - xorg-server/hw/xwin/winclipboardwndproc.c | 11 - xorg-server/hw/xwin/winclipboardwrappers.c | 2 - xorg-server/hw/xwin/wincursor.c | 43 +- xorg-server/hw/xwin/winglobals.c | 1 - xorg-server/hw/xwin/winglobals.h | 3 +- xorg-server/hw/xwin/winmultiwindowwm.c | 20 +- xorg-server/hw/xwin/winmultiwindowwndproc.c | 8 +- xorg-server/hw/xwin/winprefs.c | 22 +- xorg-server/hw/xwin/winprefs.h | 8 +- xorg-server/hw/xwin/winsetsp.c | 52 +- xorg-server/hw/xwin/wintrayicon.c | 2 +- xorg-server/pseudoramiX/Makefile.am | 7 + xorg-server/pseudoramiX/pseudoramiX.c | 516 +++ xorg-server/pseudoramiX/pseudoramiX.h | 10 + 74 files changed, 4803 insertions(+), 1233 deletions(-) create mode 100644 mesalib/docs/relnotes/9.3.html create mode 100644 mesalib/docs/specs/MESA_shader_integer_mix.spec delete mode 100644 mesalib/m4/ax_prog_cc_for_build.m4 delete mode 100644 mesalib/m4/ax_prog_cxx_for_build.m4 delete mode 100644 mesalib/src/glsl/builtin_compiler/.gitignore delete mode 100644 mesalib/src/glsl/builtin_compiler/Makefile.am delete mode 100644 mesalib/src/glsl/builtin_compiler/builtin_stubs.cpp create mode 100644 mesalib/src/glsl/builtin_functions.cpp delete mode 100644 xorg-server/hw/xquartz/pseudoramiX.c delete mode 100644 xorg-server/hw/xquartz/pseudoramiX.h create mode 100644 xorg-server/pseudoramiX/Makefile.am create mode 100644 xorg-server/pseudoramiX/pseudoramiX.c create mode 100644 xorg-server/pseudoramiX/pseudoramiX.h diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c index 02e85cb05..e39430762 100644 --- a/fontconfig/src/fcfreetype.c +++ b/fontconfig/src/fcfreetype.c @@ -1105,7 +1105,6 @@ FcFreeTypeQueryFace (const FT_Face face, const char *tmp; FcChar8 *hashstr = NULL; - char *fontdata = NULL; FT_Error err; FT_ULong len = 0, alen; @@ -1668,15 +1667,21 @@ FcFreeTypeQueryFace (const FT_Face face, err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); if (err == FT_Err_Ok) { + char *fontdata; + alen = (len + 63) & ~63; fontdata = malloc (alen); if (!fontdata) goto bail3; err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); if (err != FT_Err_Ok) + { + free (fontdata); goto bail3; + } memset (&fontdata[len], 0, alen - len); hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); + free (fontdata); } else if (err == FT_Err_Invalid_Face_Handle) { @@ -1692,7 +1697,11 @@ FcFreeTypeQueryFace (const FT_Face face, if (hashstr) { if (!FcPatternAddString (pat, FC_HASH, hashstr)) + { + free (hashstr); goto bail1; + } + free (hashstr); } bail3: @@ -1783,10 +1792,6 @@ bail3: bail2: FcCharSetDestroy (cs); bail1: - if (hashstr) - free (hashstr); - if (fontdata) - free (fontdata); FcPatternDestroy (pat); bail0: return NULL; diff --git a/libX11/configure.ac b/libX11/configure.ac index 33613dd5d..8ad1f0026 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libX11], [1.6.1], +AC_INIT([libX11], [1.6.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h]) diff --git a/libXmu/COPYING b/libXmu/COPYING index 67a8b748f..d4104572f 100644 --- a/libXmu/COPYING +++ b/libXmu/COPYING @@ -1,4 +1,4 @@ -Copyright 1989, 1998 The Open Group +Copyright 1988, 1989, 1990, 1991, 1994, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -46,9 +46,10 @@ SOFTWARE. ----------- -And Xmu/Clip.c has: +Xmu/Clip.c and Xmu/Lookup.h have: Copyright (c) 1998 by The XFree86 Project, Inc. +Copyright 1999 by Thomas E. Dickey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/libXmu/configure.ac b/libXmu/configure.ac index 18f7f5830..e9d6b690e 100644 --- a/libXmu/configure.ac +++ b/libXmu/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXmu], [1.1.1], +AC_INIT([libXmu], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXmu]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h index f7dc6afaa..071413077 100644 --- a/libxcb/src/xcb.h +++ b/libxcb/src/xcb.h @@ -278,7 +278,6 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c); /** * @brief Returns the next event or error from the server. * @param c: The connection to the X server. - * error status of the operation. * @return The next event from the server. * * Returns the next event or error from the server, if one is diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c index 6a7a8060a..7dd25d373 100644 --- a/libxcb/src/xcb_conn.c +++ b/libxcb/src/xcb_conn.c @@ -443,14 +443,14 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec */ int may_read = c->in.reading == 1 || !count; #if USE_POLL - if(may_read && (fd.revents & POLLIN) == POLLIN) + if(may_read && (fd.revents & POLLIN) != 0) #else if(may_read && FD_ISSET(c->fd, &rfds)) #endif ret = ret && _xcb_in_read(c); #if USE_POLL - if((fd.revents & POLLOUT) == POLLOUT) + if((fd.revents & POLLOUT) != 0) #else if(FD_ISSET(c->fd, &wfds)) #endif diff --git a/mesalib/configure.ac b/mesalib/configure.ac index b19ab189e..7731a9973 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -45,9 +45,7 @@ LIBKMS_XORG_REQUIRED=1.0.0 dnl Check for progs AC_PROG_CPP AC_PROG_CC -AX_PROG_CC_FOR_BUILD AC_PROG_CXX -AX_PROG_CXX_FOR_BUILD AM_PROG_CC_C_O AM_PROG_AS AC_CHECK_PROGS([MAKE], [gmake make]) @@ -142,21 +140,6 @@ dnl Cache LDFLAGS and CPPFLAGS so we can add to them and restore later _SAVE_LDFLAGS="$LDFLAGS" _SAVE_CPPFLAGS="$CPPFLAGS" -dnl build host compiler macros -DEFINES_FOR_BUILD="" -AC_SUBST([DEFINES_FOR_BUILD]) -case "$build_os" in -linux*|*-gnu*|gnu*) - DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -D_GNU_SOURCE" - ;; -solaris*) - DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -DSVR4" - ;; -cygwin*) - DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD" - ;; -esac - dnl Compiler macros DEFINES="" AC_SUBST([DEFINES]) @@ -179,7 +162,6 @@ if test "x$GCC" = xyes; then CFLAGS="$CFLAGS -Wall -std=gnu99" ;; *) - CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -Wall -std=c99" CFLAGS="$CFLAGS -Wall -std=c99" ;; esac @@ -209,16 +191,13 @@ if test "x$GCC" = xyes; then CFLAGS=$save_CFLAGS # Work around aliasing bugs - developers should comment this out - CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -fno-strict-aliasing" CFLAGS="$CFLAGS -fno-strict-aliasing" # gcc's builtin memcmp is slower than glibc's # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 - CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -fno-builtin-memcmp" CFLAGS="$CFLAGS -fno-builtin-memcmp" fi if test "x$GXX" = xyes; then - CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -Wall" CXXFLAGS="$CXXFLAGS -Wall" # Enable -fvisibility=hidden if using a gcc that supports it @@ -235,12 +214,10 @@ if test "x$GXX" = xyes; then CXXFLAGS=$save_CXXFLAGS # Work around aliasing bugs - developers should comment this out - CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" # gcc's builtin memcmp is slower than glibc's # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 - CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -fno-builtin-memcmp" CXXFLAGS="$CXXFLAGS -fno-builtin-memcmp" fi @@ -315,14 +292,6 @@ AC_ARG_ENABLE([debug], [enable_debug=no] ) if test "x$enable_debug" = xyes; then - DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -DDEBUG" - if test "x$GCC_FOR_BUILD" = xyes; then - CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -g -O0" - fi - if test "x$GXX_FOR_BUILD" = xyes; then - CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -g -O0" - fi - DEFINES="$DEFINES -DDEBUG" if test "x$GCC" = xyes; then CFLAGS="$CFLAGS -g -O0" @@ -2103,7 +2072,6 @@ AC_CONFIG_FILES([Makefile src/gbm/Makefile src/gbm/main/gbm.pc src/glsl/Makefile - src/glsl/builtin_compiler/Makefile src/glx/Makefile src/glx/tests/Makefile src/gtest/Makefile diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html index 4c1099c5e..b495097c9 100644 --- a/mesalib/docs/devinfo.html +++ b/mesalib/docs/devinfo.html @@ -155,6 +155,29 @@ of bool, true, and src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples.

+

Submitting patches

+ +

+You should always run the Mesa Testsuite before submitting patches. +The Testsuite can be run using the 'make check' command. All tests +must pass before patches will be accepted, this may mean you have +to update the tests themselves. +

+ +

+Patches should be sent to the Mesa mailing list for review. +When submitting a patch make sure to use git send-email rather than attaching +patches to emails. Sending patches as attachments prevents people from being +able to provide in-line review comments. +

+ +

+When submitting follow-up patches you can use --in-reply-to to make v2, v3, +etc patches show up as replies to the originals. This usually works well +when you're sending out updates to individual patches (as opposed to +re-sending the whole series). Using --in-reply-to makes +it harder for reviewers to accidentally review old patches. +

Marking a commit as a candidate for a stable branch

diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index e33835abc..7d6865ac3 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.