Magellan Linux

  • Back to homepage
    • /[mcore-svn]/smage/trunk/core/kdrive/kdrive-1.6.5-r1.smage2

    Diff of /smage/trunk/core/kdrive/kdrive-1.6.5-r1.smage2

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

    revision 384 by niro, Mon May 3 11:26:58 2010 UTC revision 385 by niro, Wed May 5 19:45:07 2010 UTC
    # Line 57  sminclude xorg mtools cleanutils mcore-s Line 57  sminclude xorg mtools cleanutils mcore-s
    57  SRCFILE="xorg-server-${PVER}.tar.bz2"  SRCFILE="xorg-server-${PVER}.tar.bz2"
    58  SRCDIR="${BUILDDIR}/xorg-server-${PVER}"  SRCDIR="${BUILDDIR}/xorg-server-${PVER}"
    59    
    60    XEXTPROTO_PVER="7.0.5"
    61    XEXTPROTO_SRCFILE="xextproto-${XEXTPROTO_PVER}.tar.bz2"
    62    XEXTPROTO_SRCDIR="${BUILDDIR}/xextproto-${XEXTPROTO_PVER}"
    63    
    64  SRC_URI=(  SRC_URI=(
    65   http://ftp.x.org/pub/individual/xserver/${SRCFILE}   http://ftp.x.org/pub/individual/xserver/${SRCFILE}
    66     http://ftp.x.org/pub/individual/proto/${XEXTPROTO_SRCFILE}
    67   mirror://xorg-server/${SRCFILE}   mirror://xorg-server/${SRCFILE}
    68     mirror://xextproto/${XEXTPROTO_SRCFILE}
    69   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch
    70   mirror://xorg-server/xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch   mirror://xorg-server/xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch
    71   mirror://xorg-server/xorg-server-1.4.99.906-no-evdev-keyboards.patch   mirror://xorg-server/xorg-server-1.4.99.906-no-evdev-keyboards.patch
    # Line 73  UP2DATE="updatecmd_xorg xorg-server" Line 79  UP2DATE="updatecmd_xorg xorg-server"
    79  src_prepare()  src_prepare()
    80  {  {
    81   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    82    
    83     # xorg-1.6 needs xext headers <= 7.0.5
    84     munpack ${XEXTPROTO_SRCFILE} || die
    85     ln -snf . ${XEXTPROTO_SRCDIR}/X11 || die
    86     ln -snf . ${XEXTPROTO_SRCDIR}/extensions || die
    87   cd ${SRCDIR}   cd ${SRCDIR}
    88    
    89   # fixes fpic issues with libxf86config on 64bit systems   # fixes fpic issues with libxf86config on 64bit systems
    # Line 102  src_compile() Line 113  src_compile()
    113  {  {
    114   cd ${SRCDIR}   cd ${SRCDIR}
    115    
      # try to fix issues with newer dpms.h header  
      local myconf="--disable-dpms"  
      # disable shm  
      myconf+=" --disable-shm"  
       
    116   xorg_src_configure \   xorg_src_configure \
    117   --sysconfdir=/etc/X11 \   --sysconfdir=/etc/X11 \
    118   --localstatedir=/var \   --localstatedir=/var \
    # Line 137  src_compile() Line 143  src_compile()
    143   --disable-xtrap \   --disable-xtrap \
    144   --disable-w100 \   --disable-w100 \
    145   --disable-xsdl \   --disable-xsdl \
      ${myconf} \  
    146   || die   || die
    147    
    148   mmake || die   # include our fake dir with the old xextprotos
    149     mmake CFLAGS="${CFLAGS} -I${XEXTPROTO_SRCDIR}" || die
    150  }  }
    151    
    152  src_install()  src_install()
    Legend:
    Removed from v.384  
    changed lines
      Added in v.385