Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/xorg-server/xorg-server-1.11.4-r1.smage2

    Diff of /smage/trunk/core/xorg-server/xorg-server-1.11.4-r1.smage2

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

    revision 3790 by niro, Thu Jul 19 09:15:46 2012 UTC revision 3791 by niro, Thu Jul 19 09:22:11 2012 UTC
    # Line 31  DEPEND=">= x11-libs/libXfont-1.4.5 Line 31  DEPEND=">= x11-libs/libXfont-1.4.5
    31   >= x11-libs/libXpm-3.5.10   >= x11-libs/libXpm-3.5.10
    32   >= x11-libs/libXinerama-1.1.2   >= x11-libs/libXinerama-1.1.2
    33   >= x11-libs/pixman-0.26   >= x11-libs/pixman-0.26
    34     >= x11-base/opengl-update-magellan-2.2.18
    35   >= x11-libs/libpciaccess-0.13   >= x11-libs/libpciaccess-0.13
    36   >= dev-libs/libsha1-0.3   >= dev-libs/libsha1-0.3
    37   == media-libs/mesa-${MESA_PVER}   == media-libs/mesa-${MESA_PVER}
    # Line 206  alx_generic_src_install() Line 207  alx_generic_src_install()
    207   xorg_src_install || die   xorg_src_install || die
    208    
    209   # needed directories   # needed directories
    210     minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die
    211    
    212     # dynamic opengl setup
    213     local i
    214     for i in ${BINDIR}/usr/$(mlibdir)/xorg/modules/libglx* \
    215     ${BINDIR}/usr/$(mlibdir)/xorg/modules/libdri*
    216     do
    217     if [ -f ${i} -o -L ${i} ]
    218     then
    219     mv -f ${i} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/extensions || die "${i}"
    220     fi
    221     done
    222    
    223     # needed directories
    224   minstalldir /usr/bin || die   minstalldir /usr/bin || die
    225    
    226   # missing symlink   # missing symlink
    # Line 240  postinstall() Line 255  postinstall()
    255  {  {
    256   # symlink to Xorg   # symlink to Xorg
    257   ln -snf Xorg ${MROOT}/usr/bin/X || die   ln -snf Xorg ${MROOT}/usr/bin/X || die
    258    
    259     # opengl setup
    260     ${MROOT}/usr/sbin/opengl-update --use-old xorg
    261    }
    262    
    263    postremove_xorg-server()
    264    {
    265     # get rid of module dir to ensure opengl-update works properly
    266     if [ -e ${MROOT}/usr/$(mlibdir)/xorg/modules ]
    267     then
    268     if [[ -z $(magequery -n xorg-server) ]]
    269     then
    270     rm -rf ${MROOT}/usr/$(mlibdir)/xorg/modules
    271     fi
    272     fi
    273  }  }
    Legend:
    Removed from v.3790  
    changed lines
      Added in v.3791