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 7724 by niro, Mon May 30 14:19:17 2011 UTC revision 7733 by niro, Mon May 30 16:54:21 2011 UTC
    # Line 37  SDEPEND="${MESA_DEPEND} Line 37  SDEPEND="${MESA_DEPEND}
    37   >= x11-proto/xcb-proto-1.6   >= x11-proto/xcb-proto-1.6
    38   >= x11-proto/xproto-7   >= x11-proto/xproto-7
    39   >= x11-proto/fixesproto-5   >= x11-proto/fixesproto-5
    40   >= x11-proto/damageproto-1.2"   >= x11-proto/damageproto-1.2
    41     >= dev-lang/python-2.7"
     PROVIDE="virtual/opengl"  
    42    
    43  # must be set before the include of multilib!  # must be set before the include of multilib!
    44  EMUL_LINUX_32=true  EMUL_LINUX_32=true
    45  sminclude xorg mtools multilib  sminclude xorg mtools multilib
    46    
     # not the same version anymore  
     MESA_PROGS_PVER="8.0.1"  
     MESA_PROGS_SRCFILE="mesa-demos-${MESA_PROGS_PVER}.tar.bz2"  
     MESA_PROGS_SRCDIR="${BUILDDIR}/mesa-demos-${MESA_PROGS_PVER}"  
       
    47  # must be set *after* the include of xorg!  # must be set *after* the include of xorg!
    48  SRCFILE="MesaLib-${PVER/_/-}.tar.bz2"  SRCFILE="MesaLib-${PVER/_/-}.tar.bz2"
    49  # libs SRCDIR  # libs SRCDIR
    50  SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"  SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"
    51    
    52  SPLIT_PACKAGES="mesa  SPLIT_PACKAGES="mesa
      mesa-progs  
    53   mesa-dri-swrast   mesa-dri-swrast
    54   mesa-dri-i810   mesa-dri-i810
    55   mesa-dri-i915   mesa-dri-i915
    # Line 75  SPLIT_PACKAGES="mesa Line 68  SPLIT_PACKAGES="mesa
    68    
    69  SRC_URI=(  SRC_URI=(
    70   ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${SRCFILE}   ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${SRCFILE}
      ftp://ftp.freedesktop.org/pub/mesa/demos/${MESA_PROGS_PVER}/${MESA_PROGS_SRCFILE}  
    71   sourceforge://mesa3d/${SRCFILE}   sourceforge://mesa3d/${SRCFILE}
      sourceforge://mesa3d/${MESA_PROGS_SRCFILE}  
    72   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
      mirror://${PNAME}/${MESA_PROGS_SRCFILE}  
    73   mirror://${PNAME}/libGLU.la   mirror://${PNAME}/libGLU.la
    74   mirror://${PNAME}/libGL.la   mirror://${PNAME}/libGL.la
    75     mirror://${PNAME}/${PNAME}-${PVER}-nouveau-missing-headers.patch
    76  )  )
    77    
    78  UP2DATE="updatecmd ftp://ftp.freedesktop.org/pub/mesa/current | lasttarball"  UP2DATE="updatecmd ftp://ftp.freedesktop.org/pub/mesa/current | lasttarball"
    # Line 93  split_info_mesa() Line 84  split_info_mesa()
    84    
    85   DEPEND="${MESA_DEPEND}"   DEPEND="${MESA_DEPEND}"
    86    
    87     PROVIDE="virtual/opengl"
    88    
    89   postinstall()   postinstall()
    90   {   {
    91   ${MROOT}/usr/sbin/opengl-update --use-old xorg   ${MROOT}/usr/sbin/opengl-update --use-old xorg
    92   }   }
    93  }  }
    94    
     split_info_mesa-progs()  
     {  
      DESCRIPTION="Mesa3D OpenGL graphics applications."  
      PCATEGORIE="x11-apps"  
       
      PVER="${MESA_PROGS_PVER}"  
      DEPEND="${MESA_PROGS_DEPEND}"  
       
      unset postinstall  
     }  
       
    95  split_info_mesa-dri-swrast()  split_info_mesa-dri-swrast()
    96  {  {
    97   DESCRIPTION="Mesa Software Raster DRI driver."   DESCRIPTION="Mesa Software Raster DRI driver."
    # Line 203  split_info_mesa-dri-unichrome() Line 185  split_info_mesa-dri-unichrome()
    185  src_prepare()  src_prepare()
    186  {  {
    187   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    188   all-abis "oldmunpack ${MESA_PROGS_SRCFILE} && cp -R ${MESA_PROGS_SRCDIR}/* ${SRCDIR}-$(mabi)/" || die  
    189     # fix missing nouveau headers
    190     mpatch ${PNAME}-${PVER}-nouveau-missing-headers.patch || die
    191    
    192   # no debug code in the drives (gentoo)   # no debug code in the drives (gentoo)
    193   all-abis 'find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;'   all-abis 'find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;'
    # Line 226  src_compile() Line 210  src_compile()
    210   --enable-asm \   --enable-asm \
    211   --enable-xcb \   --enable-xcb \
    212   --enable-glw \   --enable-glw \
    213   --disable-gallium \   --enable-egl \
    214   --disable-egl \   --enable-gles1 \
    215     --enable-gles2 \
    216     --enable-galium-egl \
    217     --enable-gallium-svga \
    218     --enable-gallium-radeon \
    219     --enable-gallium-r600 \
    220     --enable-gallium-nouveau \
    221     --enable-gallium-swrast \
    222     --enable-gallium-i915 \
    223     --enable-gallium-i965 \
    224     --with-state-trackers=glx,dri,egl,vega \
    225   || die   || die
    226    
    227   # only build software renderer on multilib arches   # only build software renderer on multilib arches
    # Line 236  src_compile() Line 230  src_compile()
    230   only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die   only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die
    231   fi   fi
    232    
    233   mmake || die   mmake -j1 || die
       
      # build mesa-progs  
      mmake -C progs/xdemos glxinfo || die  
      mmake -C progs/xdemos glxgears || die  
    234  }  }
    235    
    236  src_install_mesa()  src_install_mesa()
    # Line 330  src_install_mesa() Line 320  src_install_mesa()
    320   done   done
    321    
    322   # remove dri-drivers   # remove dri-drivers
    323   rm -r ${BINDIR}/usr/$(mlibdir)/dri || die  # rm -r ${BINDIR}/usr/$(mlibdir)/dri || die
    324   if [[ $(mlibdir) != lib ]]  # if [[ $(mlibdir) != lib ]]
    325   then  # then
    326   rm -r ${BINDIR}/usr/lib/dri || die  # rm -r ${BINDIR}/usr/lib/dri || die
    327   fi  # fi
     }  
       
     src_install_mesa-progs()  
     {  
      all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxgears || die  
      all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxinfo || die  
    328  }  }
    329    
    330  src_install_mesa-dri-swrast()  src_install_mesa-dri-swrast()
    # Line 416  src_install_mesa-dri-unichrome() Line 400  src_install_mesa-dri-unichrome()
    400  {  {
    401   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die
    402  }  }
    403    
    Legend:
    Removed from v.7724  
    changed lines
      Added in v.7733