diff options
| -rwxr-xr-x | graphics-libs/mesalib/BUILD | 1 | ||||
| -rwxr-xr-x | graphics-libs/mesalib/CONFIGURE | 30 | ||||
| -rwxr-xr-x | graphics-libs/mesalib/DEPENDS | 3 | ||||
| -rw-r--r-- | graphics-libs/mesalib/HISTORY | 5 |
4 files changed, 30 insertions, 9 deletions
diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD index 397e436b13..d8468a1e1a 100755 --- a/graphics-libs/mesalib/BUILD +++ b/graphics-libs/mesalib/BUILD @@ -17,5 +17,6 @@ esac && OPTS="--with-driver=$MESALIB_BUILD \ --with-dri-drivers=$MESALIB_DRIVERS_CONF \ $MESALIB_OPTS \ + --with-egl-platforms=${MESA_EGL//\ /,} \ $OPTS" && default_build diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE index c919154218..f02758b387 100755 --- a/graphics-libs/mesalib/CONFIGURE +++ b/graphics-libs/mesalib/CONFIGURE @@ -65,22 +65,34 @@ config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \ case "$MESALIB_BRANCH" in scm|development) - config_query_option MESALIB_OPTS "enable shared GLapi" n \ + config_query_multi MESA_EGL "which EGL platforms?" drm fbdev wayland x11 none + if list_find wayland MESA_EGL;then + list_remove MESALIB_OPTS "--disable-shared-glapi" && + list_remove MESALIB_OPTS "--disable-gbm" && + list_remove MESALIB_OPTS "--disable-gles2" && + list_add MESALIB_OPTS "--enable-shared-glapi"&& + list_add MESALIB_OPTS "--enable-gbm" && + list_add MESALIB_OPTS "--enable-gles2" + else + config_query_option MESALIB_OPTS "enable shared GLapi" n \ "--enable-shared-glapi" "--disable-shared-glapi" && - config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n \ - "--enable-gbm" "--disable-gbm" && -# "--enable-gallium-gbm" "--disable-gallium-gbm" && - + config_query_option MESALIB_OPTS "enable Generic Buffer Management?" n \ + "--enable-gbm" "--disable-gbm" + config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \ + "--enable-gles2" "--disable-gles2" + fi && config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \ "--enable-gles1" "--disable-gles1" && - config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \ - "--enable-gles2" "--disable-gles2" && - if list_find "--enable-gles1" $MESALIB_OPTS || \ + if list_find "--enable-gles1" $MESALIB_OPTS || \ list_find "--enable-gles2" $MESALIB_OPTS; then config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?" n \ "--enable-gles-overlay" "--disable-gles-overlay" - fi + fi + ;; + *) + config_query_multi MESA_EGL "which EGL platforms?" drm fbdev x11 none + ;; esac diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS index fb8ea02a62..7eb77c1476 100755 --- a/graphics-libs/mesalib/DEPENDS +++ b/graphics-libs/mesalib/DEPENDS @@ -51,6 +51,9 @@ fi && if [[ "$MESALIB_BRANCH" == "development" && "$MESALIB_GALLIUM" != "none" ]]; then depends llvm + if list_find wayland MESA_EGL;then + depends wayland + fi fi && optional_depends udev '' '' 'hardware detection' diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY index 86e9f214f8..b1f1532295 100644 --- a/graphics-libs/mesalib/HISTORY +++ b/graphics-libs/mesalib/HISTORY @@ -1,3 +1,8 @@ +2012-02-12 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS: add optional wayland support + * CONFIGURE: more options for wayland support + * BUILD: add wayland support + 2012-02-11 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 8.0 (devel) * DEPENDS: add optional udev |