[Lunar-commits] r18857 - moonbase/trunk/zbeta/x11/xorg-server

[Samuel Verstraete]

Author: elangelo
Date: 2006-02-24 09:36:31 +0000 (Fri, 24 Feb 2006)
New Revision: 18857

Modified:
   moonbase/trunk/zbeta/x11/xorg-server/DETAILS
   moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
Log:
i changed this PRE_BUILD.... so the thing is changing the kernel headers... you can complain about this but it is the only working sollution to install x11r7 on kernel-headers-2.6
Though it might need an if... if module_installed kernel-headers-2.6; then cp and sed line; fi ... could someone with more bash skillz do that for me?
gr,S.


Modified: moonbase/trunk/zbeta/x11/xorg-server/DETAILS
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/DETAILS	2006-02-24 08:36:29 UTC (rev 18856)
+++ moonbase/trunk/zbeta/x11/xorg-server/DETAILS	2006-02-24 09:36:31 UTC (rev 18857)
@@ -6,7 +6,7 @@
       SOURCE_URL=ftp://ftp.x.org/pub/X11R7.0/src/everything/
      SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE_VFY=sha1:7aa97457d83cd350831821900a432c4c0204d9ac
-     SOURCE2_VFY=sha1:17e3ed67114cfc004b843831679ef38fc7fb7425 
+     SOURCE2_VFY=sha1:4f042bdf38c9eb62e04660bd18566e7ca50d8640 
    MODULE_PREFIX=${X11R7_PREFIX:-/usr/X11R7}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120

Modified: moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-02-24 08:36:29 UTC (rev 18856)
+++ moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-02-24 09:36:31 UTC (rev 18857)
@@ -1,3 +1,8 @@
 default_pre_build 	&&
 cd $SOURCE_DIRECTORY 	&&
-unpack $SOURCE2
+unpack $SOURCE2           &&
+
+cp -v /usr/include/linux/agpgart.h /usr/include/linux/agpgart.h.orig &&
+
+sed -e 's|__u16|unsigned short|g' -e 's|__u32|unsigned|g' \
+-i /usr/include/linux/agpgart.h