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 1807 by niro, Tue Apr 19 10:57:04 2011 UTC revision 1809 by niro, Tue Apr 19 11:45:40 2011 UTC
    # Line 59  XPROTO_PVER="7.0.21" Line 59  XPROTO_PVER="7.0.21"
    59  XTRANS_PVER="1.2.6"  XTRANS_PVER="1.2.6"
    60  XCBPROTO_PVER="1.6"  XCBPROTO_PVER="1.6"
    61    
    62    MAKEDEPEND_PVER="1.0.3"
    63    
    64  LIBICE_PVER="1.0.7"  LIBICE_PVER="1.0.7"
    65  LIBSM_PVER="1.2.0"  LIBSM_PVER="1.2.0"
    66  LIBXAU_PVER="1.0.6"  LIBXAU_PVER="1.0.6"
    # Line 217  XF86DRIPROTO_SRCDIR="${BUILDDIR}/xf86dri Line 219  XF86DRIPROTO_SRCDIR="${BUILDDIR}/xf86dri
    219  DRI2PROTO_SRCFILE="dri2proto-${DRI2PROTO_PVER}.tar.bz2"  DRI2PROTO_SRCFILE="dri2proto-${DRI2PROTO_PVER}.tar.bz2"
    220  DRI2PROTO_SRCDIR="${BUILDDIR}/dri2proto-${DRI2PROTO_PVER}"  DRI2PROTO_SRCDIR="${BUILDDIR}/dri2proto-${DRI2PROTO_PVER}"
    221    
    222    MAKEDEPEND_SRCFILE="makedepend-${MAKEDEPEND_PVER}.tar.bz2"
    223    MAKEDEPEND_SRCDIR="${BUILDDIR}/makedepend-${MAKEDEPEND_PVER}"
    224    
    225  LIBICE_SRCFILE="libICE-${LIBICE_PVER}.tar.bz2"  LIBICE_SRCFILE="libICE-${LIBICE_PVER}.tar.bz2"
    226  LIBICE_SRCDIR="${BUILDDIR}/libICE-${LIBICE_PVER}"  LIBICE_SRCDIR="${BUILDDIR}/libICE-${LIBICE_PVER}"
    227    
    # Line 498  FONTADOBE75DPI_CONFIG_OPTS="--enable-iso Line 503  FONTADOBE75DPI_CONFIG_OPTS="--enable-iso
    503  # setup some groups  # setup some groups
    504  #XORG_PREREQUISITES=( LIBATOMICOPS )  #XORG_PREREQUISITES=( LIBATOMICOPS )
    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 )
    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 )
    508  XORG_SERVER=( XORGSERVER )  XORG_SERVER=( XORGSERVER )
    509  XORG_INPUT_DRIVERS=( XF86INPUTEVDEV XF86INPUTMOUSE XF86INPUTKEYBOARD )  XORG_INPUT_DRIVERS=( XF86INPUTEVDEV XF86INPUTMOUSE XF86INPUTKEYBOARD )
    # Line 506  XORG_APPS=( XKBCOMP XKEYBOARDCONFIG XINI Line 512  XORG_APPS=( XKBCOMP XKEYBOARDCONFIG XINI
    512  XORG_FONT_UTILS=( MKFONTSCALE MKFONTDIR ENCODINGS BDFTOPCF FONTUTIL FONTALIAS )  XORG_FONT_UTILS=( MKFONTSCALE MKFONTDIR ENCODINGS BDFTOPCF FONTUTIL FONTALIAS )
    513  XORG_FONTS=( FONTCURSORMISC FONTMISCMISC FONTADOBE75DPI )  XORG_FONTS=( FONTCURSORMISC FONTMISCMISC FONTADOBE75DPI )
    514  # everything  # everything
    515  XORG_EVERYTHING=( ${XORG_PREREQUISITES[*]} ${XORG_PROTOS[*]} ${XORG_LIBS[*]} ${XORG_SERVER[*]} ${XORG_INPUT_DRIVERS[*]} ${XORG_VIDEO_DRIVERS[*]} ${XORG_APPS[*]} ${XORG_FONT_UTILS[*]} ${XORG_FONTS[*]} )  XORG_EVERYTHING=( ${XORG_PREREQUISITES[*]} ${XORG_DEV[*]} ${XORG_PROTOS[*]} ${XORG_LIBS[*]} ${XORG_SERVER[*]} ${XORG_INPUT_DRIVERS[*]} ${XORG_VIDEO_DRIVERS[*]} ${XORG_APPS[*]} ${XORG_FONT_UTILS[*]} ${XORG_FONTS[*]} )
    516    
    517    
    518  # SRC_URIS  # SRC_URIS
    # Line 520  do Line 526  do
    526   *) SRC_URI=( ${SRC_URI[*]} http://www.x.org/releases/individual/proto/$(eval echo \${${i}_SRCFILE}) ) ;;   *) SRC_URI=( ${SRC_URI[*]} http://www.x.org/releases/individual/proto/$(eval echo \${${i}_SRCFILE}) ) ;;
    527   esac   esac
    528  done  done
    529    for i in ${XORG_DEV[*]}; do SRC_URI=( ${SRC_URI[*]} http://www.x.org/releases/individual/util/$(eval echo \${${i}_SRCFILE}) ); done
    530  for i in ${XORG_LIBS[*]}  for i in ${XORG_LIBS[*]}
    531  do  do
    532   case ${i} in   case ${i} in
    # Line 667  src_compile() Line 674  src_compile()
    674   ln -snf . extensions || die   ln -snf . extensions || die
    675   done   done
    676    
    677     # dev utils
    678     for i in ${XORG_DEV[*]}
    679     do
    680     mysrcdir=$(eval echo \${${i}_SRCDIR})
    681     cd ${mysrcdir} || die
    682    
    683     CFLAGS="$(eval echo \${${i}_CFLAGS})" \
    684     LDFLAGS="$(eval echo \${${i}_LDFLAGS})" \
    685     ./configure \
    686     --prefix=$(pwd) \
    687     --includedir='${prefix}' \
    688     --libdir='${prefix}/.libs' \
    689     $(eval echo \${${i}_CONFIG_OPTS}) \
    690     || die "${i}"
    691     mmake || die "${i}"
    692     done
    693    
    694   # libdrm needs libatomic_ops with old compiler (< gcc-4.0)   # libdrm needs libatomic_ops with old compiler (< gcc-4.0)
    695   LIBDRM_CFLAGS="-I${LIBATOMICOPS_SRCDIR}/src"   #LIBDRM_CFLAGS="-I${LIBATOMICOPS_SRCDIR}/src"
    696   LIBDRM_LDFLAGS="-L${LIBATOMICOPS_SRCDIR}/.libs"   #LIBDRM_LDFLAGS="-L${LIBATOMICOPS_SRCDIR}/.libs"
    697    
    698   # libs   # libs
    699   for i in ${XORG_LIBS[*]}   for i in ${XORG_LIBS[*]}
    # Line 690  src_compile() Line 714  src_compile()
    714   unset PYTHONPATH   unset PYTHONPATH
    715   fi   fi
    716    
    717     # export makedepend for mesa
    718     if [[ ${i} = MESA ]]
    719     then
    720     export MAKEDEPEND="${MAKEDEPEND_SRCDIR}/makedepend"
    721     else
    722     unset MAKEDEPEND
    723     fi
    724    
    725   mysrcdir=$(eval echo \${${i}_SRCDIR})   mysrcdir=$(eval echo \${${i}_SRCDIR})
    726   cd ${mysrcdir} || die   cd ${mysrcdir} || die
    727    
    Legend:
    Removed from v.1807  
    changed lines
      Added in v.1809