Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/mesa/mesa-9.0-r1.smage2

    Diff of /smage/trunk/core/mesa/mesa-9.0-r1.smage2

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

    revision 4347 by niro, Tue Nov 13 15:32:34 2012 UTC revision 4348 by niro, Thu Nov 15 12:22:31 2012 UTC
    # Line 19  MESA_DEPEND=">= dev-libs/expat-2 Line 19  MESA_DEPEND=">= dev-libs/expat-2
    19   >= x11-libs/libXmu-1.1   >= x11-libs/libXmu-1.1
    20   >= x11-libs/libdrm-2.4.37   >= x11-libs/libdrm-2.4.37
    21   >= x11-libs/libICE-1   >= x11-libs/libICE-1
    22   >= x11-base/opengl-update-magellan-2.2.19   >= x11-base/opengl-update-2.3
    23   >= x11-libs/libxcb-1   >= x11-libs/libxcb-1
    24   >= x11-libs/libXfixes-5   >= x11-libs/libXfixes-5
    25   >= x11-libs/libXdamage-1   >= x11-libs/libXdamage-1
    # Line 469  src_install_mesa() Line 469  src_install_mesa()
    469   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"
    470   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    471    
    472   # fix opengl-symlinks   # setup dynamic opengl
      # first remove invalid symlinks  
      find ${BINDIR}/usr/$(mlibdir) -name libGL\.* -type l | xargs rm -f  
      # now create required opengl-symlinks  
      mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so.1 || die  
       
      # now setup dynamic opengl  
    473   minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die   minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die
    474   minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die   minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die
    475    
    476   local x   local x
    477   for x in ${BINDIR}/usr/$(mlibdir)/libGL.so.*   for x in ${BINDIR}/usr/$(mlibdir)/lib{EGL,GL*,OpenVG}.so*
    478   do   do
    479   if [ -f ${x} -o -L ${x} ]   if [ -f ${x} -o -L ${x} ]
    480   then   then
    # Line 529  src_install_mesa-dev() Line 523  src_install_mesa-dev()
    523   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"
    524   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    525    
      # fix opengl-symlinks  
      # first remove invalid symlinks  
      find ${BINDIR}/usr/$(mlibdir) -name libGL\.* -type l | xargs rm -f  
      # now create required opengl-symlinks  
      mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so || die  
       
    526   # now setup dynamic opengl   # now setup dynamic opengl
    527   minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die   minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die
    528   minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die   minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die
    529   minstalldir /usr/$(mlibdir)/opengl/xorg/include || die   minstalldir /usr/$(mlibdir)/opengl/xorg/include/GL || die
    530    
    531   local x   local x
    532   for x in ${BINDIR}/usr/$(mlibdir)/libGL.so \   for x in ${BINDIR}/usr/$(mlibdir)/lib{EGL,GL*,OpenVG}.{la,a}
      ${BINDIR}/usr/$(mlibdir)/libGL.a  
    533   do   do
    534   if [ -f ${x} -o -L ${x} ]   if [ -f ${x} -o -L ${x} ]
    535   then   then
    # Line 554  src_install_mesa-dev() Line 541  src_install_mesa-dev()
    541   do   do
    542   if [ -f ${x} -o -L ${x} ]   if [ -f ${x} -o -L ${x} ]
    543   then   then
    544     mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/include/GL || die "${x}"
    545     fi
    546     done
    547     for x in ${BINDIR}/usr/include/{EGL,GLES*,VG,KHR}
    548     do
    549     if [ -d ${x} ]
    550     then
    551   mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/include || die "${x}"   mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/include || die "${x}"
    552   fi   fi
    553   done   done
    Legend:
    Removed from v.4347  
    changed lines
      Added in v.4348