[SM-Commit] GIT changes to devel-llvm-3.0 grimoire by Treeve Jelbert (d8d07510f1657ebb57abb63a6b2fb5d7a002b499)

Treeve Jelbert scm at sourcemage.org
Sun Feb 12 06:26:11 EST 2012


GIT changes to devel-llvm-3.0 grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 graphics-libs/mesalib/BUILD     |    1 +
 graphics-libs/mesalib/CONFIGURE |   27 +++++++++++++++++++++++----
 graphics-libs/mesalib/DEPENDS   |    3 +++
 graphics-libs/mesalib/HISTORY   |    6 ++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit d8d07510f1657ebb57abb63a6b2fb5d7a002b499
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    mesalib - add wayland support

commit 12262131ce98ada8ea0d62c5a272f063605a09b6
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    mesalib - more config options

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 397e436..d8468a1 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 0397278..f02758b 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -65,15 +65,34 @@ config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
 
 case "$MESALIB_BRANCH" in
   scm|development)
+    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"
+      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 fb8ea02..7eb77c1 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 e3ed3cf..b1f1532 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,6 +1,12 @@
+2012-02-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional wayland support
+	* CONFIGURE: more options for wayland support
+	* BUILD: add wayland support
+
 2012-02-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 8.0 (devel)
 	* DEPENDS: add optional udev
+	* CONFIGURE: add --enable-gallium and --enable-shared-glapi options
 
 2012-02-02 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: remove gccmakedep


More information about the SM-Commit mailing list