Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/include/xorg.sminc

    Diff of /smage/trunk/include/xorg.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 3575 by niro, Mon Jul 9 17:42:08 2012 UTC revision 5113 by niro, Tue Sep 24 09:01:24 2013 UTC
    # Line 52  is_xorg_driver() Line 52  is_xorg_driver()
    52   return 1   return 1
    53  }  }
    54    
     # check if old <=Xorg-6.9 is installed; aborts installation  
     is_old_xorg_installed()  
     {  
      local RED="\033[1;6m\033[31m"  
      local DEF="\033[0m"  
       
      if [ -e /usr/X11R6 ] && [[ $(readlink /usr/X11R6) != ../usr ]]  
      then  
      echo  
      echo -e ${RED}" !!! Remove all old <=xorg-6.9 installations first."${DEF}  
      echo -e ${RED}" !!! You also need to check all packages which are installed to /usr/X11R6"${DEF}  
      echo  
       
      # print a pkg list if magequery supports this  
      if [[ -n $(/sbin/magequery -h | grep -- -f) ]]  
      then  
      echo "Please check following packages:"  
      /sbin/magequery -f /usr/X11R6 | while read pkg  
      do  
      echo -e " ${RED}*${DEF} ${pkg}"  
      done  
      echo  
      fi  
       
      die "/usr/X11R6 directory exists ..."  
      fi  
     }  
       
    55  # default vars  # default vars
    56  X11_DIR="/usr"  X11_DIR="/usr"
    57    
    # Line 93  INHERITS="${INHERITS} xorg" Line 65  INHERITS="${INHERITS} xorg"
    65  #XORG_MIRROR="http://ftp.x.org/pub"  #XORG_MIRROR="http://ftp.x.org/pub"
    66  XORG_MIRROR="http://xorg.freedesktop.org/archive"  XORG_MIRROR="http://xorg.freedesktop.org/archive"
    67    
    68    if [[ -n ${PCATEGORIE} ]] && [[ -z ${PCAT} ]]
    69    then
    70     PCAT="${PCATEGORIE}"
    71    fi
    72    
    73  # get the right subdir  # get the right subdir
    74  case ${PCAT} in  case ${PCAT} in
    75   app-doc) URISUBDIR="doc" ;;   app-doc) URISUBDIR="doc" ;;
    # Line 114  esac Line 91  esac
    91    
    92  SRC_URI=(  SRC_URI=(
    93   ${SRC_URI[*]}   ${SRC_URI[*]}
     # ${XORG_MIRROR}/individual/app/${SRCFILE}  
     # ${XORG_MIRROR}/individual/data/${SRCFILE}  
     # ${XORG_MIRROR}/individual/doc/${SRCFILE}  
     # ${XORG_MIRROR}/individual/driver/${SRCFILE}  
     # ${XORG_MIRROR}/individual/font/${SRCFILE}  
     # ${XORG_MIRROR}/individual/lib/${SRCFILE}  
     # ${XORG_MIRROR}/individual/proto/${SRCFILE}  
     # ${XORG_MIRROR}/individual/testdir/${SRCFILE}  
     # ${XORG_MIRROR}/individual/util/${SRCFILE}  
     # ${XORG_MIRROR}/individual/xserver/${SRCFILE}  
    94   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
    95   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    96  )  )
    # Line 183  fi Line 150  fi
    150    
    151  xorg_src_prepare()  xorg_src_prepare()
    152  {  {
      # check for old xorg installations  
      is_old_xorg_installed  
       
    153   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    154  }  }
    155    
    # Line 251  xorg_src_install() Line 215  xorg_src_install()
    215   fi   fi
    216  }  }
    217    
    218  xorg_preinstall()  export_inherits xorg src_prepare src_compile src_check src_install
     {  
      # check for old xorg installations  
      is_old_xorg_installed  
       
     # run this in postinstall to cover --src-install builds  
     # ( the is now package-dir at this moment, cause its not already builded :)  
     # if [[ -n ${XORG_FONT_PKG} ]]  
     # then  
     # xorg_discover_font_dirs  
     # fi  
     }  
       
     export_inherits xorg src_prepare src_compile src_check src_install preinstall  
    Legend:
    Removed from v.3575  
    changed lines
      Added in v.5113