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 361 by niro, Mon May 3 11:05:08 2010 UTC revision 364 by niro, Mon May 3 11:24:57 2010 UTC
    # Line 62  SRC_URI=( Line 62  SRC_URI=(
    62   mirror://xorg-server/${SRCFILE}   mirror://xorg-server/${SRCFILE}
    63   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch   mirror://xorg-server/xorg-server-1.4-fpic-libxf86config.patch
    64   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
    65     mirror://xorg-server/xorg-server-1.4.99.906-no-evdev-keyboards.patch
    66     mirror://xorg-server/xorg-server-1.7.6-libsha1-support.patch
    67     mirror://xorg-server/xorg-server-1.7.6-dlopen-fix.patch
    68  )  )
    69    
    70  UP2SUBDIR="xserver"  UP2SUBDIR="xserver"
    # Line 78  src_prepare() Line 81  src_prepare()
    81   # adopted from redhat; use a black background   # adopted from redhat; use a black background
    82   mpatch xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch || die   mpatch xorg-server-1.2.0-die-ugly-pattern-die-die-die.patch || die
    83    
    84     # evdev is way too broken
    85     mpatch xorg-server-1.4.99.906-no-evdev-keyboards.patch || die
    86    
    87     # support other sha1 implemtations as well
    88     mpatch xorg-server-1.7.6-libsha1-support.patch || die
    89    
    90     # fix linking issues against dlopen (xfbdev needs this)
    91     mpatch xorg-server-1.7.6-dlopen-fix.patch || die
    92    
    93   # fix build issues, some wrapper files which should be generated   # fix build issues, some wrapper files which should be generated
    94   # at build time exist and the makefile doesn't whipe them. we patch   # at build time exist and the makefile doesn't whipe them. we patch
    95   # the makefile to clean them and whipe these wrapper files   # the makefile to clean them and whipe these wrapper files
    # Line 90  src_compile() Line 102  src_compile()
    102  {  {
    103   cd ${SRCDIR}   cd ${SRCDIR}
    104    
    105     # try to fix issues with newer dpms.h header
    106     local myconf="--disable-dpms"
    107    
    108   xorg_src_configure \   xorg_src_configure \
    109   --sysconfdir=/etc/X11 \   --sysconfdir=/etc/X11 \
    110   --localstatedir=/var \   --localstatedir=/var \
    # Line 120  src_compile() Line 135  src_compile()
    135   --disable-xtrap \   --disable-xtrap \
    136   --disable-w100 \   --disable-w100 \
    137   --disable-xsdl \   --disable-xsdl \
    138     ${myconf} \
    139   || die   || die
    140    
    141   mmake || die   mmake || die
    Legend:
    Removed from v.361  
    changed lines
      Added in v.364