From 06872e284da1c00ce03b234ca24aefeac64990d2 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 24 Jan 2013 08:36:10 +0100 Subject: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee --- fontconfig/configure.ac | 2 +- fontconfig/src/fccompat.c | 6 - fontconfig/src/fcdefault.c | 5 +- mesalib/Makefile.am | 8 +- mesalib/configure.ac | 18 +- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 8 + mesalib/docs/relnotes-9.0.2.html | 290 +++++++++++++++++++++++++ mesalib/docs/relnotes.html | 1 + mesalib/m4/ax_prog_bison.m4 | 71 ++++++ mesalib/m4/ax_prog_flex.m4 | 63 ++++++ mesalib/m4/ax_python_module.m4 | 8 +- mesalib/scons/custom.py | 9 +- mesalib/scons/gallium.py | 2 +- mesalib/src/glsl/.gitignore | 5 +- mesalib/src/glsl/Android.mk | 2 +- mesalib/src/glsl/Makefile.am | 151 ++++++++++--- mesalib/src/glsl/Makefile.sources | 10 +- mesalib/src/glsl/SConscript | 5 +- mesalib/src/glsl/builtin_compiler/Makefile.am | 36 ++- mesalib/src/glsl/glcpp/Makefile.am | 54 ----- mesalib/src/mesa/drivers/windows/gdi/wmesa.c | 1 + mesalib/src/mesa/main/extensions.c | 8 +- mesalib/src/mesa/main/glformats.c | 11 +- mesalib/src/mesa/main/mtypes.h | 1 - mesalib/src/mesa/main/pack.c | 10 + mesalib/src/mesa/main/texcompress.c | 4 +- mesalib/src/mesa/main/texformat.c | 245 +++++++-------------- mesalib/src/mesa/main/teximage.c | 19 +- mesalib/src/mesa/state_tracker/st_extensions.c | 4 +- mesalib/src/mesa/swrast/s_blit.c | 71 +++--- pixman/.gitignore | 7 + pixman/README | 110 +++++++++- pixman/demos/Makefile.am | 2 +- pixman/pixman/Makefile.am | 2 +- pixman/test/Makefile.am | 2 +- pixman/test/affine-test.c | 6 +- pixman/test/alphamap.c | 19 -- pixman/test/blitters-test.c | 6 +- pixman/test/composite.c | 221 +++++++++---------- pixman/test/scaling-test.c | 7 +- pixman/test/utils.c | 162 ++++++++++++++ pixman/test/utils.h | 6 + xkbcomp/configure.ac | 7 +- xorg-server/include/protocol-versions.h | 2 +- 45 files changed, 1146 insertions(+), 543 deletions(-) create mode 100644 mesalib/docs/relnotes-9.0.2.html create mode 100644 mesalib/m4/ax_prog_bison.m4 create mode 100644 mesalib/m4/ax_prog_flex.m4 delete mode 100644 mesalib/src/glsl/glcpp/Makefile.am diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index e8ee55916..f8a41c934 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -141,7 +141,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP -AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) +AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs lstat]) dnl AC_CHECK_FUNCS doesn't check for header files. dnl posix_fadvise() may be not available in older libc. diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c index 0a9c135fe..a2171607c 100644 --- a/fontconfig/src/fccompat.c +++ b/fontconfig/src/fccompat.c @@ -160,12 +160,6 @@ FcMakeTempfile (char *template) if (_mktemp_s(template, strlen(template) + 1) != 0) return -1; fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600); -#else - /* warn at the runtime for just debugging purpose why something may - * goes wrong. mingw may not have one, but it shouldn't be reached since - * this function isn't used so far. - */ - fprintf(stderr, "Fontconfig warning: No secure functions to create a temporary file\n"); #endif return fd; diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c index d1217a4dc..d1b917fd9 100644 --- a/fontconfig/src/fcdefault.c +++ b/fontconfig/src/fcdefault.c @@ -147,6 +147,9 @@ retry: else prgname = FcStrdup (""); #else +# if defined (HAVE_GETEXECNAME) + const char *p = getexecname (); +# else char buf[PATH_MAX + 1]; int len; char *p = NULL; @@ -157,7 +160,7 @@ retry: buf[len] = '\0'; p = buf; } - +# endif if (p) { char *r = strrchr (p, '/'); diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index ee733339a..0e61a55d5 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -30,7 +30,6 @@ check-local: $(MAKE) -C src/mapi/glapi/tests check $(MAKE) -C src/mapi/shared-glapi/tests check $(MAKE) -C src/mesa/main/tests check - $(MAKE) -C src/glsl/tests check $(MAKE) -C src/glx/tests check .PHONY: doxygen @@ -53,9 +52,9 @@ EXTRA_FILES = \ bin/ltmain.sh \ bin/missing \ bin/ylwrap \ - src/glsl/glsl_parser.cc \ + src/glsl/glsl_parser.cpp \ src/glsl/glsl_parser.h \ - src/glsl/glsl_lexer.cc \ + src/glsl/glsl_lexer.cpp \ src/glsl/glcpp/glcpp-lex.c \ src/glsl/glcpp/glcpp-parse.c \ src/glsl/glcpp/glcpp-parse.h \ @@ -76,8 +75,7 @@ IGNORE_FILES = \ parsers: configure - $(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/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h # Everything for new a Mesa release: diff --git a/mesalib/configure.ac b/mesalib/configure.ac index e7c234016..e769edadb 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -56,14 +56,12 @@ AC_PROG_MKDIR_P LT_PREREQ([2.2]) LT_INIT([disable-static]) -AC_PROG_YACC -AC_PATH_PROG([YACC_INST], $YACC) -if test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"; then - if test -z "$YACC_INST"; then - AC_MSG_ERROR([yacc not found - unable to compile glcpp-parse.y]) - fi -fi -AC_PROG_LEX +AX_PROG_BISON([], + AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"] + [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])])) +AX_PROG_FLEX([], + AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"] + [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])])) AC_PATH_PROG([PERL], [perl]) @@ -1967,6 +1965,8 @@ AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1) +AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) + AC_SUBST([VDPAU_MAJOR], 1) AC_SUBST([VDPAU_MINOR], 0) @@ -2080,8 +2080,6 @@ AC_CONFIG_FILES([Makefile src/gbm/main/gbm.pc src/glsl/Makefile src/glsl/builtin_compiler/Makefile - src/glsl/glcpp/Makefile - src/glsl/tests/Makefile src/glx/Makefile src/glx/tests/Makefile src/gtest/Makefile diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 3bf91eae5..21c37c008 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -121,7 +121,7 @@ GL_ARB_compressed_texture_pixel_storage not started GL_ARB_shader_atomic_counters not started GL_ARB_texture_storage DONE (r300, r600, swrast, gallium) GL_ARB_transform_feedback_instanced DONE -GL_ARB_base_instance DONE (nv50, nvc0, r600, radeonsi) +GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_shader_image_load_store not started GL_ARB_conservative_depth DONE (softpipe) GL_ARB_shading_language_420pack not started diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 546a32f53..5c922042c 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,14 @@

