Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/branches/alx-0_6_0/core/xorg/xorg-7.6.1-r1.smage2

    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 1811 by niro, Tue Apr 19 12:20:20 2011 UTC revision 1818 by niro, Wed Apr 20 09:19:52 2011 UTC
    # Line 32  PROVIDE="virtual/x11" Line 32  PROVIDE="virtual/x11"
    32  REMOVE_DEPRECATED_MAGE_TARGETS=1  REMOVE_DEPRECATED_MAGE_TARGETS=1
    33  sminclude alx cleanutils python  sminclude alx cleanutils python
    34    
    35  #LIBATOMICOPS_PVER="1.2"  LIBSHA1_PVER="0.3"
    36    
    37  UTILMACROS_PVER="1.13.0"  UTILMACROS_PVER="1.13.0"
    38  BIGREQSPROTO_PVER="1.1.1"  BIGREQSPROTO_PVER="1.1.1"
    # Line 144  FONTCURSORMISC_PVER="1.0.3" Line 144  FONTCURSORMISC_PVER="1.0.3"
    144  FONTMISCMISC_PVER="1.1.2"  FONTMISCMISC_PVER="1.1.2"
    145  FONTADOBE75DPI_PVER="1.0.3"  FONTADOBE75DPI_PVER="1.0.3"
    146    
    147  #LIBATOMICOPS_SRCFILE="libatomic_ops-${LIBATOMICOPS_PVER}.tar.gz"  LIBSHA1_SRCFILE="dottedmag-libsha1-${LIBSHA1_PVER}-0-g3f976bb.tar.gz"
    148  #LIBATOMICOPS_SRCDIR="${BUILDDIR}/libatomic_ops-${LIBATOMICOPS_PVER}"  LIBSHA1_SRCDIR="${BUILDDIR}/dottedmag-libsha1-0d113b5"
    149    
    150  UTILMACROS_SRCFILE="util-macros-${UTILMACROS_PVER}.tar.bz2"  UTILMACROS_SRCFILE="util-macros-${UTILMACROS_PVER}.tar.bz2"
    151  UTILMACROS_SRCDIR="${BUILDDIR}/util-macros-${UTILMACROS_PVER}"  UTILMACROS_SRCDIR="${BUILDDIR}/util-macros-${UTILMACROS_PVER}"
    # Line 465  XORGSERVER_CONFIG_OPTS="--enable-udev -- Line 465  XORGSERVER_CONFIG_OPTS="--enable-udev --
    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"   --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
    471  MESA_CONFIG_OPTS="--with-driver=dri --with-dri-driverdir=/usr/lib/dri --disable-debug  MESA_CONFIG_OPTS="--with-driver=dri --with-dri-driverdir=/usr/lib/dri --disable-debug
    # Line 501  FONTADOBE75DPI_CONFIG_OPTS="--enable-iso Line 501  FONTADOBE75DPI_CONFIG_OPTS="--enable-iso
    501   --disable-iso8859-10 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15"   --disable-iso8859-10 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15"
    502    
    503  # setup some groups  # setup some groups
    504  #XORG_PREREQUISITES=( LIBATOMICOPS )  XORG_PREREQUISITES=( LIBSHA1 )
    505  XORG_PROTOS=( UTILMACROS BIGREQSPROTO DAMAGEPROTO FIXESPROTO FONTSPROTO INPUTPROTO KBPROTO RANDRPROTO RECORDPROTO RENDERPROTO RESOURCEPROTO SCRNSAVERPROTO VIDEOPROTO XCMISCPROTO XEXTPROTO XF86DRIPROTO DRI2PROTO GLPROTO XF86VIDMODEPROTO XF86DGAPROTO XINERAMAPROTO XPROTO XTRANS XCBPROTO )  XORG_PROTOS=( UTILMACROS BIGREQSPROTO DAMAGEPROTO FIXESPROTO FONTSPROTO INPUTPROTO KBPROTO RANDRPROTO RECORDPROTO RENDERPROTO RESOURCEPROTO SCRNSAVERPROTO VIDEOPROTO XCMISCPROTO XEXTPROTO XF86DRIPROTO DRI2PROTO GLPROTO XF86VIDMODEPROTO XF86DGAPROTO XINERAMAPROTO XPROTO XTRANS XCBPROTO )
    506  XORG_DEV=( MAKEDEPEND )  XORG_DEV=( MAKEDEPEND )
    507  XORG_LIBS=( LIBICE LIBSM LIBXAU LIBPTHREADSTUBS LIBXCB LIBX11 LIBXT LIBXEXT LIBXFIXES LIBXDAMAGE LIBFONTENC LIBXFONT LIBXKBFILE LIBXXF86VM LIBXINERAMA LIBXMU LIBXI LIBXPM LIBXAW LIBXFONT LIBXRENDER LIBXFT LIBXRANDR LIBXTST LIBDRM MESA LIBPCIACCESS PIXMAN )  XORG_LIBS=( LIBICE LIBSM LIBXAU LIBPTHREADSTUBS LIBXCB LIBX11 LIBXT LIBXEXT LIBXFIXES LIBXDAMAGE LIBFONTENC LIBXFONT LIBXKBFILE LIBXXF86VM LIBXINERAMA LIBXMU LIBXI LIBXPM LIBXAW LIBXFONT LIBXRENDER LIBXFT LIBXRANDR LIBXTST LIBDRM MESA LIBPCIACCESS PIXMAN )
    # Line 516  XORG_EVERYTHING=( ${XORG_PREREQUISITES[* Line 516  XORG_EVERYTHING=( ${XORG_PREREQUISITES[*
    516    
    517    
    518  # SRC_URIS  # SRC_URIS
    519  #for i in ${XORG_PREREQUISITES[*]}; do SRC_URI=( http://www.hpl.hp.com/research/linux/atomic_ops/download/$(eval echo \${${i}_SRCFILE}) ); done  for i in ${XORG_PREREQUISITES[*]}
    520    do
    521     case ${i} in
    522     LIBSHA1) SRC_URI=( http://download.github.com/$(eval echo \${${i}_SRCFILE}) mirror://libsha1/$(eval echo \${${i}_SRCFILE}) )
    523     esac
    524    done
    525  for i in ${XORG_PROTOS[*]}  for i in ${XORG_PROTOS[*]}
    526  do  do
    527   case ${i} in   case ${i} in
    # Line 584  src_prepare() Line 589  src_prepare()
    589   fi   fi
    590   done   done
    591    
    592     # provides no configure script
    593     cd ${LIBSHA1_SRCDIR}
    594     autoreconf --verbose --install --force || die
    595   # needed fixups and symlinks   # needed fixups and symlinks
    596   cd ${RXVT_SRCDIR}   cd ${RXVT_SRCDIR}
    597   # compilation fix   # compilation fix
    # Line 602  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 764  src_compile() Line 778  src_compile()
    778   then   then
    779   ln -snf intel/libdrm_intel.pc libdrm_intel.pc || die   ln -snf intel/libdrm_intel.pc libdrm_intel.pc || die
    780   cp ${mysrcdir}/intel/.libs/* ${mysrcdir}/.libs/ || die   cp ${mysrcdir}/intel/.libs/* ${mysrcdir}/.libs/ || die
    781   elif [[ -d ${mysrcdir}/radeon/.libs ]]   fi
    782     if [[ -d ${mysrcdir}/radeon/.libs ]]
    783   then   then
    784   ln -snf radeon/libdrm_radeon.pc libdrm_radeon.pc || die   ln -snf radeon/libdrm_radeon.pc libdrm_radeon.pc || die
    785   cp ${mysrcdir}/radeon/.libs/* ${mysrcdir}/.libs/ || die   cp ${mysrcdir}/radeon/.libs/* ${mysrcdir}/.libs/ || die
    # Line 774  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_CFLAGS="$(pkg-config --libs libsha1)"
    796    
    797   # xserver   # xserver
    798   for i in ${XORG_SERVER[*]}   for i in ${XORG_SERVER[*]}
    Legend:
    Removed from v.1811  
    changed lines
      Added in v.1818