Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/mesa/mesa-7.10.2-r1.smage2

    Diff of /branches/magellan-next/core/mesa/mesa-7.10.2-r1.smage2

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

    revision 7736 by niro, Mon May 30 18:35:14 2011 UTC revision 7741 by niro, Mon May 30 21:46:26 2011 UTC
    # Line 453  src_install_mesa() Line 453  src_install_mesa()
    453   # the dri modules will never be found by libGL   # the dri modules will never be found by libGL
    454   # use "LIBGL_DEBUG=verbose glxinfo" to check this issue   # use "LIBGL_DEBUG=verbose glxinfo" to check this issue
    455   echo "LIBGL_DRIVERS_PATH=/usr/$(mlibdir)/dri" > ${BINDIR}/etc/env.d/09mesa-${abi} || die   echo "LIBGL_DRIVERS_PATH=/usr/$(mlibdir)/dri" > ${BINDIR}/etc/env.d/09mesa-${abi} || die
      done  
    456    
    457   # remove dri-drivers, they are in extra packages   # remove dri-drivers, they are in extra packages
    458   rm -r ${BINDIR}/usr/$(mlibdir)/dri || die   rm -r ${BINDIR}/usr/$(mlibdir)/dri || die
    459     done
    460  }  }
    461    
    462  src_install_mesa-dri-swrast()  src_install_mesa-dri-swrast()
    463  {  {
    464   mmake -C src/mesa/drivers/dri/swrast DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/swrast DESTDIR=${BINDIR} install || die
    465   # now setup dynamic dri   # now setup dynamic dri
    466   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    467  }  }
    468    
    469  src_install_mesa-dri-i810()  src_install_mesa-dri-i810()
    470  {  {
    471   mmake -C src/mesa/drivers/dri/i810 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/i810 DESTDIR=${BINDIR} install || die
    472   # now setup dynamic dri   # now setup dynamic dri
    473   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    474  }  }
    475    
    476  src_install_mesa-dri-i915()  src_install_mesa-dri-i915()
    477  {  {
    478   mmake -C src/mesa/drivers/dri/i915 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/i915 DESTDIR=${BINDIR} install || die
    479   # now setup dynamic dri   # now setup dynamic dri
    480   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    481  }  }
    482    
    483  src_install_mesa-dri-i965()  src_install_mesa-dri-i965()
    484  {  {
    485   mmake -C src/mesa/drivers/dri/i965 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/i965 DESTDIR=${BINDIR} install || die
    486   # now setup dynamic dri   # now setup dynamic dri
    487   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    488  }  }
    489    
    490  src_install_mesa-dri-mach64()  src_install_mesa-dri-mach64()
    491  {  {
    492   mmake -C src/mesa/drivers/dri/mach64 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/mach64 DESTDIR=${BINDIR} install || die
    493   # now setup dynamic dri   # now setup dynamic dri
    494   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    495  }  }
    496    
    497  src_install_mesa-dri-mga()  src_install_mesa-dri-mga()
    498  {  {
    499   mmake -C src/mesa/drivers/dri/mga DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/mga DESTDIR=${BINDIR} install || die
    500   # now setup dynamic dri   # now setup dynamic dri
    501   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    502  }  }
    503    
    504  src_install_mesa-dri-r128()  src_install_mesa-dri-r128()
    505  {  {
    506   mmake -C src/mesa/drivers/dri/r128 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/r128 DESTDIR=${BINDIR} install || die
    507   # now setup dynamic dri   # now setup dynamic dri
    508   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    509  }  }
    510    
    511  src_install_mesa-dri-r200()  src_install_mesa-dri-r200()
    512  {  {
    513   mmake -C src/mesa/drivers/dri/r200 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/r200 DESTDIR=${BINDIR} install || die
    514   # now setup dynamic dri   # now setup dynamic dri
    515   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    516  }  }
    517    
    518  src_install_mesa-dri-r300()  src_install_mesa-dri-r300()
    519  {  {
    520   mmake -C src/mesa/drivers/dri/r300 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/r300 DESTDIR=${BINDIR} install || die
    521   # now setup dynamic dri   # now setup dynamic dri
    522   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    523  }  }
    524    
    525  src_install_mesa-dri-r600()  src_install_mesa-dri-r600()
    526  {  {
    527   mmake -C src/mesa/drivers/dri/r600 DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/r600 DESTDIR=${BINDIR} install || die
    528   # now setup dynamic dri   # now setup dynamic dri
    529   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    530  }  }
    531    
    532  src_install_mesa-dri-radeon()  src_install_mesa-dri-radeon()
    533  {  {
    534   mmake -C src/mesa/drivers/dri/radeon DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/radeon DESTDIR=${BINDIR} install || die
    535   # now setup dynamic dri   # now setup dynamic dri
    536   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    537  }  }
    538    
    539  src_install_mesa-dri-savage()  src_install_mesa-dri-savage()
    540  {  {
    541   mmake -C src/mesa/drivers/dri/savage DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/savage DESTDIR=${BINDIR} install || die
    542   # now setup dynamic dri   # now setup dynamic dri
    543   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    544  }  }
    545    
    546  src_install_mesa-dri-sis()  src_install_mesa-dri-sis()
    547  {  {
    548   mmake -C src/mesa/drivers/dri/sis DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/sis DESTDIR=${BINDIR} install || die
    549   # now setup dynamic dri   # now setup dynamic dri
    550   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    551  }  }
    552    
    553  src_install_mesa-dri-tdfx()  src_install_mesa-dri-tdfx()
    554  {  {
    555   mmake -C src/mesa/drivers/dri/tdfx DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/tdfx DESTDIR=${BINDIR} install || die
    556   # now setup dynamic dri   # now setup dynamic dri
    557   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    558  }  }
    559    
    560  src_install_mesa-dri-unichrome()  src_install_mesa-dri-unichrome()
    561  {  {
    562   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die
    563   # now setup dynamic dri   # now setup dynamic dri
    564   setup_dynamic_dri classic   setup_dynamic_dri classic || die
    565  }  }
    566    
    567  src_install_mesa-gallium-i915()  src_install_mesa-gallium-i915()
    568  {  {
    569   mmake -C src/gallium/targets/dri-i915 DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-i915 DESTDIR=${BINDIR} install || die
    570   # now setup dynamic dri   # now setup dynamic dri
    571   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    572  }  }
    573    
    574  src_install_mesa-gallium-i965()  src_install_mesa-gallium-i965()
    575  {  {
    576   mmake -C src/gallium/targets/dri-i965 DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-i965 DESTDIR=${BINDIR} install || die
    577   # now setup dynamic dri   # now setup dynamic dri
    578   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    579  }  }
    580    
    581  src_install_mesa-gallium-nouveau()  src_install_mesa-gallium-nouveau()
    582  {  {
    583   mmake -C src/gallium/targets/dri-nouveau DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-nouveau DESTDIR=${BINDIR} install || die
    584   # now setup dynamic dri   # now setup dynamic dri
    585   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    586  }  }
    587    
    588  src_install_mesa-gallium-r300()  src_install_mesa-gallium-r300()
    589  {  {
    590   mmake -C src/gallium/targets/dri-r300 DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-r300 DESTDIR=${BINDIR} install || die
    591   # now setup dynamic dri   # now setup dynamic dri
    592   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    593  }  }
    594    
    595  src_install_mesa-gallium-r600()  src_install_mesa-gallium-r600()
    596  {  {
    597   mmake -C src/gallium/targets/dri-r600 DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-r600 DESTDIR=${BINDIR} install || die
    598   # now setup dynamic dri   # now setup dynamic dri
    599   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    600  }  }
    601    
    602  src_install_mesa-gallium-swrast()  src_install_mesa-gallium-swrast()
    603  {  {
    604   mmake -C src/gallium/targets/dri-swrast DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-swrast DESTDIR=${BINDIR} install || die
    605   # now setup dynamic dri   # now setup dynamic dri
    606   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    607  }  }
    608    
    609  src_install_mesa-gallium-vmwgfx()  src_install_mesa-gallium-vmwgfx()
    610  {  {
    611   mmake -C src/gallium/targets/dri-vmwgfx DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/dri-vmwgfx DESTDIR=${BINDIR} install || die
    612   # now setup dynamic dri   # now setup dynamic dri
    613   setup_dynamic_dri gallium   setup_dynamic_dri gallium || die
    614  }  }
    615    
    616  # setup_dynamic_dri $impl  # setup_dynamic_dri $impl
    # Line 619  setup_dynamic_dri() Line 619  setup_dynamic_dri()
    619  {  {
    620   local impl="$1"   local impl="$1"
    621   local i   local i
    622     local abi
    623    
    624   [[ -z ${impl} ]] && die "missing dri implementation!"   [[ -z ${impl} ]] && die "missing dri implementation!"
    625   case ${impl} in   case ${impl} in
    626   classic|gallium) continue ;;   classic|gallium) ;;
    627   *) die "unkown dri implementation '${impl}'!" ;;   *) die "unkown dri implementation '${impl}'!" ;;
    628   esac   esac
    629    
    630   minstalldir /usr/$(mlibdir)/mesa/${impl} || die   echo "settin up dynamic dri for a '${impl} implementation..."
    631   for i in ${BINDIR}/usr/$(mlibdir)/dri/*   if [[ -z ${MULTILIB_ABIS} ]]
    632   do   then
    633   if [ -f ${i} -o -L ${i} ]   minstalldir /usr/$(mlibdir)/mesa/${impl} || die
    634   then   for i in ${BINDIR}/usr/$(mlibdir)/dri/*_dri.so
    635   mv -f ${i} ${BINDIR}/usr/$(mlibdir)/mesa/${impl} || die "moving ${i}"   do
    636   fi   echo -n "  processing ${i}:"
    637   done   if [ -f ${i} -o -L ${i} ]
    638     then
    639     echo -n " moving"
    640     mv -vf ${i} ${BINDIR}/usr/$(mlibdir)/mesa/${impl} || die "moving ${i}"
    641     fi
    642     done
    643     else
    644     for abi in ${MULTILIB_ABIS}
    645     do
    646     [[ ${abi} = m32 ]] && ABI_LIBDIR="lib"
    647     [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"
    648    
    649     minstalldir /usr/$(mlibdir)/mesa/${impl} || die
    650     for i in ${BINDIR}/usr/$(mlibdir)/dri/*_dri.so
    651     do
    652     echo -n "  processing ${i}"
    653     if [ -f ${i} -o -L ${i} ]
    654     then
    655     echo -n " moving"
    656     mv -vf ${i} ${BINDIR}/usr/$(mlibdir)/mesa/${impl} || die "moving ${i}"
    657     fi
    658     echo " done"
    659     done
    660     done
    661     fi
    662  }  }
    Legend:
    Removed from v.7736  
    changed lines
      Added in v.7741