Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (9255d702400bc55af238184118e9bb67cd5aaeb4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (9255d702400bc55af238184118e9bb67cd5aaeb4)
  • Date: Sun, 22 Jul 2012 09:05:53 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

graphics-libs/mesalib/CONFIGURE | 27 ++++++++++++++-------------
graphics-libs/mesalib/DEPENDS | 28 +++++++++++++++++-----------
graphics-libs/mesalib/HISTORY | 5 +++++
3 files changed, 36 insertions(+), 24 deletions(-)

New commits:
commit 9255d702400bc55af238184118e9bb67cd5aaeb4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesalib - cleanup obsolete options

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 1e31580..86ee0ad 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -57,14 +57,15 @@ config_query_option MESALIB_OPTS "enable TLS support in
GLX" n \
config_query_option MESALIB_OPTS "enable EGL library?" y \
"--enable-egl" "--disable-egl" &&

-config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
- "--enable-glu" "--disable-glu" &&
-
-config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
- "--enable-glw" "--disable-glw" &&
-
case "$MESALIB_BRANCH" in
scm|development)
+ list_remove MESALIB_OPTS "--enable-gles-overlay" &&
+ list_remove MESALIB_OPTS "--disable-gles-overlay" &&
+ list_remove MESALIB_OPTS "--enable-glu" &&
+ list_remove MESALIB_OPTS "--disable-glu" &&
+ list_remove MESALIB_OPTS "--enable-glw" &&
+ list_remove MESALIB_OPTS "--disable-glw" &&
+# list_remove MESALIB_OPTS "" &&
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" &&
@@ -83,16 +84,16 @@ case "$MESALIB_BRANCH" in
"--enable-gles2" "--disable-gles2"
fi &&
config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?"
n \
- "--enable-gles1" "--disable-gles1" &&
-
- if list_find "--enable-gles1" $MESALIB_OPTS || \
- list_find "--enable-gles2" $MESALIB_OPTS; then
+ "--enable-gles1" "--disable-gles1"

- config_query_option MESALIB_OPTS "build separate OpenGL ES only
libraries?" n \
- "--enable-gles-overlay" "--disable-gles-overlay"
- fi
;;
*)
+ config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
+ "--enable-glu" "--disable-glu" &&
+
+ config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
+ "--enable-glw" "--disable-glw" &&
+
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 14dd88f..f50a153 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -17,6 +17,20 @@ depends glproto &&
depends libxml2 &&
sub_depends libxml2 PYTHON &&

+case "$MESALIB_BRANCH" in
+ scm)
+ depends git;&
+ development)
+ depends libxcb &&
+ if [[ "$MESALIB_GALLIUM" != "none" ]]; then
+ depends llvm
+ if list_find wayland MESA_EGL;then
+ depends wayland
+ fi
+ fi
+ ;;
+ *)
+# these only apply to older branches
if list_find "$MESALIB_OPTS" "--enable-glw"; then
depends libxt
fi &&
@@ -39,7 +53,9 @@ fi &&

if spell_ok libdrm && is_version_less $(installed_version libdrm) 2.4.3; then
force_depends libdrm
-fi &&
+fi
+ ;;
+esac &&

if ( list_find "i915" $MESALIB_DRIVERS ) || \
( list_find "i965" $MESALIB_DRIVERS ); then
@@ -51,15 +67,5 @@ if ( list_find "r200" $MESALIB_DRIVERS ) || \
sub_depends libdrm RADEON
fi &&

-if [[ $MESALIB_BRANCH == "scm" ]]; then
- depends git
-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 09e47f1..2bcfe8d 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,8 @@
+2012-07-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, DEPENDS:
+ remove some options which do not exist in latest versions
+ cleanup testing of various versions
+
2012-07-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 8.0.4 (development)




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (9255d702400bc55af238184118e9bb67cd5aaeb4), Treeve Jelbert, 07/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page