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 7725 by niro, Mon May 30 14:22:08 2011 UTC
    # Line 45  PROVIDE="virtual/opengl" Line 45  PROVIDE="virtual/opengl"
    45  EMUL_LINUX_32=true  EMUL_LINUX_32=true
    46  sminclude xorg mtools multilib  sminclude xorg mtools multilib
    47    
    48    # not the same version anymore
    49    MESA_PROGS_PVER="8.0.1"
    50    MESA_PROGS_SRCFILE="mesa-demos-${MESA_PROGS_PVER}.tar.bz2"
    51    MESA_PROGS_SRCDIR="${BUILDDIR}/mesa-demos-${MESA_PROGS_PVER}"
    52    
    53  # must be set *after* the include of xorg!  # must be set *after* the include of xorg!
    54  SRCFILE="MesaLib-${PVER/_/-}.tar.bz2"  SRCFILE="MesaLib-${PVER/_/-}.tar.bz2"
    55  PROGS_SRCFILE="MesaDemos-${PVER/_/-}.tar.bz2"  # libs SRCDIR
     # libs + progs have the same SRCDIR  
    56  SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"  SRCDIR="${BUILDDIR}/Mesa-${PVER/_/-}"
    57    
    58  SPLIT_PACKAGES="mesa  SPLIT_PACKAGES="mesa
    # Line 71  SPLIT_PACKAGES="mesa Line 75  SPLIT_PACKAGES="mesa
    75    
    76  SRC_URI=(  SRC_URI=(
    77   ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${SRCFILE}   ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${SRCFILE}
    78   ftp://ftp.freedesktop.org/pub/mesa/${PVER}/${PROGS_SRCFILE}   ftp://ftp.freedesktop.org/pub/mesa/demos/${MESA_PROGS_PVER}/${MESA_PROGS_SRCFILE}
    79   sourceforge://mesa3d/${SRCFILE}   sourceforge://mesa3d/${SRCFILE}
    80   sourceforge://mesa3d/${PROGS_SRCFILE}   sourceforge://mesa3d/${MESA_PROGS_SRCFILE}
    81   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    82   mirror://${PNAME}/${PROGS_SRCFILE}   mirror://${PNAME}/${MESA_PROGS_SRCFILE}
    83   mirror://${PNAME}/libGLU.la   mirror://${PNAME}/libGLU.la
    84   mirror://${PNAME}/libGL.la   mirror://${PNAME}/libGL.la
    85  )  )
    # Line 100  split_info_mesa-progs() Line 104  split_info_mesa-progs()
    104   DESCRIPTION="Mesa3D OpenGL graphics applications."   DESCRIPTION="Mesa3D OpenGL graphics applications."
    105   PCATEGORIE="x11-apps"   PCATEGORIE="x11-apps"
    106    
    107     PVER="${MESA_PROGS_PVER}"
    108   DEPEND="${MESA_PROGS_DEPEND}"   DEPEND="${MESA_PROGS_DEPEND}"
    109    
    110   unset postinstall   unset postinstall
    # Line 198  split_info_mesa-dri-unichrome() Line 203  split_info_mesa-dri-unichrome()
    203  src_prepare()  src_prepare()
    204  {  {
    205   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    206   all-abis "oldmunpack ${PROGS_SRCFILE} && cp -R ${SRCDIR}/* ${SRCDIR}-$(mabi)/" || die   all-abis "oldmunpack ${MESA_PROGS_SRCFILE}" || die
    207    
    208   # no debug code in the drives (gentoo)   # no debug code in the drives (gentoo)
    209   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 234  src_compile() Line 239  src_compile()
    239   mmake || die   mmake || die
    240    
    241   # build mesa-progs   # build mesa-progs
    242   mmake -C progs/xdemos glxinfo || die   mmake -C ${MESA_PROGS_SRCDIR}/progs/xdemos glxinfo || die
    243   mmake -C progs/xdemos glxgears || die   mmake -C ${MESA_PROGS_SRCDIR}/progs/xdemos glxgears || die
    244  }  }
    245    
    246  src_install_mesa()  src_install_mesa()
    # Line 334  src_install_mesa() Line 339  src_install_mesa()
    339    
    340  src_install_mesa-progs()  src_install_mesa-progs()
    341  {  {
    342   all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxgears || die   minstallexec ${MESA_PROGS_SRCDIR}/progs/xdemos/glxgears || die
    343   all-abis minstallexec ${SRCDIR}-$(mabi)/progs/xdemos/glxinfo || die   minstallexec ${MESA_PROGS_SRCDIR}/progs/xdemos/glxinfo || die
    344  }  }
    345    
    346  src_install_mesa-dri-swrast()  src_install_mesa-dri-swrast()
    Legend:
    Removed from v.7721  
    changed lines
      Added in v.7725