Magellan Linux

Diff of /smage/branches/alx-0_6_0/core/xorg/xorg-7.6.1-r1.smage2

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

revision 1816 by niro, Wed Apr 20 06:59:45 2011 UTC revision 1819 by niro, Wed Apr 20 09:40:23 2011 UTC
# Line 610  src_prepare() Line 610  src_prepare()
610   sed -i "s:XVMC=yes:XVMC=no:g" configure.ac || die   sed -i "s:XVMC=yes:XVMC=no:g" configure.ac || die
611   autoreconf --verbose --install --force || die   autoreconf --verbose --install --force || die
612    
613     # fix build issues, some wrapper files which should be generated
614     # at build time exist and the makefile doesn't whipe them. we patch
615     # the makefile to clean them and whipe these wrapper files
616     rm -f ${XORGSERVER_SRCDIR}/hw/xprint/*-wrapper.c || die
617     rm -f ${XORGSERVER_SRCDIR}/hw/xfree86/loader/sdksyms.c || die
618    
619   ln -snf . ${XTRANS_SRCDIR}/Xtrans || die   ln -snf . ${XTRANS_SRCDIR}/Xtrans || die
620   ln -snf . ${FONTSPROTO_SRCDIR}/fonts || die   ln -snf . ${FONTSPROTO_SRCDIR}/fonts || die
621   ln -snf . ${GLPROTO_SRCDIR}/GL || die   ln -snf . ${GLPROTO_SRCDIR}/GL || die
# Line 783  src_compile() Line 789  src_compile()
789   done   done
790    
791   # xf86vidmodeproto is missing, dgaproto too, added missing picaccess.h and dri2 for GL extension   # xf86vidmodeproto is missing, dgaproto too, added missing picaccess.h and dri2 for GL extension
792   XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto)"   # add missing libsha1 flags too
793     XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto libsha1)"
794     # needed to link against libsha1
795     XORGSERVER_LDFLAGS="$(pkg-config --libs libsha1)"
796    
797   # xserver   # xserver
798   for i in ${XORG_SERVER[*]}   for i in ${XORG_SERVER[*]}

Legend:
Removed from v.1816  
changed lines
  Added in v.1819