Commit 41711ad3 authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Update Mesa to 13.0.3 and remove Mesa git

parent 41facb49
Pipeline #42142 passed with stage
set(mesa_type_args --disable-gallium-osmesa --enable-glx)
set(mesa_type_deps glproto)
include(mesa.common)
superbuild_apply_patch(mesa use-glproto-for-all-glx-impls
"Use GLProto for all GLX implementations")
if (BUILD_SHARED_LIBS)
set(mesa_library libGL.so)
else ()
......
......@@ -61,23 +61,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
PROJECT_ONLY)
endif ()
if (mesa_SOURCE_SELECTION STREQUAL "git" OR
(current_project STREQUAL "osmesa" AND
mesa_SOURCE_SELECTION STREQUAL "v12.0.3"))
set(mesa_use_autogen ON)
endif ()
if (mesa_use_autogen)
set(mesa_configure_cmd ./autogen.sh)
else ()
set(mesa_configure_cmd ./configure)
endif ()
# We frequently need to patch the autoconf files so instead of making it patch
# dependent we just always use autogen instead of configure
superbuild_add_project(${project}
CAN_USE_SYSTEM
DEPENDS llvm
DEPENDS llvm ${mesa_type_deps}
CONFIGURE_COMMAND
${mesa_configure_cmd}
./autogen.sh
${mesa_common_config_args}
${mesa_shared_lib_args}
${mesa_type_args}
......@@ -87,8 +78,6 @@ superbuild_add_project(${project}
make install
BUILD_IN_SOURCE 1)
if (mesa_use_autogen)
# For compatibility on machines with a crufty autotools
superbuild_apply_patch(${project} revert-xz
"Revert autoconf dist-xz to dist-bzip2")
endif ()
# For compatibility on machines with a crufty autotools
superbuild_apply_patch(${project} revert-xz
"Revert autoconf dist-xz to dist-bzip2")
......@@ -2,11 +2,6 @@ set(mesa_type_args --enable-gallium-osmesa --disable-glx)
include(mesa.common)
if (mesa_SOURCE_SELECTION STREQUAL "v12.0.3")
superbuild_apply_patch(osmesa install-headers
"Install OSMesa headers")
endif ()
if (BUILD_SHARED_LIBS)
set(osmesa_library libOSMesa.so)
else ()
......
diff --git a/configure.ac b/configure.ac
index 69485f1..115c3dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_INIT([Mesa], [MESA_VERSION],
AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 subdir-objects])
dnl We only support native Windows builds (MinGW/MSVC) through SCons.
case "$host_os" in
diff --git a/configure.ac b/configure.ac
index d215b63..5908dfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1377,6 +1377,9 @@ AC_ARG_ENABLE([driglx-direct],
dnl
dnl libGL configuration per driver
dnl
+if test "x$enable_glx" != xno; then
+ PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+fi
case "x$enable_glx" in
xxlib | xgallium-xlib)
# Xlib-based GLX
@@ -1390,7 +1393,6 @@ xxlib | xgallium-xlib)
;;
xdri)
# DRI-based GLX
- PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
# find the DRI deps for libGL
dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
index a7e6c0c..112030be 100644
--- a/src/gallium/state_trackers/glx/xlib/Makefile.am
+++ b/src/gallium/state_trackers/glx/xlib/Makefile.am
@@ -25,6 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
+ $(GLPROTO_CFLAGS) \
$(X11_INCLUDES)
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
diff --git a/configure.ac b/configure.ac
index 78f3041..69485f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2560,6 +2560,8 @@ fi
AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_libdrm" = xyes)
AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_OSMESA, test "x$enable_gallium_osmesa" = xyes)
+AM_CONDITIONAL(HAVE_COMMON_OSMESA, test "x$enable_osmesa" = xyes -o \
+ "x$enable_gallium_osmesa" = xyes)
AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64)
AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64)
diff --git a/src/Makefile.am b/src/Makefile.am
index b130f5b..846093b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,6 +47,36 @@ CLEANFILES = $(BUILT_SOURCES)
SUBDIRS = . gtest util mapi/glapi/gen mapi
+if HAVE_OPENGL
+gldir = $(includedir)/GL
+gl_HEADERS = \
+ $(top_srcdir)/include/GL/gl.h \
+ $(top_srcdir)/include/GL/glext.h \
+ $(top_srcdir)/include/GL/glcorearb.h \
+ $(top_srcdir)/include/GL/gl_mangle.h
+endif
+
+if HAVE_GLX
+glxdir = $(includedir)/GL
+glx_HEADERS = \
+ $(top_srcdir)/include/GL/glx.h \
+ $(top_srcdir)/include/GL/glxext.h \
+ $(top_srcdir)/include/GL/glx_mangle.h \
+ $(top_srcdir)/include/GL/mesa_glinterop.h
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = mesa/gl.pc
+else
+if HAVE_EGL
+eglinteropdir = $(includedir)/GL
+eglinterop_HEADERS = $(top_srcdir)/include/GL/mesa_glinterop.h
+endif
+endif
+
+if HAVE_COMMON_OSMESA
+osmesadir = $(includedir)/GL
+osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
+endif
+
# include only conditionally ?
SUBDIRS += compiler
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 34671ca..caf5fd8 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -148,6 +148,8 @@ endif
if HAVE_GALLIUM_OSMESA
SUBDIRS += state_trackers/osmesa targets/osmesa
+osmesadir = $(includedir)/GL
+osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
endif
if HAVE_ST_VA
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 037384a..22db400 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -31,11 +31,8 @@ endif
if HAVE_OSMESA
SUBDIRS += drivers/osmesa
-endif
-
-if HAVE_GLX
-gldir = $(includedir)/GL
-gl_HEADERS = $(top_srcdir)/include/GL/*.h
+osmesadir = $(includedir)/GL
+osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
endif
include Makefile.sources
@@ -161,11 +158,6 @@ libmesa_sse41_la_SOURCES = \
libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
-if HAVE_GLX
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gl.pc
-endif
-
MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
YACC_GEN = $(AM_V_GEN)$(YACC) $(YFLAGS)
LEX_GEN = $(AM_V_GEN)$(LEX) $(LFLAGS)
......@@ -2,17 +2,15 @@ superbuild_set_revision(llvm
URL "http://www.paraview.org/files/dependencies/llvm-3.8.1.src.tar.xz"
URL_MD5 538467e6028bbc9259b1e6e015d25845)
superbuild_set_selectable_source(mesa
SELECT 13.0.0 DEFAULT
URL "http://www.paraview.org/files/dependencies/mesa-13.0.0.tar.xz"
URL_MD5 8c4ca7da1be2b8f9a877db09304335a4
SELECT git CUSTOMIZABLE
GIT_REPOSITORY "https://gitlab.kitware.com/third-party/mesa.git"
GIT_TAG "origin/master")
get_property(mesa_revision GLOBAL
PROPERTY mesa_revision)
superbuild_set_revision(osmesa
${mesa_revision})
superbuild_set_revision(glproto
URL "http://www.paraview.org/files/dependencies/glproto-1.4.17.tar.bz2"
URL_MD5 5565f1b0facf4a59c2778229c1f70d10)
superbuild_set_revision(mesa
URL "http://www.paraview.org/files/dependencies/mesa-13.0.3.tar.xz"
URL_MD5 24e3fa52c95139dfa9ff5085d0c2ead6)
get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
superbuild_set_revision(osmesa ${mesa_revision})
superbuild_set_revision(glu
URL "http://www.paraview.org/files/dependencies/glu-9.0.0.tar.gz"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment