[Lunar-commits] CVS: moonbase/x11/XOrg BUILD, 1.6, 1.7 CONFIGURE, 1.8, 1.9 CONFLICTS, 1.1, 1.2 DEPENDS, 1.2, 1.3 DETAILS, 1.5, 1.6 POST_INSTALL, 1.4, 1.5 POST_REMOVE, 1.1, 1.2 PRE_BUILD, 1.3, 1.4

Moritz Heiber moe at lunar-linux.org
Mon Nov 22 18:31:40 UTC 2004


Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory espresso.foo-projects.org:/tmp/cvs-serv9860/XOrg

Modified Files:
	BUILD CONFIGURE CONFLICTS DEPENDS DETAILS POST_INSTALL 
	POST_REMOVE PRE_BUILD 
Log Message:
Aaaalllright. This is the all new and shiny XOrg module.
Split up into several smaller ones. This one's compiling
in 30 minutes on a P-M 1.4Ghz.
- fontconfig issues solved (and it doesn't break pango either yay!)
- Driver selection possible (might need some slight improvements
(like a sidebar) but works for now)
- Updated to 6.8.1 (fixes a serious security hole)
- Other stuff I forgot about


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	9 Jul 2004 10:05:04 -0000	1.6
+++ BUILD	22 Nov 2004 18:31:38 -0000	1.7
@@ -1,10 +1,15 @@
 (
-
   install_drm()  {
     DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
-    DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers"
+    DRI_DIR="extras/drm/linux"
+    DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/drm"
     mkdir -p $DRM_DEST
-    cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
+    cd $DRM_DIR &&
+    make
+    cd $SOURCE_DIRECTORY 
+    cd $DRI_DIR &&
+    make
+    cp $DRI_DIR/*.o $DRM_DEST 2>/dev/null
     depmod -a
     true
   }
@@ -14,27 +19,51 @@
     echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
   fi
 
-  message "Building XOrg takes a very long time."
-
   bad_flags '-funroll-loops' '-ffast-math'
 
-  # first copy the stored settings over:
-  cp $CONFIG_CACHE/host.def config/cf/host.def &&
+  # Here we go for our host.def
 
-  # then add stuff on the fly:
   echo  "#define InstallXdmConfig YES"          >> config/cf/host.def &&
   echo  "#define InstallXinitConfig YES"        >> config/cf/host.def &&
+  echo  "#define InstallXserverSetUID YES"      >> config/cf/host.def &&
+  echo  "#define BuildServersOnly NO"           >> config/cf/host.def &&
+
   if module_installed Linux-PAM ; then
-    echo "#define HasPam YES"                   >> config/cf/host.def
-  fi &&
+    echo "#define HasPam YES"                   >> config/cf/host.def &&
+    echo "#define HasPamMisc YES"               >> config/cf/host.def 
+  fi 
+
+  if [ -n "$XORG_DRIVERS" ]; then
+    echo "#define XF86CardDrivers $XORG_DRIVERS" >> config/cf/host.def
+  fi
 
   echo  "#define DefaultCCOptions      $CFLAGS" >> config/cf/host.def &&
-  echo  "#define DefaultGcc2i386Opt    $CFLAGS" >> config/cf/host.def &&
   echo  "#define LibraryCDebugFlags    $CFLAGS" >> config/cf/host.def &&
   echo  "#define DefaultCDebugFlags    $CFLAGS" >> config/cf/host.def &&
   echo  "#define OptimizedCDebugFlags  $CFLAGS" >> config/cf/host.def &&
-	  
-
+  echo  "#define XVendorString \"Lunar-Linux.org (xorg.freedesktop.org $VERSION)\"" >> config/cf/host.def &&
+  echo  "#define HasZlib YES"                   >> config/cf/host.def &&
+  echo  "#define HasFreetype2 YES"              >> config/cf/host.def &&
+  echo  "#define ForceNormalLib  YES"           >> config/cf/host.def &&	
+  echo  "#define HasExpat  YES"			>> config/cf/host.def &&
+  echo  "#define UseExpat  YES"                 >> config/cf/host.def &&
+  echo  "#define HasLibpng YES"			>> config/cf/host.def &&
+  echo  "#define BuildDocs NO"			>> config/cf/host.def &&
+  
+  if module_installed libxml2; then
+    echo "#define HasLibxml2 YES"		>> config/cf/host.def;
+  else
+    echo "#define HasLibxml2 YES"		>> config/cf/host.def;
+  fi &&
+  
+  echo  "#define InstallFontconfigLibrary NO"   >> config/cf/host.def &&
+  echo  "#define SharedLibXft YES"		>> config/cf/host.def &&
+  echo  "#define PreferXdmcpIPv6 YES"		>> config/cf/host.def &&
+  echo  "#define BuildFontServer NO"		>> config/cf/host.def &&
+  echo  "#define BuildFonts NO"			>> config/cf/host.def &&
+  echo  "#define MakeLocalFontDir NO"		>> config/cf/host.def &&
+  echo  "#define InstallFSConfig NO"		>> config/cf/host.def &&
+  
   if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
     # This must happen or it will cause the module to break
     # claiming "Kernel only header included in userspace"
@@ -42,12 +71,12 @@
     cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
     invoke_installwatch
   fi
-
+  
   make World                            &&
   prepare_install                       &&
   cd $SOURCE_DIRECTORY                  &&
   make install                          &&
-  make  install.man                     &&
+  make install.man                      &&
   install_drm                           &&
   mkdir -p /usr/X11R6/include/GL        &&
   rm     -f  /usr/X11R6/lib/libz.a      &&
@@ -55,32 +84,36 @@
   rm     -f /usr/X11R6/include/zconf.h  &&
   rm     -f /usr/X11R6/lib/libz.a       &&
 
-  if  [  !  -e                      /etc/skel/.xsession  ];  then
-    cp  $SCRIPT_DIRECTORY/xsession  /etc/skel/.xsession
-  fi  &&
+  if [ ! -e /etc/skel/.xsession ]; then
+    cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
+  fi &&
 
-  if  [  !  -e                    /usr/bin/X11  ];  then
-    ln      -sf   /usr/X11R6/bin  /usr/bin/X11
-  fi  &&
+  if [ ! -e /usr/bin/X11 ]; then
+    ln -sf /usr/X11R6/bin /usr/bin/X11
+  fi &&
 
-  if  [  !  -e          /usr/X11  ];  then
-    ln      -sf  X11R6  /usr/X11
-  fi  &&
+  if [ ! -e /usr/X11 ]; then
+    ln -sf /usr/X11R6 /usr/X11
+  fi &&
 
-  if  [  !  -e                         /usr/include/X11  ];  then
-    ln      -sf  ../X11R6/include/X11  /usr/include/X11
-  fi  &&
+  if [ ! -e /usr/include/X11 ]; then
+    ln -sf  /usr/X11R6/include/X11 /usr/include/X11
+  fi &&
 
-  if  [  !  -e                     /usr/lib/X11  ];  then
-    ln      -sf  ../X11R6/lib/X11  /usr/lib/X11
-  fi  &&
+  if [ ! -e /usr/lib/X11 ]; then
+    ln -sf /usr/X11R6/lib/X11 /usr/lib/X11
+  fi &&
 
-  if  [  !  -e                     /usr/lib/libMesaGLU.so ];  then
-    ln      -sf  /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
+  if [ ! -e  /usr/lib/libMesaGLU.so ]; then
+    ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
   fi  &&
 
-  if  [  !  -e                /usr/X11R6/lib/libMesaGL.so ];  then
-    ln      -sf  /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
+  if [ ! -e /usr/X11R6/lib/libMesaGL.so ]; then
+    ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
   fi
-
+  
+  if [ ! -e /usr/lib/pkgconfig/xft.pc ]; then
+    ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig/xft.pc
+  fi
+  
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFIGURE,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CONFIGURE	14 Oct 2004 17:22:25 -0000	1.8
+++ CONFIGURE	22 Nov 2004 18:31:38 -0000	1.9
@@ -1,326 +1,27 @@
+# only lin -r will trigger the driver chooser
 
-optimize $GCCVER
-bad_flags '-funroll-loops' '-ffast-math'
-
-build_checklist()  {
-
-  STATUS=$1
-  LABEL=$2
-  shift  2
-
-  for  ITEM  in  $@;  do
-    echo  $ITEM  $LABEL  $STATUS
-  done
-
-}
-
-
-select_card_drivers()  {
-
-  TITLE="Graphics Card Driver Selection Menu"
-  HELP="Key:  [X] = on, [ ] = off"
-
-  CHECKLIST="`build_checklist ON   Graphics   $ON_CARD_DRIVERS`
-             `build_checklist OFF  Graphics  $OFF_CARD_DRIVERS`"
-
-  if  XF86CardDrivers=`dialog  --backtitle  "$BACKTITLE"  \
-                               --title      "$TITLE"      \
-                               --stdout                   \
-                               --separate-output          \
-                               --checklist  "$HELP"       \
-                               18 55 10                   \
-                               $CHECKLIST`
-  then
-     ON_CARD_DRIVERS=$XF86CardDrivers
-    OFF_CARD_DRIVERS=$CARD_DRIVERS
-
-    for  ITEM  in  $ON_CARD_DRIVERS;  do
-      OFF_CARD_DRIVERS=`echo  $OFF_CARD_DRIVERS  |  sed  s/$ITEM//`
-    done
-  fi
-
-}
-
-
-select_dridrivers()  {
-
-  TITLE="DRI Driver Selection Menu"
-  HELP="Not all XOrg supported graphics cards have DRI.
-Key:  [X] = on, [ ] = off"
-
-    CHECKLIST="`build_checklist  ON   DRI   $ON_DRI`
-               `build_checklist  OFF  DRI  $OFF_DRI`"
-
-  if  DriDrivers=`dialog  --backtitle  "$BACKTITLE"  \
-                          --title      "$TITLE"      \
-                          --stdout                   \
-                          --separate-output          \
-                          --checklist  "$HELP"       \
-                          18 55 10                   \
-                          $CHECKLIST`
-  then
-     ON_DRI=$DriDrivers
-    OFF_DRI=$DRI
-
-    for  ITEM  in  $ON_DRI;  do
-      OFF_DRI=`echo  $OFF_DRI  |  sed  s/$ITEM//`
-    done
-  fi
-
-}
-
-
-select_input_drivers()  {
-
-  TITLE="Input Driver Selection Menu"
-  HELP="Key:  [X] = on, [ ] = off"
-
-  CHECKLIST="`build_checklist  ON   Input   $ON_INPUT_DRIVERS`
-             `build_checklist  OFF  Input  $OFF_INPUT_DRIVERS`"
-
-  if  XInputDrivers=`dialog  --backtitle  "$BACKTITLE"  \
-                             --title      "$TITLE"      \
-                             --stdout                   \
-                             --separate-output          \
-                             --checklist  "$HELP"       \
-                             18 55 10                   \
-                             $CHECKLIST`
-  then
-     ON_INPUT_DRIVERS=$XInputDrivers
-    OFF_INPUT_DRIVERS=$INPUT_DRIVERS
-
-    for  ITEM  in  $ON_INPUT_DRIVERS;  do
-      OFF_INPUT_DRIVERS=`echo  $OFF_INPUT_DRIVERS  |  sed  s/$ITEM//`
-    done
-  fi
-
-}
-
-
-initialize()  {
-
-  BACKTITLE="Lunar-Linux XOrg host.def Configuration Menu"
-
-   ON_CARD_DRIVERS="vga vesa v4l"
-  OFF_CARD_DRIVERS="mga glint nv tga s3virge sis rendition neomagic i740
-                    tdfx savage cirrus vmware tseng trident chips apm
-                    GlideDriver fbdev i128 ati i810 ark cyrix 
-                    siliconmotion AgpGartDrivers DevelDrivers 
-                    XF86OSCardDrivers"
-      CARD_DRIVERS="$ON_CARD_DRIVERS  $OFF_CARD_DRIVERS"
-
-
-   ON_DRI=""
-  OFF_DRI="gamma TdfxDriDriver mga i810 i830 r128 radeon sis r200 mach64 s3v"
-      DRI="$ON_DRI  $OFF_DRI"
-
-
-   ON_INPUT_DRIVERS="mouse keyboard"
-  OFF_INPUT_DRIVERS="acecad calcomp citron digitaledge dmc dynapro elographics
-                     fpit hyperpen jamstudio magictouch magellan microtouch
-                     mutouch palmax penmount summa tek4957 spaceorb wacom void"
-      INPUT_DRIVERS="$ON_INPUT_DRIVERS  $OFF_INPUT_DRIVERS"
-
-
-  YES_FONT_OPTIONS="BuildFonts MakeLocalFontDir Build75DpiFonts Build100DpiFonts
-                    BuildType1Fonts BuildTrueTypeFonts BuildSpeedoFonts
-                    BuildISO8859_15Fonts GzipFontCompression CompressAllFonts" 
-   NO_FONT_OPTIONS="BuildCIDFonts BuildCyrillicFonts UseKoi8RForCyrillic
-                    BuildLatin2Fonts BuildArabicFonts BuildThaiFonts 
-                    BuildGreekFonts BuildHebrewFonts BuildJapaneseFonts
-                    BuildKoreanFonts BuildBethMarduthoFonts BuildEthiopicFonts
-                    BuildChineseFonts BuildISO8859_2Fonts BuildISO8850_3Fonts
-                    BuildISO8859_4Fonts BuildISO8859_9Fonts BuildISO8859_10Fonts
-                    BuildISO8859_13Fonts BuildISO8859_14Fonts BuildISO8859_16Fonts
-                    BuildFontServer InstallFSConfig"
-      FONT_OPTIONS="$YES_FONT_OPTIONS  $NO_FONT_OPTIONS"
-
-  YES_MISC_OPTIONS="HasShm BuildXF86DRI BuildXF86DRM BuildGLULibrary 
-                    BuildGlxExt BuildOSMesaLib ThreadedX
-                    InstallXinitConfig InstallXdmConfig BuildXinerama"
-   NO_MISC_OPTIONS="BuildServersOnly  XnestServer
-                    LinuxFBDevSupport XVirtualFramebufferServer"
-      MISC_OPTIONS="$YES_MISC_OPTIONS  $NO_MISC_OPTIONS"
-
-}
-
-
-generate_host_def()  {
-
-  echo  "#define HasZlib YES"
-  echo  "#define HasFreetype2 YES"
-  echo  "#define ForceNormalLib  YES"
-  echo  "#define HasExpat  YES"
-  echo  "#define UseExpat  YES"
-  echo  "#define HasLibpng YES"
-  echo  "#define HasLibxml2 YES"
-  echo  "#define InstallFontconfigLibrary NO"
-
-  if module_installed tcl; then
-    echo "#define HasTcl    YES"
-    echo "#define TclLibDir /usr/lib"
-    echo "#define TclIncDir /usr/include"
-    echo "#define TclLibName tcl"
-  fi
-
-  if  [  -z  "$XF86CardDrivers"  ];  then
-    XF86CardDrivers="$ON_CARD_DRIVERS"
-  fi
-
-  XF86CardDrivers=`echo  $XF86CardDrivers  |  tr  '
-' ' '`
-  echo  "#define XF86CardDrivers $XF86CardDrivers"
-
-
-  if  [  -z  "$DriDrivers"  ];  then
-    echo  "#define DriDrivers /**/"
-  else
-    DriDrivers=`echo  $DriDrivers  |  tr  '
-' ' '`
-    echo  "#define DriDrivers $DriDrivers"
-  fi
-
-
-  if  [  -z  "$XInputDrivers"  ];  then
-    echo  "#define XInputDrivers mouse"
-  else
-    XInputDrivers=`echo  $XInputDrivers  |  tr  '
-' ' '`
-    echo  "#define XInputDrivers $XInputDrivers"
-  fi
-
-
-  for  ITEM  in   $YES_FONT_OPTIONS;  do
-    echo  "#define $ITEM  YES"
-  done
-
-  for  ITEM  in  $NO_FONT_OPTIONS;  do
-    echo  "#define $ITEM  NO"
-  done
-
-  for  ITEM  in   $YES_MISC_OPTIONS;  do
-    echo  "#define $ITEM  YES"
-  done
-
-  for  ITEM  in  $NO_MISC_OPTIONS;  do
-    echo  "#define $ITEM  NO"
-  done
-
-}
-
-
-save_host_def()  {
-
-
-  TARGET1="$CONFIG_CACHE/host.def"
-
-  dialog  --backtitle  "$BACKTITLE"                        \
-          --msgbox     "Saving Configuration to $TARGET1"  \
-          6 40
-
-  generate_host_def  >  "$TARGET1"
-
-}
-
-
-select_font_options() {
-
-  TITLE="Select Font Options"
-  CHECKLIST="`build_checklist  ON   Option  $YES_FONT_OPTIONS`
-             `build_checklist  OFF  Option   $NO_FONT_OPTIONS`"
-  HELP="Key:  [X] = on, [ ] = off"
-
-  if  ON_FONT_OPTIONS=`dialog  --backtitle  "$BACKTITLE"  \
-                               --title      "$TITLE"      \
-                               --stdout                   \
-                               --separate-output          \
-                               --checklist  "$HELP"       \
-                               18 55 10                   \
-                              $CHECKLIST`
-  then
-    YES_FONT_OPTIONS=$ON_FONT_OPTIONS
-     NO_FONT_OPTIONS=$FONT_OPTIONS
-
-    for  ITEM  in  $YES_FONT_OPTIONS;  do
-      NO_FONT_OPTIONS=`echo  $NO_FONT_OPTIONS  |  sed  s/$ITEM//`
-    done
-  fi
-
-}  
-
-
-select_misc_options() {
-
-  TITLE="Select Misc Options"
-  CHECKLIST="`build_checklist  ON   Option  $YES_MISC_OPTIONS`
-             `build_checklist  OFF  Option   $NO_MISC_OPTIONS`"
-  HELP="Key:  [X] = on, [ ] = off"
-
-  if  ON_MISC_OPTIONS=`dialog  --backtitle  "$BACKTITLE"  \
-                               --title      "$TITLE"      \
-                               --stdout                   \
-                               --separate-output          \
-                               --checklist  "$HELP"       \
-                               18 55 10                   \
-                               $CHECKLIST`
-  then
-    YES_MISC_OPTIONS=$ON_MISC_OPTIONS
-     NO_MISC_OPTIONS=$MISC_OPTIONS
-
-    for  ITEM  in  $YES_MISC_OPTIONS;  do
-      NO_MISC_OPTIONS=`echo  $NO_MISC_OPTIONS  |  sed  s/$ITEM//`
-    done
-  fi
-
-}
-
-
-configure_host_def()  {
-
-  initialize
-
-  while  
-
-    COMMAND=`dialog  --backtitle  "$BACKTITLE"                        \
-                     --stdout                                         \
-                     --title  "Main Menu"                             \
-                     --default-item  $COMMAND                         \
-                     --nocancel                                       \
-                     --menu                                           \
-                     ""                                               \
-                     18 55 10                                         \
-                     "XF86CardDrivers"  "Select Video Card Drivers"   \
-                     "DriDrivers"       "Select Direct DRI Drivers"   \
-                     "XInputDrivers"    "Select Input Drivers"        \
-                     "Fonts"            "Select Font Options"         \
-                     "Misc"             "Set other Options"           \
-                     "Save"             "Save current configuration"  \
-                     "Edit"             "Edit host.def"               \
-                     "Exit"             "Done here.  Start building"`
-  do
-
-    case  $COMMAND  in
-                 Exit)  break                        ;;
-                 Save)  save_host_def                ;;
-                 Edit)  [  -n   "$EDITOR"  ]         &&
-                        $EDITOR  /etc/lunar/local/host.def  ||
-                        nano     /etc/lunar/local/host.def  ;;
-      XF86CardDrivers)  select_card_drivers          ;;
-           DriDrivers)  select_dridrivers            ;;
-        XInputDrivers)  select_input_drivers         ;;
-                Fonts)  select_font_options          ;;
-                 Misc)  select_misc_options          ;;
-    esac
-  done
-
-}
+if [ -n "$RECONFIGURE" ] || query "Select specific video drivers to build?" n ; then        
+    ALL_XORG_DRIVERS="vga vesa v4l mga glint nv tga s3virge sis rendition neomagic i740 tdfx savage cirrus vmware tseng trident chips apm GlideDriver fbdev i128 ati i810 ark cyrix siliconmotion AgpGartDrivers DevelDrivers XF86OSCardDrivers"
+    XORG_DRIVERS=$(get_module_config XORG_DRIVERS)
+    if [ -z "$XORG_DRIVERS" ]; then
+        XORG_DRIVERS="$ALL_XORG_DRIVERS"
+    fi
+    
+    # if it's empty we just enable all
+    list_xorg_drivers()
+    {
+        for DRIVER in $ALL_XORG_DRIVERS; do
+            echo $DRIVER
+            echo "driver"	
+            if echo $XORG_DRIVERS | grep -qw $DRIVER; then
+                echo on
+            else
+                echo off
+            fi
+        done
+    }
 
-if [ ! -f $CONFIG_CACHE/host.def ] ; then
-  configure_host_def
-else
-  message "Reconfiguration is optional."
-  if query "Configure host.def?" n ; then
-    configure_host_def
-  fi
+    XORG_DRIVERS=`dialog --backtitle "XOrg video driver selection" --stdout --separate-output --checklist "Key:  [X] = on, [ ] = off" 18 55 10 $(list_xorg_drivers)`
+    # hack to strip newlines
+    set_module_config XORG_DRIVERS "$(echo $XORG_DRIVERS)"
 fi
-

Index: CONFLICTS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/CONFLICTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFLICTS	7 Apr 2004 17:51:22 -0000	1.1
+++ CONFLICTS	22 Nov 2004 18:31:38 -0000	1.2
@@ -1,2 +1,4 @@
 conflicts xfree86 &&
-conflicts xfree86-beta
+conflicts xfree86-beta &&
+conflicts XOrg &&
+conflicts XOrg-test

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS	7 Apr 2004 18:09:48 -0000	1.2
+++ DEPENDS	22 Nov 2004 18:31:38 -0000	1.3
@@ -1,6 +1,7 @@
 depends  perl    &&
 depends  libpng  &&
-depends  fontconfig &&
+depends  XOrg-fonts-base  &&
 
+optional_depends "XOrg-fonts-extra" "" "" "for even more fonts" &&
 optional_depends "Linux-PAM" "" "" "for Linux-PAM Support" &&
 optional_depends "tcl" "" "" "for tcl support" 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	5 Oct 2004 09:30:21 -0000	1.5
+++ DETAILS	22 Nov 2004 18:31:38 -0000	1.6
@@ -1,33 +1,21 @@
           MODULE=XOrg
-         VERSION=6.7.0
+         VERSION=6.8.1
           SOURCE=X11R${VERSION}-src1.tar.gz
          SOURCE2=X11R${VERSION}-src2.tar.gz
          SOURCE3=X11R${VERSION}-src3.tar.gz
-         SOURCE4=X11R${VERSION}-src4.tar.gz
-         SOURCE5=X11R${VERSION}-src5.tar.gz
-         SOURCE6=X11R${VERSION}-src6.tar.gz
-         SOURCE7=X11R${VERSION}-src7.tar.gz
-	 SOURCE8=XOrg-6.7.0-drm-no-count.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
-      SOURCE_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE2_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE3_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE4_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE5_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE6_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE7_URL=http://freedesktop.org/~xorg/X11R${VERSION}/src/
-     SOURCE8_URL=$PATCH_URL/
-      SOURCE_VFY=md5:22465263bae7a2e9f5ad77e172cf1ab5
-     SOURCE2_VFY=md5:6ef4e8f7647a28f080c10ea1bcf01f79
-     SOURCE3_VFY=md5:4c7144786522bbce383b21ace72bf669
-     SOURCE4_VFY=md5:4f2ed6fe4378fe60b58b8b4c8487cab0
-     SOURCE5_VFY=md5:87177e6e6ac5b2d7de6a032ee8641ec1
-     SOURCE6_VFY=md5:f52fe308e14525e3fa1eeb9dcd6d83a6
-     SOURCE7_VFY=md5:69aa33d9faa5d324c84943c2025f9d8e
-     SOURCE8_VFY=md5:6129cf023257b89c57269a5a32a680a2
+   SOURCE_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/
+   SOURCE_URL[1]=ftp://ftp.sunet.se/pub/X11/ftp.x.org/X11R${VERSION}/src/
+  SOURCE2_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/
+  SOURCE2_URL[1]=ftp://ftp.sunet.se/pub/X11/ftp.x.org/X11R${VERSION}/src/
+  SOURCE3_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/
+  SOURCE3_URL[1]=ftp://ftp.sunet.se/pub/X11/ftp.x.org/X11R${VERSION}/src/
+      SOURCE_VFY=sha1:027d16317e07d9df166c0176a1f28b2614f38cc9
+     SOURCE2_VFY=sha1:17f543f49599290b6e4cd4d963c643cd8c19158a
+     SOURCE3_VFY=sha1:e17afc90b0c43f4f40b2ff7410f4ff5d4297de28
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
-         UPDATED=20040407
+         UPDATED=20041122
            SHORT="XOrg is the Open Source Public Implementation of X11"
 cat << EOF
 What is XOrg?

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/POST_INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- POST_INSTALL	20 Aug 2004 08:05:36 -0000	1.4
+++ POST_INSTALL	22 Nov 2004 18:31:38 -0000	1.5
@@ -5,27 +5,12 @@
   sedit 2s:#:.\ /etc/profile: /etc/X11/xdm/Xsession
 fi
 
-# run xfs only on unix socket:
-if [ -f /etc/X11/fs/config ] ; then
-  if ! grep -q "no-listen = tcp" /etc/X11/fs/config ; then
-    cat >> /etc/X11/fs/config <<EOF
-
-# more secure: do not listen on tcp ports
-no-listen = tcp
-
-EOF
-  fi
-fi
-
-if   !   [  -d  /usr/lib/pkgconfig  ]
-then  mkdir -p /usr/lib/pkgconfig
+if ! [ -d  /usr/lib/pkgconfig ]; then
+  mkdir -p /usr/lib/pkgconfig
 fi 
 
-ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig        &&
-ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
-
-message "Running fc-cache please be patient" &&
-/usr/X11R6/bin/fc-cache -f 
+message "Running fc-cache..." &&
+/usr/bin/fc-cache -f 
 
-message "Somethings are diffrent than XFree86, xf86config=xorgconfig" 
+message "Some things are diffrent from XFree86 f.e. xf86config=xorgconfig" 
 message "xf86cfg=xorgcfg and /etc/X11/XF86Config=/etc/X11/xorg.conf"

Index: POST_REMOVE
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/POST_REMOVE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_REMOVE	7 Apr 2004 17:51:22 -0000	1.1
+++ POST_REMOVE	22 Nov 2004 18:31:38 -0000	1.2
@@ -1 +1,16 @@
-lrm xserver
+# Remove xserver
+
+  if module_installed xserver; then lrm xserver; fi
+
+# Tidy up
+
+  rm -Rf /usr/X11*
+
+# Remove broken symlinks
+
+  rm -Rf /usr/lib/pkgconfig/fontconfig.pc
+  rm -Rf /usr/lib/pkgconfig/xft.pc
+
+# Reinstall fontconfig since its broken now
+
+  if module_installed fontconfig; then lin -c fontconfig; fi

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/PRE_BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PRE_BUILD	9 Jul 2004 11:06:20 -0000	1.3
+++ PRE_BUILD	22 Nov 2004 18:31:38 -0000	1.4
@@ -1,9 +1,5 @@
 validate_source_dir $SOURCE_DIRECTORY   &&
 mk_source_dir       $SOURCE_DIRECTORY   &&
-unpack              $SOURCE             &&
+unpack              $SOURCE             
 unpack              $SOURCE2            &&
-unpack              $SOURCE3            &&
-unpack              $SOURCE4            &&
-unpack              $SOURCE6            &&
-unpack              $SOURCE7            &&
-patch_it $SOURCE_CACHE/$SOURCE8 0
+unpack              $SOURCE3



More information about the Lunar-commits mailing list