Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/branches/alx-0_6_0/core/mesa/mesa-7.10.2-r1.smage2

    Diff of /smage/branches/alx-0_6_0/core/mesa/mesa-7.10.2-r1.smage2

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

    revision 2289 by niro, Wed Jun 8 14:25:04 2011 UTC revision 2290 by niro, Thu Jun 9 10:11:36 2011 UTC
    # Line 234  src_install_mesa() Line 234  src_install_mesa()
    234   mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so || die   mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so || die
    235   mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so.1 || die   mlink libGL.so.1.2 /usr/$(mlibdir)/libGL.so.1 || die
    236    
      # now setup dynamic opengl  
      minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die  
      minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die  
      minstalldir /usr/$(mlibdir)/opengl/xorg/include || die  
       
      local x  
      for x in ${BINDIR}/usr/$(mlibdir)/libGL.so*  
      do  
      if [ -f ${x} -o -L ${x} ]  
      then  
      # libGL.a cause problems with tuxracer, etc  
      mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/lib || die "${x}"  
      fi  
      done  
       
    237   # create the two-number versioned libs (.so.#.#), since only .so.# and   # create the two-number versioned libs (.so.#.#), since only .so.# and
    238   # .so.#.#.# were made   # .so.#.#.# were made
    239   local x   local x
    # Line 297  src_install_mesa-dev() Line 282  src_install_mesa-dev()
    282   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"   [[ ${abi} = m64 ]] && ABI_LIBDIR="lib64"
    283   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    284    
      # now setup dynamic opengl  
      minstalldir /usr/$(mlibdir)/opengl/xorg/lib || die  
      minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die  
      minstalldir /usr/$(mlibdir)/opengl/xorg/include || die  
       
      local x  
      for x in ${BINDIR}/usr/$(mlibdir)/libGL.la \  
      ${BINDIR}/usr/$(mlibdir)/libGL.a  
      do  
      if [ -f ${x} -o -L ${x} ]  
      then  
      # libGL.a cause problems with tuxracer, etc  
      mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/lib || die "${x}"  
      fi  
      done  
      for x in ${BINDIR}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}  
      do  
      if [ -f ${x} -o -L ${x} ]  
      then  
      mv -f ${x} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/include || die "${x}"  
      fi  
      done  
       
    285   # satisfy libtool   # satisfy libtool
    286   minstallfile -s libGLU.la /usr/$(mlibdir) || die   minstallfile -s libGLU.la /usr/$(mlibdir) || die
      minstallfile -s libGL.la /usr/$(mlibdir)/opengl/xorg/lib || die  
    287    
    288   # fix libdir on 64bit arches   # fix libdir on 64bit arches
    289   if [[ $(mlibdir) != lib ]]   if [[ $(mlibdir) != lib ]]
    290   then   then
    291   sed -i "s:/usr/lib:/usr/$(mlibdir):g" ${BINDIR}/usr/$(mlibdir)/libGLU.la || die   sed -i "s:/usr/lib:/usr/$(mlibdir):g" ${BINDIR}/usr/$(mlibdir)/libGLU.la || die
      sed -i "s:/usr/lib:/usr/$(mlibdir):g" ${BINDIR}/usr/$(mlibdir)/opengl/xorg/lib/libGL.la || die  
    292   fi   fi
    293   done   done
    294    
    Legend:
    Removed from v.2289  
    changed lines
      Added in v.2290