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 1819 by niro, Wed Apr 20 09:40:23 2011 UTC revision 1821 by niro, Wed Apr 20 10:27:10 2011 UTC
# Line 464  XORGSERVER_CONFIG_OPTS="--enable-udev -- Line 464  XORGSERVER_CONFIG_OPTS="--enable-udev --
464   --enable-glx --disable-static --disable-composite --enable-xinerama --enable-dga   --enable-glx --disable-static --disable-composite --enable-xinerama --enable-dga
465   --sysconfdir=/etc --localstatedir=/var --with-xkb-output=/var/lib/xkb   --sysconfdir=/etc --localstatedir=/var --with-xkb-output=/var/lib/xkb
466   --with-xkb-path=/usr/X11R6/share/X11/xkb   --with-xkb-path=/usr/X11R6/share/X11/xkb
467   --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \   --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1
468   --enable-install-setuid --with-sha1=libsha1"   --enable-install-setuid --with-sha1=libsha1"
469  LIBDRM_CONFIG_OPTS="--enable-udev --disable-libkms --enable-intel --enable-radeon"  LIBDRM_CONFIG_OPTS="--enable-udev --disable-libkms --enable-intel --enable-radeon"
470  # dri drivers i915,i965 needs libdrm_intel  # dri drivers i915,i965 needs libdrm_intel
# Line 791  src_compile() Line 791  src_compile()
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   # add missing libsha1 flags too   # add missing libsha1 flags too
793   XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto libsha1)"   XORGSERVER_CFLAGS="$(pkg-config --cflags xf86vidmodeproto xf86dgaproto pciaccess dri2proto gl glproto libsha1)"
  # needed to link against libsha1  
  XORGSERVER_LDFLAGS="$(pkg-config --libs libsha1)"  
794    
795   # xserver   # xserver
796   for i in ${XORG_SERVER[*]}   for i in ${XORG_SERVER[*]}

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