2011/devel/x11/misc/xdm - Add safe configs for X server and use the appropri...

[Fatih Aşıcı]

Author: fatih
Date: Sat Oct 23 19:27:34 2010
New Revision: 103213

Added:
   2011/devel/x11/misc/xdm/files/xorg-safe-fbdev.conf
   2011/devel/x11/misc/xdm/files/xorg-safe-vesa.conf
Modified:
   2011/devel/x11/misc/xdm/files/start-dm.sh
   2011/devel/x11/misc/xdm/pspec.xml
Log:
Add safe configs for X server and use the appropriate one when needed

---
 files/start-dm.sh          |   10 +++++++++-
 files/xorg-safe-fbdev.conf |   18 ++++++++++++++++++
 files/xorg-safe-vesa.conf  |   18 ++++++++++++++++++
 pspec.xml                  |   12 +++++++++---
 4 files changed, 54 insertions(+), 4 deletions(-)

Modified: 2011/devel/x11/misc/xdm/files/start-dm.sh
=================================================================
--- 2011/devel/x11/misc/xdm/files/start-dm.sh	(original)
+++ 2011/devel/x11/misc/xdm/files/start-dm.sh	Sat Oct 23 19:27:34 2010
@@ -35,7 +35,15 @@
 export LC_ALL PATH XCURSOR_THEME
 
 if test "x$1" = "x--boot" && grep -qw "xorg=safe" /proc/cmdline; then
-    export XORGCONFIG=/usr/share/X11/xorg-safe.conf
+    MESA_LIBGL=/usr/lib/mesa/libGL.so.1.2
+    if [ "$(readlink /etc/alternatives/libGL)" != "$MESA_LIBGL" ]; then
+        /usr/sbin/alternatives --set libGL /usr/lib/mesa/libGL.so.1.2
+        /sbin/ldconfig -X
+    fi
+
+    DRIVER=vesa
+    test -c /dev/fb0 && DRIVER=fbdev
+    export XORGCONFIG=/usr/share/X11/xorg-safe-$DRIVER.conf
 fi
 
 # Trigger events against a locale change. This is needed for

Modified: 2011/devel/x11/misc/xdm/pspec.xml
=================================================================
--- 2011/devel/x11/misc/xdm/pspec.xml	(original)
+++ 2011/devel/x11/misc/xdm/pspec.xml	Sat Oct 23 19:27:34 2010
@@ -43,9 +43,6 @@
             <Dependency>libXrender</Dependency>
             <Dependency>libXt</Dependency>
             <Dependency>xinit</Dependency>
-            <!-- Not needed any more?
-            <Dependency>zorg</Dependency>
-            -->
         </RuntimeDependencies>
         <Conflicts>
             <Package releaseTo="31">xorg-app</Package>
@@ -65,6 +62,8 @@
             <AdditionalFile owner="root" permission="0644" target="/etc/pam.d/xdm">xdm.pam.d</AdditionalFile>
             <AdditionalFile owner="root" permission="0755" target="/usr/bin/start-dm">start-dm.sh</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/display-managers/xdm.desktop">xdm.desktop</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/X11/xorg-safe-fbdev.conf">xorg-safe-fbdev.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/X11/xorg-safe-vesa.conf">xorg-safe-vesa.conf</AdditionalFile>
         </AdditionalFiles>
         <Provides>
             <COMAR script="service.py">System.Service</COMAR>
@@ -72,6 +71,13 @@
     </Package>
 
     <History>
+        <Update release="13">
+            <Date>2010-10-23</Date>
+            <Version>1.1.10</Version>
+            <Comment>Add safe configs for X server and use the appropriate one when needed</Comment>
+            <Name>Fatih Aşıcı</Name>
+            <Email>fatih at pardus.org.tr</Email>
+        </Update>
         <Update release="12">
             <Date>2010-10-23</Date>
             <Version>1.1.10</Version>