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 7721 by niro, Mon May 30 13:32:28 2011 UTC revision 7732 by niro, Mon May 30 16:50:43 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
    # Line 47  sminclude xorg mtools multilib Line 46  sminclude xorg mtools multilib
    46    
    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  PROGS_SRCFILE="MesaDemos-${PVER/_/-}.tar.bz2"  # libs SRCDIR
     # libs + progs have the same 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 71  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/${PVER}/${PROGS_SRCFILE}  
    71   sourceforge://mesa3d/${SRCFILE}   sourceforge://mesa3d/${SRCFILE}
      sourceforge://mesa3d/${PROGS_SRCFILE}  
    72   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
      mirror://${PNAME}/${PROGS_SRCFILE}  
    73   mirror://${PNAME}/libGLU.la   mirror://${PNAME}/libGLU.la
    74   mirror://${PNAME}/libGL.la   mirror://${PNAME}/libGL.la
    75  )  )
    # Line 89  split_info_mesa() Line 83  split_info_mesa()
    83    
    84   DEPEND="${MESA_DEPEND}"   DEPEND="${MESA_DEPEND}"
    85    
    86     PROVIDE="virtual/opengl"
    87    
    88   postinstall()   postinstall()
    89   {   {
    90   ${MROOT}/usr/sbin/opengl-update --use-old xorg   ${MROOT}/usr/sbin/opengl-update --use-old xorg
    91   }   }
    92  }  }
    93    
     split_info_mesa-progs()  
     {  
      DESCRIPTION="Mesa3D OpenGL graphics applications."  
      PCATEGORIE="x11-apps"  
       
      DEPEND="${MESA_PROGS_DEPEND}"  
       
      unset postinstall  
     }  
       
    94  split_info_mesa-dri-swrast()  split_info_mesa-dri-swrast()
    95  {  {
    96   DESCRIPTION="Mesa Software Raster DRI driver."   DESCRIPTION="Mesa Software Raster DRI driver."
    # Line 198  split_info_mesa-dri-unichrome() Line 184  split_info_mesa-dri-unichrome()
    184  src_prepare()  src_prepare()
    185  {  {
    186   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
      all-abis "oldmunpack ${PROGS_SRCFILE} && cp -R ${SRCDIR}/* ${SRCDIR}-$(mabi)/" || die  
    187    
    188   # no debug code in the drives (gentoo)   # no debug code in the drives (gentoo)
    189   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 221  src_compile() Line 206  src_compile()
    206   --enable-asm \   --enable-asm \
    207   --enable-xcb \   --enable-xcb \
    208   --enable-glw \   --enable-glw \
    209   --disable-gallium \   --enable-egl \
    210   --disable-egl \   --enable-gles1 \
    211     --enable-gles2 \
    212     --enable-galium-egl \
    213     --enable-gallium-svga \
    214     --enable-gallium-radeon \
    215     --enable-gallium-r600 \
    216     --enable-gallium-nouveau \
    217     --enable-gallium-swrast \
    218     --enable-gallium-i915 \
    219     --enable-gallium-i965 \
    220     --with-state-trackers=glx,dri,egl,vega \
    221   || die   || die
    222    
    223   # only build software renderer on multilib arches   # only build software renderer on multilib arches
    # Line 231  src_compile() Line 226  src_compile()
    226   only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die   only-m32 "echo 'DRI_DIRS =' >> configs/autoconf" || die
    227   fi   fi
    228    
    229   mmake || die   mmake -j1 || die
       
      # build mesa-progs  
      mmake -C progs/xdemos glxinfo || die  
      mmake -C progs/xdemos glxgears || die  
    230  }  }
    231    
    232  src_install_mesa()  src_install_mesa()
    # Line 325  src_install_mesa() Line 316  src_install_mesa()
    316   done   done
    317    
    318   # remove dri-drivers   # remove dri-drivers
    319   rm -r ${BINDIR}/usr/$(mlibdir)/dri || die  # rm -r ${BINDIR}/usr/$(mlibdir)/dri || die
    320   if [[ $(mlibdir) != lib ]]  # if [[ $(mlibdir) != lib ]]
    321   then  # then
    322   rm -r ${BINDIR}/usr/lib/dri || die  # rm -r ${BINDIR}/usr/lib/dri || die
    323   fi  # fi
     }  
       
     src_install_mesa-progs()  
     {  
      all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxgears || die  
      all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxinfo || die  
    324  }  }
    325    
    326  src_install_mesa-dri-swrast()  src_install_mesa-dri-swrast()
    # Line 411  src_install_mesa-dri-unichrome() Line 396  src_install_mesa-dri-unichrome()
    396  {  {
    397   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die   mmake -C src/mesa/drivers/dri/unichrome DESTDIR=${BINDIR} install || die
    398  }  }
    399    
    Legend:
    Removed from v.7721  
    changed lines
      Added in v.7732