Magellan Linux

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

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

revision 18713 by niro, Wed Aug 14 09:42:36 2013 UTC revision 20669 by niro, Mon Feb 3 10:30:26 2014 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" ;;
76   media-fonts) URISUBDIR="font" ;;   media-fonts) URISUBDIR="font" ;;
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   x11-misc) case ${PNAME} in   case ${PNAME} in
82   xbitmaps|xkbdata) URISUBDIR="data" ;;   glamor-egl) URISUBDIR="driver" ;;
83   xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;   *) URISUBDIR="lib" ;;
84   *)  URISUBDIR="util" ;;   esac
85   esac   ;;
86     x11-misc)
87     case ${PNAME} in
88     xbitmaps|xkbdata) URISUBDIR="data" ;;
89     xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
90     *)  URISUBDIR="util" ;;
91     esac
92   ;;   ;;
93   x11-proto) URISUBDIR="proto" ;;   x11-proto) URISUBDIR="proto" ;;
94   x11-themes) URISUBDIR="data" ;;   x11-themes) URISUBDIR="data" ;;
95   x11-wm) URISUBDIR="app" ;;   x11-wm) URISUBDIR="app" ;;
96  esac  esac
97    
98  SRC_URI=(  SRC_URI=(
99   ${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}  
100   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}   ${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
101   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
102  )  )
# Line 155  fi Line 156  fi
156    
157  xorg_src_prepare()  xorg_src_prepare()
158  {  {
  # check for old xorg installations  
  is_old_xorg_installed  
   
159   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
160  }  }
161    
# Line 205  xorg_src_compile() Line 203  xorg_src_compile()
203   mmake || die   mmake || die
204  }  }
205    
206    xorg_src_check()
207    {
208     cd ${SRCDIR}
209     mmake -k check || die
210    }
211    
212  xorg_src_install()  xorg_src_install()
213  {  {
214   cd ${SRCDIR}   cd ${SRCDIR}
# Line 217  xorg_src_install() Line 221  xorg_src_install()
221   fi   fi
222  }  }
223    
224  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.20669