From 281f26a1dfda732687680a36857960f74608df5b Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 25 Oct 2012 09:59:33 +0200 Subject: fontconfig mesa pixman git update fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0 --- fontconfig/autogen.sh | 1 + mesalib/bin/get-pick-list.sh | 29 +++ mesalib/configure.ac | 10 +- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 8 + mesalib/docs/relnotes-8.0.5.html | 264 +++++++++++++++++++++ mesalib/docs/relnotes.html | 1 + mesalib/scons/gallium.py | 2 +- mesalib/src/mapi/glapi/gen/GL3x.xml | 5 +- mesalib/src/mesa/main/api_exec.c | 45 ++-- mesalib/src/mesa/main/api_loopback.h | 1 + mesalib/src/mesa/main/bufferobj.c | 3 + mesalib/src/mesa/main/dlist.c | 5 +- mesalib/src/mesa/main/pack.c | 216 ++++++++--------- mesalib/src/mesa/main/queryobj.c | 45 +++- mesalib/src/mesa/main/queryobj.h | 3 +- mesalib/src/mesa/main/samplerobj.c | 14 +- mesalib/src/mesa/main/samplerobj.h | 3 +- mesalib/src/mesa/main/transformfeedback.c | 7 +- mesalib/src/mesa/main/transformfeedback.h | 3 +- mesalib/src/mesa/main/uniforms.c | 18 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 5 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 21 +- mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c | 12 +- pixman/pixman/pixman-combine-float.c | 7 + 25 files changed, 553 insertions(+), 177 deletions(-) create mode 100644 mesalib/bin/get-pick-list.sh create mode 100644 mesalib/docs/relnotes-8.0.5.html diff --git a/fontconfig/autogen.sh b/fontconfig/autogen.sh index df4cd4142..93855cb2f 100644 --- a/fontconfig/autogen.sh +++ b/fontconfig/autogen.sh @@ -19,6 +19,7 @@ PROJECT=Fontconfig TEST_TYPE=-f FILE=fontconfig/fontconfig.h ACLOCAL=${ACLOCAL-aclocal} +ACLOCAL_FLAGS="-I m4" LIBTOOLIZE=${LIBTOOLIZE-libtoolize} AUTOMAKE=${AUTOMAKE-automake} AUTOHEADER=${AUTOHEADER-autoheader} diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh new file mode 100644 index 000000000..72880907b --- /dev/null +++ b/mesalib/bin/get-pick-list.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +# Script for generating a list of candidates for cherry-picking to a stable branch + +# Grep for commits with "cherry picked from commit" in the commit message. +git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\ + grep "cherry picked from commit" |\ + sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked + +# Grep for commits that were marked as a candidate for the stable tree. +git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' HEAD..origin/master |\ +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 + continue + fi + fi + + # Check to see if it has already been picked over. + if grep -q ^$sha already_picked ; then + continue + fi + + git log -n1 --pretty=oneline $sha | cat +done + +rm -f already_picked diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 94392910f..6b97a26fc 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -160,13 +160,13 @@ DEFINES="" AC_SUBST([DEFINES]) case "$host_os" in linux*|*-gnu*|gnu*) - DEFINES="$DEFINES -D_GNU_SOURCE" + DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD" ;; solaris*) - DEFINES="$DEFINES -DSVR4" + DEFINES="$DEFINES -DHAVE_PTHREAD -DSVR4" ;; cygwin*) - DEFINES="$DEFINES" + DEFINES="$DEFINES -DHAVE_PTHREAD" ;; esac @@ -946,7 +946,7 @@ AC_ARG_ENABLE([glx-tls], AC_SUBST(GLX_TLS, ${GLX_USE_TLS}) AS_IF([test "x$GLX_USE_TLS" = xyes -a "x$ax_pthread_ok" = xyes], - [DEFINES="${DEFINES} -DGLX_USE_TLS"]) + [DEFINES="${DEFINES} -DGLX_USE_TLS -DHAVE_PTHREAD"]) dnl dnl More DRI setup @@ -1030,7 +1030,7 @@ if test "x$enable_dri" = xyes; then esac ;; freebsd* | dragonfly* | *netbsd*) - DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" if test "x$DRI_DIRS" = "xyes"; then diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 876165fe9..4efe4bfeb 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -120,7 +120,7 @@ GLSL 4.2 not started GL_ARB_texture_compression_bptc not started GL_ARB_compressed_texture_pixel_storage not started GL_ARB_shader_atomic_counters not started -GL_ARB_texture_storage DONE (r300, r600, swrast) +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_shader_image_load_store not started diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index ac4ff8d9e..ba0b21044 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,14 @@

News

+

October 24, 2012

+ +

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

+ +

October 8, 2012

diff --git a/mesalib/docs/relnotes-8.0.5.html b/mesalib/docs/relnotes-8.0.5.html new file mode 100644 index 000000000..eb7595bb3 --- /dev/null +++ b/mesalib/docs/relnotes-8.0.5.html @@ -0,0 +1,264 @@ + + + + + Mesa Release Notes + + + + +

+

The Mesa 3D Graphics Library

+
+ + +
+ +

Mesa 8.0.5 Release Notes / October 24, 2012

+ +

+Mesa 8.0.5 is a bug fix release which fixes bugs found since the 8.0.4 release. +

+

+Mesa 8.0.5 implements the OpenGL 3.0 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.0. +

+

+See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. +

+ + +

MD5 checksums

+
+cda5d101f43b8784fa60bdeaca4056f2  MesaLib-8.0.5.tar.gz
+01305591073a76b65267f69f27d635a3  MesaLib-8.0.5.tar.bz2
+97f11c00cac8fb98aa0131990086dc8e  MesaLib-8.0.5.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-8.0.4..mesa-8.0.5
+
+ +

Alex Deucher (3):

+ + +

Andreas Boll (4):

+ + +

Brian Paul (18):

+ + +

Chad Versace (3):

+ + +

Chris Forbes (1):

+ + +

Christoph Bumiller (1):

+ + +

Eric Anholt (9):

+ + +

Ian Romanick (8):

+ + +

Jonas Maebe (1):

+ + +

Jordan Justen (1):

+ + +

José Fonseca (1):

+ + +

Kenneth Graunke (8):

+ + +

Maarten Lankhorst (1):

+ + +

Marek Olšák (6):

+ + +

Michel Dänzer (2):

+ + +

Niels Ole Salscheider (1):

+ + +

Paul Berry (5):

+ + +

Stéphane Marchesin (1):

+ + +

Tapani Pälli (2):

+ + +

Vadim Girlin (1):

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