Magellan Linux

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

    Diff of /trunk/include/xorg.sminc

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

    revision 18714 by niro, Wed Aug 14 09:43:17 2013 UTC revision 20668 by niro, Mon Feb 3 10:29:49 2014 UTC
    # Line 77  case ${PCAT} in Line 77  case ${PCAT} in
    77   x11-apps) URISUBDIR="app" ;;   x11-apps) URISUBDIR="app" ;;
    78   x11-base) URISUBDIR="xserver" ;;   x11-base) URISUBDIR="xserver" ;;
    79   x11-drivers) URISUBDIR="driver" ;;   x11-drivers) URISUBDIR="driver" ;;
    80   x11-libs) URISUBDIR="lib" ;;   x11-libs)
    81     case ${PNAME} in
    82     glamor-egl) URISUBDIR="driver" ;;
    83     *) URISUBDIR="lib" ;;
    84     esac
    85     ;;
    86   x11-misc) case ${PNAME} in   x11-misc) case ${PNAME} in
    87   xbitmaps|xkbdata) URISUBDIR="data" ;;   xbitmaps|xkbdata) URISUBDIR="data" ;;
    88   xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;   xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
    # Line 91  esac Line 96  esac
    96    
    97  SRC_URI=(  SRC_URI=(
    98   ${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}  
    99   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
    100   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    101  )  )
    # Line 160  fi Line 155  fi
    155    
    156  xorg_src_prepare()  xorg_src_prepare()
    157  {  {
      # check for old xorg installations  
      is_old_xorg_installed  
       
    158   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    159  }  }
    160    
    # Line 210  xorg_src_compile() Line 202  xorg_src_compile()
    202   mmake || die   mmake || die
    203  }  }
    204    
    205    xorg_src_check()
    206    {
    207     cd ${SRCDIR}
    208     mmake -k check || die
    209    }
    210    
    211  xorg_src_install()  xorg_src_install()
    212  {  {
    213   cd ${SRCDIR}   cd ${SRCDIR}
    # Line 222  xorg_src_install() Line 220  xorg_src_install()
    220   fi   fi
    221  }  }
    222    
    223  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.18714  
    changed lines
      Added in v.20668