Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_asm.c

diff --cc configs/autoconf.in
Simple merge

diff --cc configure.ac
index 8f36837,1c6edb7..2f1e94a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1428,28 -1453,8 +1453,29 @@@ yes
              if test "x$enable_openvg" != xyes; then
                  AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])
              fi
+             have_st_vega="yes"
              ;;
 +      xorg/xvmc)
 +            # Check for xvmc?
 +            if test "x$enable_gallium_g3dvl" != xyes; then
 +                AC_MSG_ERROR([cannot build XvMC state tracker without --enable-gallium-g3dvl])
 +            fi
 +            HAVE_ST_XVMC="yes"
 +            ;;
 +        vdpau)
 +            # Check for libvdpau?
 +            if test "x$enable_gallium_g3dvl" != xyes; then
 +                AC_MSG_ERROR([cannot build vdpau state tracker without --enable-gallium-g3dvl])
 +            fi
 +            HAVE_ST_VDPAU="yes"
 +            ;;
 +      va)
 +            # Check for libva?
 +            if test "x$enable_gallium_g3dvl" != xyes; then
 +                AC_MSG_ERROR([cannot build va state tracker without --enable-gallium-g3dvl])
 +            fi
 +            HAVE_ST_VA="yes"
 +            ;;
          esac
  
        if test -n "$tracker"; then

diff --cc src/gallium/drivers/nvfx/Makefile
index 95da778,a3b76ac..cd37f01
--- 1/src/gallium/drivers/nvfx/Makefile
--- 2/src/gallium/drivers/nvfx/Makefile
+++ b/src/gallium/drivers/nvfx/Makefile
@@@ -24,10 -24,10 +24,11 @@@ C_SOURCES = 
        nvfx_surface.c \
        nvfx_transfer.c \
        nvfx_vbo.c \
 -      nvfx_vertprog.c
 +      nvfx_vertprog.c \
 +      nvfx_video_context.c
  
  LIBRARY_INCLUDES = \
+       $(LIBDRM_CFLAGS) \
        -I$(TOP)/src/gallium/drivers/nouveau/include
  
  include ../../Makefile.template

diff --cc src/gallium/drivers/r600/r600_asm.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_shader.c
Simple merge