Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-stable/include/xorg.sminc

    Diff of /branches/R11-stable/include/xorg.sminc

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

    trunk/include/xorg.sminc revision 18713 by niro, Wed Aug 14 09:42:36 2013 UTC branches/R11-stable/include/xorg.sminc revision 19317 by niro, Tue Sep 3 15:56:41 2013 UTC
    # Line 65  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 86  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 155  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 205  xorg_src_compile() Line 197  xorg_src_compile()
    197   mmake || die   mmake || die
    198  }  }
    199    
    200    xorg_src_check()
    201    {
    202     cd ${SRCDIR}
    203     mmake -k check || die
    204    }
    205    
    206  xorg_src_install()  xorg_src_install()
    207  {  {
    208   cd ${SRCDIR}   cd ${SRCDIR}
    # Line 217  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
     {  
     # 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  
      return 0  
     }  
       
     export_inherits xorg src_prepare src_compile src_install preinstall  
    Legend:
    Removed from v.18713  
    changed lines
      Added in v.19317