News

+

January 22, 2013

+ +

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

+ +

November 16, 2012

diff --git a/mesalib/docs/relnotes-9.0.2.html b/mesalib/docs/relnotes-9.0.2.html new file mode 100644 index 000000000..65b9b1116 --- /dev/null +++ b/mesalib/docs/relnotes-9.0.2.html @@ -0,0 +1,290 @@ + + + + + Mesa Release Notes + + + + +

+

The Mesa 3D Graphics Library

+
+ + +
+ +

Mesa 9.0.2 Release Notes / January 22th, 2013

+ +

+Mesa 9.0.2 is a bug fix release which fixes bugs found since the 9.0.1 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

+
+5ae216ca9fecfa349f14ecb83aa3f124  MesaLib-9.0.2.tar.gz
+dc45d1192203e418163e0017640e1cfc  MesaLib-9.0.2.tar.bz2
+93d40ec77d656dd04b561ba203ffbb91  MesaLib-9.0.2.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.1..mesa-9.0.2
+
+ +

Abdiel Janulgue (1):

+ + +

Adam Jackson (4):

+ + +

Alex Deucher (2):

+ + +

Ander Conselvan de Oliveira (2):

+ + +

Andreas Boll (9):

+ + +

Anuj Phogat (2):

+ + +

Ben Skeggs (3):

+ + +

Brian Paul (5):

+ + +

Bryan Cain (1):

+ + +

Chad Versace (2):

+ + +

Chris Fester (1):

+ + +

Christoph Bumiller (5):

+ + +

Dave Airlie (5):

+ + +

Eric Anholt (4):

+ + +

Ian Romanick (2):

+ + +

Johannes Obermayr (4):

+ + +

Jonas Ådahl (1):

+ + +

José Fonseca (1):

+ + +

Kenneth Graunke (8):

+ + +

Kristian Høgsberg (1):

+ + +

Maarten Lankhorst (2):

+ + +

Marek Olšák (17):

+ + +

Mario Kleiner (1):

+ + +

Matt Turner (1):

+ + +

Stefan Dösinger (1):

+ + +

Tapani Pälli (1):

+ + +

Tom Stellard (1):

+ + +

Vinson Lee (1):

+ + +

smoki (2):

+ + +
+ + diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index a4654025e..e3730913f 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.