Magellan Linux

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

Legend:
Removed from v.7736  
changed lines
  Added in v.7740