Magellan Linux

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

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

revision 362 by niro, Mon May 3 11:07:22 2010 UTC revision 365 by niro, Mon May 3 11:26:58 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   mirror://xorg-server/xorg-server-1.7.6-libsha1-support.patch
67   mirror://xorg-server/xorg-server-1.7.6-dlopen-fix.patch   mirror://xorg-server/xorg-server-1.7.6-dlopen-fix.patch
68  )  )
# Line 80  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   # support other sha1 implemtations as well
88   mpatch xorg-server-1.7.6-libsha1-support.patch || die   mpatch xorg-server-1.7.6-libsha1-support.patch || die
89    
# Line 98  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     # disable shm
108     myconf+=" --disable-shm"
109    
110   xorg_src_configure \   xorg_src_configure \
111   --sysconfdir=/etc/X11 \   --sysconfdir=/etc/X11 \
112   --localstatedir=/var \   --localstatedir=/var \
# Line 128  src_compile() Line 137  src_compile()
137   --disable-xtrap \   --disable-xtrap \
138   --disable-w100 \   --disable-w100 \
139   --disable-xsdl \   --disable-xsdl \
140     ${myconf} \
141   || die   || die
142    
143   mmake || die   mmake || die

Legend:
Removed from v.362  
changed lines
  Added in v.365