[SM-Commit] GIT changes to master grimoire by Andraž 'ruskie' Levstik (9c3241f62d9789bf381919187e699b883f4eab93)

Andraž 'ruskie' Levstik scm at sourcemage.org
Sun Feb 8 07:40:27 EST 2009


GIT changes to master grimoire by Andraž 'ruskie' Levstik <ruskie at codemages.net>:

 xorg-xserver/xorg-server/HISTORY   |    3 ++-
 xorg-xserver/xorg-server/PRE_BUILD |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5c1d90ceeaa65606a5b8246661e3bcda66e4c9b5
Author: Andraž 'ruskie' Levstik <ruskie at codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie at codemages.net>

    xorg-server: added a sed as per lynx' instructions

diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 3741725..6098871 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,5 +1,6 @@
 2009-02-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* PRE_BUILD: added smgl-gl_select patch, and run it before building
+	* PRE_BUILD: added smgl-gl_select patch, and run it before building,
+	  apply a sed as per lynx^3 to fix drm if patch is applied it seems
 	* DEPENDS: added smgl-gl_select
 	* gl_select.patch: patch to modify some installation paths
 	* DETAILS: patchlevel++
diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD
index bad81d6..2888e80 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -5,6 +5,8 @@ cd "$SOURCE_DIRECTORY" &&
 unpack_file 2 &&
 patch -p1 < $SPELL_DIRECTORY/gl_select.patch &&
 if [[ "$XORG_SERVER_MESA_PATH_PATCH" == "t" ]] ; then
-    patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch"
+  patch -p0 < "$SPELL_DIRECTORY/xorg-server-mesa.patch" &&
+  # according to lynx^3 this is necessary
+  sed -i 's,drm.h,drm/&,'  Mesa-7.3/include/GL/internal/dri_interface.h
 fi &&
 patch -p1 < "$SPELL_DIRECTORY/evdev-flush.patch"



More information about the SM-Commit mailing list