From cb346e228aeb500cd61ec86644c034c238332d3b Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 8 Sep 2014 23:27:52 +0200 Subject: xkeyboard-config mesa git update 8 Sep 2014 xkeyboard-config commit 1b9901151cdb22e413319e6fca80fbbfc5e51502 mesa commit 12fb74fe895fe9954df127ca0ec6e4422fffb156 --- mesalib/Makefile.am | 2 +- mesalib/configure.ac | 39 +++- mesalib/docs/index.html | 6 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.2.7.html | 211 +++++++++++++++++++++ mesalib/src/gallium/Makefile.am | 10 +- .../glsl/lower_variable_index_to_cond_assign.cpp | 2 +- mesalib/src/glsl/opt_copy_propagation_elements.cpp | 13 +- mesalib/src/loader/loader.c | 2 +- mesalib/src/mapi/glapi/gen/gl_gentable.py | 2 +- mesalib/src/mesa/drivers/common/meta.c | 40 +--- mesalib/src/mesa/drivers/common/meta.h | 40 +++- mesalib/src/mesa/drivers/common/meta_blit.c | 37 ++-- mesalib/src/mesa/drivers/common/meta_copy_image.c | 2 +- mesalib/src/mesa/drivers/dri/common/utils.c | 2 +- mesalib/src/mesa/main/api_arrayelt.c | 4 +- mesalib/src/mesa/main/atifragshader.c | 8 +- mesalib/src/mesa/main/attrib.c | 4 + mesalib/src/mesa/main/compiler.h | 2 +- mesalib/src/mesa/main/context.c | 3 + mesalib/src/mesa/main/macros.h | 11 +- mesalib/src/mesa/main/texstore.c | 4 + mesalib/src/mesa/program/prog_instruction.c | 2 +- mesalib/src/mesa/program/prog_optimize.c | 6 +- mesalib/src/mesa/program/prog_parameter.c | 2 +- mesalib/src/mesa/state_tracker/st_extensions.c | 13 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 14 +- mesalib/src/mesa/swrast/s_texfilter.c | 2 +- mesalib/src/mesa/vbo/vbo_exec_array.c | 2 +- xorg-server/xkeyboard-config/symbols/de | 2 +- 30 files changed, 393 insertions(+), 95 deletions(-) create mode 100644 mesalib/docs/relnotes/10.2.7.html diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index c9aadc827..453e5f672 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -102,4 +102,4 @@ checksums: $(ARCHIVES) @-sha256sum $(PACKAGE_NAME).tar.bz2 @-sha256sum $(PACKAGE_NAME).zip -.PHONY: tarballs md5 +.PHONY: tarballs checksums diff --git a/mesalib/configure.ac b/mesalib/configure.ac index aa7d1f27d..be85fd51b 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -41,6 +41,7 @@ GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 VDPAU_REQUIRED=0.4.1 WAYLAND_REQUIRED=1.2.0 +XCB_REQUIRED=1.9.3 XCBDRI2_REQUIRED=1.8 XCBGLX_REQUIRED=1.8.1 XSHMFENCE_REQUIRED=1.1 @@ -57,6 +58,8 @@ AC_CHECK_PROGS([PYTHON2], [python2 python]) AC_PROG_SED AC_PROG_MKDIR_P +AC_SYS_LARGEFILE + LT_PREREQ([2.2]) LT_INIT([disable-static]) @@ -355,6 +358,24 @@ AC_LINK_IFELSE( LDFLAGS=$save_LDFLAGS AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") +dnl +dnl Check if linker supports dynamic list files +dnl +AC_MSG_CHECKING([if the linker supports --dynamic-list]) +save_LDFLAGS=$LDFLAGS +LDFLAGS="$LDFLAGS -Wl,--dynamic-list=conftest.dyn" +cat > conftest.dyn <= $GLPROTO_REQUIRED]) # find the DRI deps for libGL - dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED" + dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED" if test x"$driglx_direct" = xyes; then if test x"$dri_platform" = xdrm ; then @@ -919,6 +941,7 @@ xyesno) fi if test x"$enable_dri3" = xyes; then + PKG_CHECK_EXISTS([xcb >= $XCB_REQUIRED], [], AC_MSG_ERROR([DRI3 requires xcb >= $XCB_REQUIRED])) dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED" fi fi @@ -1387,22 +1410,22 @@ if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then fi if test "x$enable_xvmc" = xyes; then - PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" enable_gallium_loader=yes fi AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes) if test "x$enable_vdpau" = xyes; then - PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED], - [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) + PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED], + [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb xcb-dri2`"]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau" enable_gallium_loader=yes fi AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) if test "x$enable_omx" = xyes; then - PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx" enable_gallium_loader=yes fi @@ -1525,7 +1548,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes]) + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes]) ;; drm) diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 5fb55670e..5d18dd25c 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,12 @@

News

+

September 6, 2014

+

+Mesa 10.2.7 is released. +This is a bug-fix release. +

+

August 19, 2014

Mesa 10.2.6 is released. diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index b84f498ca..36bcd139b 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.