Magellan Linux

  • Back to homepage
    • /[smage]/trunk/core/mesa/mesa-9.1-r1.smage2

    Diff of /trunk/core/mesa/mesa-9.1-r1.smage2

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

    revision 16843 by niro, Fri Mar 8 12:02:52 2013 UTC revision 16844 by niro, Fri Mar 8 13:50:39 2013 UTC
    # Line 104  add_gallium_driver() Line 104  add_gallium_driver()
    104   fi   fi
    105  }  }
    106    
    107  install_gbm_driver()  install_dri_driver()
    108  {  {
    109   local driver="$1"   local driver="$1"
    110     mmake -C src/mesa/drivers/dri/${driver} DESTDIR=${BINDIR} install || die
    111    }
    112    
    113    install_gallium_driver()
    114    {
    115     local driver="$1"
    116    
    117     if [[ ${driver} = radeonsi ]]
    118     then
    119     # prereq - libllvmradeon${PVER}.so is needed to link the radeonsi driver
    120     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} install || die
    121     fi
    122    
    123     mmake -C src/gallium/targets/dri-${driver} DESTDIR=${BINDIR} install || die
    124    
    125     if [[ ${driver} = radeonsi ]]
    126     then
    127     # remove prereq libs
    128     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} uninstall || die
    129     fi
    130    }
    131    
    132    install_gallium_pipe_driver()
    133    {
    134     local driver="$1"
    135    
    136     # prereq - libllvmradeon${PVER}.so is needed to link the pipes
    137     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} install || die
    138    
    139   mmake -C src/gallium/targets/gbm DESTDIR=${BINDIR} install || die   mmake -C src/gallium/targets/pipe-loader DESTDIR=${BINDIR} install || die
    140   zapmost ${BINDIR}/usr/$(mlibdir)/gbm pipe_${driver}.so || die   zapmost ${BINDIR}/usr/$(mlibdir)/gallium-pipe pipe_${driver}.so || die
    141   if [[ $(mlibdir) != lib ]]   if [[ $(mlibdir) != lib ]]
    142   then   then
    143   zapmost ${BINDIR}/usr/lib/gbm pipe_${driver}.so || die   zapmost ${BINDIR}/usr/lib/gallium-pipe pipe_${driver}.so || die
    144     fi
    145    
    146     # remove prereq libs
    147     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} uninstall || die
    148    }
    149    
    150    install_gallium_vdpau_driver()
    151    {
    152     local driver="$1"
    153    
    154     if [[ ${driver} = radeonsi ]]
    155     then
    156     # prereq - libllvmradeon${PVER}.so is needed to link the radeonsi vdpau driver
    157     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} install || die
    158     fi
    159    
    160     mmake -C src/gallium/targets/vdpau-${driver} DESTDIR=${BINDIR} install || die
    161    
    162     if [[ ${driver} = radeonsi ]]
    163     then
    164     # remove prereq libs
    165     mmake -C src/gallium/drivers/radeon DESTDIR=${BINDIR} uninstall || die
    166   fi   fi
    167  }  }
    168    
    # Line 528  src_install_mesa() Line 578  src_install_mesa()
    578   # remove vdpau-drivers, they are in extra packages   # remove vdpau-drivers, they are in extra packages
    579   rm -rv ${BINDIR}/usr/$(mlibdir)/vdpau || die   rm -rv ${BINDIR}/usr/$(mlibdir)/vdpau || die
    580   # remove gbm-pipes, they are in extra packages   # remove gbm-pipes, they are in extra packages
    581   rm -rv ${BINDIR}/usr/$(mlibdir)/gbm/pipe_*.so || die   rm -rv ${BINDIR}/usr/$(mlibdir)/gallium-pipe/pipe_*.so || die
    582   done   done
    583  }  }
    584    
    # Line 536  if driver_enabled dri-swrast Line 586  if driver_enabled dri-swrast
    586  then  then
    587   src_install_mesa-dri-swrast()   src_install_mesa-dri-swrast()
    588   {   {
    589   mmake -C src/mesa/drivers/dri/swrast DESTDIR=${BINDIR} install || die   install_dri_driver swrast || die
    590   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    591   }   }
    592  fi  fi
    # Line 545  if driver_enabled dri-i810 Line 595  if driver_enabled dri-i810
    595  then  then
    596   src_install_mesa-dri-i810()   src_install_mesa-dri-i810()
    597   {   {
    598   mmake -C src/mesa/drivers/dri/i810 DESTDIR=${BINDIR} install || die   install_dri_driver i810 || die
    599   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    600   }   }
    601  fi  fi
    # Line 554  if driver_enabled dri-i915 Line 604  if driver_enabled dri-i915
    604  then  then
    605   src_install_mesa-dri-i915()   src_install_mesa-dri-i915()
    606   {   {
    607   mmake -C src/mesa/drivers/dri/i915 DESTDIR=${BINDIR} install || die   install_dri_driver i915 || die
    608   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    609   }   }
    610  fi  fi
    # Line 563  if driver_enabled dri-i965 Line 613  if driver_enabled dri-i965
    613  then  then
    614   src_install_mesa-dri-i965()   src_install_mesa-dri-i965()
    615   {   {
    616   mmake -C src/mesa/drivers/dri/i965 DESTDIR=${BINDIR} install || die   install_dri_driver i965 || die
    617   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    618   }   }
    619  fi  fi
    # Line 572  if driver_enabled dri-mach64 Line 622  if driver_enabled dri-mach64
    622  then  then
    623   src_install_mesa-dri-mach64()   src_install_mesa-dri-mach64()
    624   {   {
    625   mmake -C src/mesa/drivers/dri/mach64 DESTDIR=${BINDIR} install || die   install_dri_driver mach64 || die
    626   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    627   }   }
    628  fi  fi
    # Line 581  if driver_enabled dri-mga Line 631  if driver_enabled dri-mga
    631  then  then
    632   src_install_mesa-dri-mga()   src_install_mesa-dri-mga()
    633   {   {
    634   mmake -C src/mesa/drivers/dri/mga DESTDIR=${BINDIR} install || die   install_dri_driver mga || die
    635   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    636   }   }
    637  fi  fi
    # Line 590  if driver_enabled dri-r128 Line 640  if driver_enabled dri-r128
    640  then  then
    641   src_install_mesa-dri-r128()   src_install_mesa-dri-r128()
    642   {   {
    643   mmake -C src/mesa/drivers/dri/r128 DESTDIR=${BINDIR} install || die   install_dri_driver r128 || die
    644   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    645   }   }
    646  fi  fi
    # Line 599  if driver_enabled dri-r200 Line 649  if driver_enabled dri-r200
    649  then  then
    650   src_install_mesa-dri-r200()   src_install_mesa-dri-r200()
    651   {   {
    652   mmake -C src/mesa/drivers/dri/r200 DESTDIR=${BINDIR} install || die   install_dri_driver r200 || die
    653   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    654   }   }
    655  fi  fi
    # Line 608  if driver_enabled dri-r300 Line 658  if driver_enabled dri-r300
    658  then  then
    659   src_install_mesa-dri-r300()   src_install_mesa-dri-r300()
    660   {   {
    661   mmake -C src/mesa/drivers/dri/r300 DESTDIR=${BINDIR} install || die   install_dri_driver r300 || die
    662   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    663   }   }
    664  fi  fi
    # Line 617  if driver_enabled dri-r600 Line 667  if driver_enabled dri-r600
    667  then  then
    668   src_install_mesa-dri-r600()   src_install_mesa-dri-r600()
    669   {   {
    670   mmake -C src/mesa/drivers/dri/r600 DESTDIR=${BINDIR} install || die   install_dri_driver r600 || die
    671   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    672   }   }
    673  fi  fi
    # Line 626  if driver_enabled dri-radeon Line 676  if driver_enabled dri-radeon
    676  then  then
    677   src_install_mesa-dri-radeon()   src_install_mesa-dri-radeon()
    678   {   {
    679   mmake -C src/mesa/drivers/dri/radeon DESTDIR=${BINDIR} install || die   install_dri_driver radeon || die
    680   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    681   }   }
    682  fi  fi
    # Line 635  if driver_enabled dri-savage Line 685  if driver_enabled dri-savage
    685  then  then
    686   src_install_mesa-dri-savage()   src_install_mesa-dri-savage()
    687   {   {
    688   mmake -C src/mesa/drivers/dri/savage DESTDIR=${BINDIR} install || die   install_dri_driver savaga || die
    689   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    690   }   }
    691  fi  fi
    # Line 644  if driver_enabled dri-sis Line 694  if driver_enabled dri-sis
    694  then  then
    695   src_install_mesa-dri-sis()   src_install_mesa-dri-sis()
    696   {   {
    697   mmake -C src/mesa/drivers/dri/sis DESTDIR=${BINDIR} install || die   install_dri_driver sis || die
    698   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    699   }   }
    700  fi  fi
    # Line 653  if driver_enabled dri-tdfx Line 703  if driver_enabled dri-tdfx
    703  then  then
    704   src_install_mesa-dri-tdfx()   src_install_mesa-dri-tdfx()
    705   {   {
    706   mmake -C src/mesa/drivers/dri/tdfx DESTDIR=${BINDIR} install || die   install_dri_driver tdfx || die
    707   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    708   }   }
    709  fi  fi
    # Line 662  if driver_enabled dri-unichrome Line 712  if driver_enabled dri-unichrome
    712  then  then
    713   src_install_mesa-dri-unichrome()   src_install_mesa-dri-unichrome()
    714   {   {
    715   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die   install_dri_driver unichrome || die
    716   setup_dynamic_dri classic || die   setup_dynamic_dri classic || die
    717   }   }
    718  fi  fi
    # Line 671  if driver_enabled gallium-i915 Line 721  if driver_enabled gallium-i915
    721  then  then
    722   src_install_mesa-gallium-i915()   src_install_mesa-gallium-i915()
    723   {   {
    724   mmake -C src/gallium/targets/dri-i915 DESTDIR=${BINDIR} install || die   install_gallium_driver i915 || die
    725   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    726    
    727   # gbm   # gbm
    728   install_gbm_driver i915 || die   install_gallium_pipe_driver i915 || die
    729   }   }
    730  fi  fi
    731    
    # Line 683  if driver_enabled gallium-i965 Line 733  if driver_enabled gallium-i965
    733  then  then
    734   src_install_mesa-gallium-i965()   src_install_mesa-gallium-i965()
    735   {   {
    736   mmake -C src/gallium/targets/dri-i965 DESTDIR=${BINDIR} install || die   install_gallium_driver i965 || die
    737   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    738    
    739   # gbm   # gbm
    740   install_gbm_driver i965 || die   install_gallium_pipe_driver i965 || die
    741   }   }
    742  fi  fi
    743    
    # Line 695  if driver_enabled gallium-nouveau Line 745  if driver_enabled gallium-nouveau
    745  then  then
    746   src_install_mesa-gallium-nouveau()   src_install_mesa-gallium-nouveau()
    747   {   {
    748   mmake -C src/gallium/targets/dri-nouveau DESTDIR=${BINDIR} install || die   install_gallium_driver nouveau || die
    749   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    750    
    751   # vdpau   # vdpau
    752   mmake -C src/gallium/targets/vdpau-nouveau DESTDIR=${BINDIR} install || die   install_gallium_vdpau_driver nouveau || die
    753    
    754   # gbm   # gbm
    755   install_gbm_driver nouveau || die   install_gallium_pipe_driver nouveau || die
    756   }   }
    757  fi  fi
    758    
    # Line 710  if driver_enabled gallium-r300 Line 760  if driver_enabled gallium-r300
    760  then  then
    761   src_install_mesa-gallium-r300()   src_install_mesa-gallium-r300()
    762   {   {
    763   mmake -C src/gallium/targets/dri-r300 DESTDIR=${BINDIR} install || die   install_gallium_driver r300 || die
    764   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    765    
    766   # vdpau   # vdpau
    767   mmake -C src/gallium/targets/vdpau-r300 DESTDIR=${BINDIR} install || die   install_gallium_vdpau_driver r300 || die
    768    
    769   # gbm   # gbm
    770   install_gbm_driver r300 || die   install_gallium_pipe_driver r300 || die
    771   }   }
    772  fi  fi
    773    
    # Line 725  if driver_enabled gallium-r600 Line 775  if driver_enabled gallium-r600
    775  then  then
    776   src_install_mesa-gallium-r600()   src_install_mesa-gallium-r600()
    777   {   {
    778   mmake -C src/gallium/targets/dri-r600 DESTDIR=${BINDIR} install || die   install_gallium_driver r600 || die
    779   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    780    
    781   # vdpau   # vdpau
    782   mmake -C src/gallium/targets/vdpau-r600 DESTDIR=${BINDIR} install || die   install_gallium_vdpau_driver r600 || die
    783    
    784   # gbm   # gbm
    785   install_gbm_driver r600 || die   install_gallium_pipe_driver r600 || die
    786   }   }
    787  fi  fi
    788    
    # Line 740  if driver_enabled gallium-radeonsi Line 790  if driver_enabled gallium-radeonsi
    790  then  then
    791   src_install_mesa-gallium-radeonsi()   src_install_mesa-gallium-radeonsi()
    792   {   {
    793   mmake -C src/gallium/targets/dri-radeonsi DESTDIR=${BINDIR} install || die   install_gallium_driver radeonsi || die
    794   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    795    
    796   # vdpau   # vdpau
    797   mmake -C src/gallium/targets/vdpau-radeonsi DESTDIR=${BINDIR} install || die   install_gallium_vdpau_driver radeonsi || die
    798    
    799   # gbm   # gbm
    800   install_gbm_driver radeonsi || die   install_gallium_pipe_driver radeonsi || die
    801   }   }
    802  fi  fi
    803    
    # Line 755  if driver_enabled gallium-swrast Line 805  if driver_enabled gallium-swrast
    805  then  then
    806   src_install_mesa-gallium-swrast()   src_install_mesa-gallium-swrast()
    807   {   {
    808   mmake -C src/gallium/targets/dri-swrast DESTDIR=${BINDIR} install || die   install_gallium_driver swrast || die
    809   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    810    
    811   # vdpau   # vdpau
    812   mmake -C src/gallium/targets/vdpau-softpipe DESTDIR=${BINDIR} install || die   install_gallium_vdpau_driver softpipe || die
    813    
    814   # gbm   # gbm
    815   install_gbm_driver swrast || die   install_gallium_pipe_driver swrast || die
    816   }   }
    817  fi  fi
    818    
    # Line 770  if driver_enabled gallium-vmwgfx Line 820  if driver_enabled gallium-vmwgfx
    820  then  then
    821   src_install_mesa-gallium-vmwgfx()   src_install_mesa-gallium-vmwgfx()
    822   {   {
    823   mmake -C src/gallium/targets/dri-vmwgfx DESTDIR=${BINDIR} install || die   install_gallium_driver vmwgfx || die
    824   setup_dynamic_dri gallium || die   setup_dynamic_dri gallium || die
    825    
    826   # gbm   # gbm
    827   install_gbm_driver vmwgfx || die   install_gallium_pipe_driver vmwgfx || die
    828   }   }
    829  fi  fi
    830    
    Legend:
    Removed from v.16843  
    changed lines
      Added in v.16844