[SM-Commit] GIT changes to master grimoire by Ethan Grammatikidis (89dedea8a196888e0d61887d2b2338a6ab37d292)

Ethan Grammatikidis scm at sourcemage.org
Tue Jan 20 15:25:07 EST 2009


GIT changes to master grimoire by Ethan Grammatikidis <eekee57 at fastmail.fm>:

 graphics-libs/mesalib/CONFIGURE    |   12 +++++++++++-
 graphics-libs/mesalib/HISTORY      |    4 ++++
 xorg-xserver/xorg-server/CONFIGURE |    8 +++++++-
 xorg-xserver/xorg-server/HISTORY   |    4 ++++
 xorg-xserver/xorg-server/PRE_BUILD |    4 +++-
 5 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 771f0dde9358b10e6e7a7eef74bb01e1a20d4352
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    mesalib: longer descriptive text for build type option

commit 23d238f863e383287b0c526ab9bef3ac54b2cff1
Author: Ethan Grammatikidis <eekee57 at fastmail.fm>
Commit: Ethan Grammatikidis <eekee57 at fastmail.fm>

    xorg-server: made mesa header path patch optional

diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 01a28af..2341231 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -17,8 +17,18 @@ MESALIB_BUILD=${MESALIB_BUILD/linux-ultrasparc/xlib}
 MESALIB_BUILD=${MESALIB_BUILD/linux/xlib}
 
 . $GRIMOIRE/config_query_multi.function                                  &&
+message "${MESSAGE_COLOR}MesaLib build types:\n"                         \
+        "xlib:   Stand-alone software rendering library;\n"              \
+	"        Output is via xlib library functions;\n"                \
+	"        No X server integration.\n"                             \
+        "dri:    Hardware acceleration in Linux with DRI-enabled kernel;\n"\
+	"        Integrated with DRI-enabled X server;\n"                \
+	"        Required for building xorg-xserver with DRI enabled.\n" \
+        "osmesa: Stand-alone software rendering library;\n"              \
+	"        Off-screen rendering only;\n"                           \
+	"        No connection to X server at all.${DEFAULT_COLOR}"      &&
 config_query_list MESALIB_BUILD                                          \
-                  "Select build type? (dri required for xorg-server)"    \
+                  "Select build type?"                                   \
                   xlib                                                   \
                   dri                                                    \
                   osmesa                                                 &&
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 09cb4d7..409ce54 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,7 @@
+2009-01-20 Ethan Grammatikidis <eekee57 at fastmail.fm>
+	* CONFIGURE: Added much longer message to really explain the build
+	  type option, based on what I read on mesalib's web site today.
+
 2009-01-18 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* CONFIGURE: Added text to query to ease building of xorg-server
 
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index c008a67..38f0eef 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -374,4 +374,10 @@ config_query_multi  XORG_SERVER_VIDEO_DRIVER_OBSCURE                        \
                     xf86-video-suncg14                                      \
                     xf86-video-newport                                      \
                     xf86-video-rendition                                    \
-                    xf86-video-siliconmotion
+                    xf86-video-siliconmotion                                &&
+
+config_query_option XORG_SERVER_MESA_PATH_PATCH                             \
+                    "Apply patch to search for extra mesalib include files?"\
+		    n                                                       \
+		    "t"                                                     \
+		    ""
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index c98a757..764a746 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2009-01-20 Ethan Grammatikidis <eekee57 at fastmail.fm>
+	* CONFIGURE, PRE_BUILD: made George's patch optional because it
+	  broke compilation for me.
+
 2009-01-18 George Sherwood <gsherwood at sourcemage.org>
 	* PRE_BUILD: Added patch
 	* xorg-server-mesa.patch: Added patch to fix Bug #14937
diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD
index 89094b4..016f982 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -3,5 +3,7 @@ cd "$SOURCE_DIRECTORY" &&
 unpack_file 2 &&
 
 #patch -p0 < "$SPELL_DIRECTORY/randr.patch"
-patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch"
+if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
+    patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch"
+fi &&
 patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch"



More information about the SM-Commit mailing list