From 63bfcd0be46413dda8c22b914d12f66ea5d5c66d Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 May 2014 19:36:09 +0200 Subject: libX11 mesa xserver pixman git update 23 May 2014 xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad --- mesalib/configure.ac | 109 ++++++++++++++++++++++----- mesalib/docs/index.html | 6 ++ mesalib/docs/install.html | 15 +++- mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.1.4.html | 100 ++++++++++++++++++++++++ mesalib/include/EGL/eglext.h | 1 + mesalib/include/EGL/eglextchromium.h | 60 +++++++++++++++ mesalib/scons/llvm.py | 8 +- mesalib/src/gallium/Automake.inc | 8 ++ mesalib/src/mapi/glapi/Makefile.am | 4 +- mesalib/src/mapi/glapi/Makefile.sources | 4 +- mesalib/src/mapi/glapi/gen/glX_proto_send.py | 3 + mesalib/src/mapi/glapi/gen/gl_gentable.py | 2 +- mesalib/src/mesa/Makefile.am | 2 +- mesalib/src/mesa/SConscript | 1 + mesalib/src/mesa/drivers/common/meta.c | 106 ++++++++++++-------------- mesalib/src/mesa/drivers/common/meta.h | 10 ++- mesalib/src/mesa/drivers/common/meta_blit.c | 52 ++++++++----- mesalib/src/mesa/drivers/dri/Makefile.am | 2 +- mesalib/src/mesa/main/compiler.h | 6 ++ mesalib/src/mesa/main/cpuinfo.c | 2 +- mesalib/src/mesa/main/cpuinfo.h | 2 +- mesalib/src/mesa/main/fbobject.c | 6 ++ mesalib/src/mesa/vbo/vbo_exec_array.c | 6 +- mesalib/src/mesa/x86/common_x86.c | 25 +++++- mesalib/src/mesa/x86/common_x86_features.h | 4 + 26 files changed, 429 insertions(+), 116 deletions(-) create mode 100644 mesalib/docs/relnotes/10.1.4.html create mode 100644 mesalib/include/EGL/eglextchromium.h (limited to 'mesalib') diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 4e4d76155..7397341b2 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -315,6 +315,22 @@ if test "x$enable_debug" = xyes; then fi fi +dnl +dnl Check if linker supports -Bsymbolic +dnl +save_LDFLAGS=$LDFLAGS +LDFLAGS="$LDFLAGS -Wl,-Bsymbolic" +AC_MSG_CHECKING([if ld supports -Bsymbolic]) +AC_LINK_IFELSE( + [AC_LANG_SOURCE([int main() { return 0;}])], + [AC_MSG_RESULT([yes]) + BSYMBOLIC="-Wl,-Bsymbolic";], + [AC_MSG_RESULT([no]) + BSYMBOLIC="";]) +LDFLAGS=$save_LDFLAGS + +AC_SUBST([BSYMBOLIC]) + dnl dnl Check if linker supports garbage collection dnl @@ -336,7 +352,7 @@ dnl OpenBSD does not have DT_NEEDED entries for libc by design dnl so when these flags are passed to ld via libtool the checks will fail dnl case "$host_os" in -openbsd*) +openbsd* | darwin* ) LD_NO_UNDEFINED="" ;; *) LD_NO_UNDEFINED="-Wl,--no-undefined" ;; @@ -344,6 +360,28 @@ esac AC_SUBST([LD_NO_UNDEFINED]) +dnl +dnl Check if linker supports version scripts +dnl +AC_MSG_CHECKING([if the linker supports version-scripts]) +save_LDFLAGS=$LDFLAGS +LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" +cat > conftest.map <= $GLPROTO_REQUIRED]) - if test x"$driglx_direct" = xyes; then - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([Direct rendering requires libdrm >= $LIBDRM_REQUIRED]) - fi - PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) - GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED" - if test x"$enable_dri3" = xyes; then - PKG_CHECK_MODULES([DRI3PROTO], [dri3proto >= $DRI3PROTO_REQUIRED]) - PKG_CHECK_MODULES([PRESENTPROTO], [presentproto >= $PRESENTPROTO_REQUIRED]) - fi - fi # find the DRI deps for libGL - dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED xcb-dri2 >= $XCBDRI2_REQUIRED" + dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED" + + if test x"$driglx_direct" = xyes; then + if test x"$dri_platform" = xdrm ; then + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([Direct rendering requires libdrm >= $LIBDRM_REQUIRED]) + fi + + PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) + GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED" + if test x"$enable_dri3" = xyes; then + PKG_CHECK_MODULES([DRI3PROTO], [dri3proto >= $DRI3PROTO_REQUIRED]) + PKG_CHECK_MODULES([PRESENTPROTO], [presentproto >= $PRESENTPROTO_REQUIRED]) + fi - if test x"$enable_dri3" = xyes; then - dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED" + if test x"$enable_dri" = xyes; then + dri_modules="$dri_modules xcb-dri2 >= $XCBDRI2_REQUIRED" + fi + + if test x"$enable_dri3" = xyes; then + dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED" + fi + fi + if test x"$dri_platform" = xapple ; then + DEFINES="$DEFINES -DGLX_USE_APPLEGL" + fi fi # add xf86vidmode if available @@ -1043,6 +1106,12 @@ if test "x$enable_dri" = xyes; then with_dri_drivers="swrast" fi ;; + darwin*) + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DGLX_ALIAS_UNSUPPORTED" + if test "x$with_dri_drivers" = "xyes"; then + with_dri_drivers="swrast" + fi + ;; esac # default drivers @@ -1591,7 +1660,8 @@ strip_unwanted_llvm_flags() { -e 's/-fno-exceptions\>//g' \ -e 's/-fomit-frame-pointer\>//g' \ -e 's/-fvisibility-inlines-hidden\>//g' \ - -e 's/-fPIC\>//g' + -e 's/-fPIC\>//g' \ + -e 's/-fstack-protector-strong\>//g' } @@ -2169,6 +2239,7 @@ AC_CONFIG_FILES([Makefile src/gbm/main/gbm.pc src/glsl/Makefile src/glx/Makefile + src/glx/apple/Makefile src/glx/tests/Makefile src/gtest/Makefile src/loader/Makefile @@ -2238,7 +2309,9 @@ xnono) ;; esac +echo "" if test "x$enable_dri" != xno; then + echo " DRI platform: $dri_platform" if test -z "$DRI_DIRS"; then echo " DRI drivers: no" else diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 0c22e8502..28a70467d 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,12 @@

News

+

May 20, 2014

+

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

+

May 9, 2014

Mesa 10.1.3 is released. diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 5061eded0..f12425fcb 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -34,16 +34,25 @@

1.1 General

diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index db38fdfa4..7437e9b5b 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.