Magellan Linux

  • Back to homepage
    • /[mcore-svn]/smage/trunk/core/xorg-server/xorg-server-1.8.0-r2.smage2

    Diff of /smage/trunk/core/xorg-server/xorg-server-1.8.0-r2.smage2

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

    revision 417 by niro, Thu May 6 22:28:45 2010 UTC revision 418 by niro, Thu May 6 22:58:23 2010 UTC
    # Line 10  STATE="unstable" Line 10  STATE="unstable"
    10  DESCRIPTION="Modular X.Org X Server."  DESCRIPTION="Modular X.Org X Server."
    11  HOMEPAGE="http://xorg.freedesktop.org"  HOMEPAGE="http://xorg.freedesktop.org"
    12    
     sminclude xorg mtools mcore  
       
     # mesa sources are needed to compile opengl extensions  
     MESA_PVER="7.8.1"  
     MESA_SRCFILE="MesaLib-${MESA_PVER/_/-}.tar.gz"  
     MESA_SRCDIR="${BUILDDIR}/MesaLib-${MESA_PVER/_/-}"  
       
    13  PROVIDE="virtual/x11"  PROVIDE="virtual/x11"
    14    
    15  DEPEND=">= x11-libs/libXfont-1.4.1  DEPEND=">= x11-libs/libXfont-1.4.1
    # Line 29  DEPEND=">= x11-libs/libXfont-1.4.1 Line 22  DEPEND=">= x11-libs/libXfont-1.4.1
    22   >= x11-libs/libXrender-0.9.5   >= x11-libs/libXrender-0.9.5
    23   >= x11-libs/libXi-1.3   >= x11-libs/libXi-1.3
    24   >= media-libs/freetype-2.3.9   >= media-libs/freetype-2.3.9
      == media-libs/mesa-${MESA_PVER}  
    25   >= media-fonts/font-misc-misc-1   >= media-fonts/font-misc-misc-1
    26   >= media-fonts/font-cursor-misc-1   >= media-fonts/font-cursor-misc-1
      >= x11-misc/xbitmaps-1.1.0  
      >= x11-misc/xkeyboard-config-1.7  
      >= x11-apps/iceauth-1.0.3  
      >= x11-apps/rgb-1.0.3  
      >= x11-apps/xauth-1.0.4  
      >= x11-apps/xinit-1.1.1  
      >= x11-libs/libXaw-1.0.7  
    27   >= x11-libs/libXpm-3.5.8   >= x11-libs/libXpm-3.5.8
    28   >= x11-libs/libXxf86misc-1.0.2  # >= x11-libs/libXxf86misc-1.0.2
    29   >= x11-libs/libXxf86vm-1.1.0  # >= x11-libs/libXxf86vm-1.1.0
    30   >= x11-libs/libdmx-1.1.0  # >= x11-libs/libXtst-1.1.0
    31   >= x11-libs/libXtst-1.1.0  # >= x11-libs/libXres-1.0.4
    32   >= x11-libs/libXres-1.0.4  # >= x11-libs/libxkbui-1.0.2
      >= x11-libs/libxkbui-1.0.2  
    33   >= x11-libs/libXinerama-1.1   >= x11-libs/libXinerama-1.1
      >= x11-base/opengl-update-magellan-2.2.10  
    34   >= sys-fs/udev-151   >= sys-fs/udev-151
    35   >= x11-libs/pixman-0.16.2   >= x11-libs/pixman-0.16.2
    36   >= x11-libs/libpciaccess-0.10.9   >= x11-libs/libpciaccess-0.10.9
    37   >= dev-libs/openssl-0.9.8k"   >= dev-libs/libsha1-0.2"
    38    # == media-libs/mesa-${MESA_PVER}
    39    # >= x11-misc/xbitmaps-1.1.0
    40    # >= x11-misc/xkeyboard-config-1.7
    41    # >= x11-apps/iceauth-1.0.3
    42    # >= x11-apps/rgb-1.0.3
    43    # >= x11-apps/xauth-1.0.4
    44    # >= x11-apps/xinit-1.1.1
    45    # >= x11-libs/libXaw-1.0.7
    46    # >= x11-libs/libdmx-1.1.0
    47    # >= x11-base/opengl-update-magellan-2.2.10
    48    
    49  SDEPEND=">= x11-libs/xtrans-1.2.5  SDEPEND=">= x11-libs/xtrans-1.2.5
    50   >= x11-proto/randrproto-1.3.1   >= x11-proto/randrproto-1.3.1
    # Line 64  SDEPEND=">= x11-libs/xtrans-1.2.5 Line 57  SDEPEND=">= x11-libs/xtrans-1.2.5
    57   >= x11-proto/xf86miscproto-0.9.3   >= x11-proto/xf86miscproto-0.9.3
    58   >= x11-proto/xf86vidmodeproto-2.3   >= x11-proto/xf86vidmodeproto-2.3
    59   >= x11-proto/xf86bigfontproto-1.2.0   >= x11-proto/xf86bigfontproto-1.2.0
      >= x11-proto/compositeproto-0.4.1  
    60   >= x11-proto/recordproto-1.14   >= x11-proto/recordproto-1.14
    61   >= x11-proto/resourceproto-1.1.0   >= x11-proto/resourceproto-1.1.0
    62   >= x11-proto/videoproto-2.3.0   >= x11-proto/videoproto-2.3.0
    63   >= x11-proto/scrnsaverproto-1.2.0   >= x11-proto/scrnsaverproto-1.2.0
    64   >= x11-proto/evieext-1.1.0   >= x11-proto/evieext-1.1.0
      >= x11-proto/xineramaproto-1.2  
    65   >= x11-proto/fontsproto-2.1.0   >= x11-proto/fontsproto-2.1.0
    66   >= x11-proto/kbproto-1.0.4   >= x11-proto/kbproto-1.0.4
    67   >= x11-proto/inputproto-2.0   >= x11-proto/inputproto-2.0
    68   >= x11-proto/bigreqsproto-1.1.0   >= x11-proto/bigreqsproto-1.1.0
    69   >= x11-proto/xcmiscproto-1.2.0   >= x11-proto/xcmiscproto-1.2.0
      >= x11-proto/glproto-1.4.10  
      >= x11-proto/dmxproto-2.3  
      >= x11-proto/xf86driproto-2.1.0  
      >= x11-proto/dri2proto-2.1  
      >= x11-libs/libdrm-2.4.15  
    70   >= x11-apps/mkfontdir-1.0.5   >= x11-apps/mkfontdir-1.0.5
    71   >= x11-apps/mkfontscale-1.0.7"   >= x11-apps/mkfontscale-1.0.7
    72     >= x11-misc/xbitmaps-1.1.0"
    73    #??? >= x11-libs/libXv-1.0.5"
    74    # >= x11-proto/compositeproto-0.4.1
    75    # >= x11-proto/xineramaproto-1.2
    76    # >= x11-proto/glproto-1.4.10
    77    # >= x11-proto/dmxproto-2.3
    78    # >= x11-proto/xf86driproto-2.1.0
    79    # >= x11-proto/dri2proto-2.1
    80    # >= x11-libs/libdrm-2.4.15
    81    
    82    sminclude xorg mtools mcore
    83    
    84  SRC_URI=( ${SRC_URI[*]}  SRC_URI=( ${SRC_URI[*]}
    85   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
      ftp://ftp.freedesktop.org/pub/mesa/${MESA_PVER}/${MESA_SRCFILE}  
      sourceforge://mesa3d/${MESA_SRCFILE}  
      mirror://mesa/${MESA_SRCFILE}  
    86   mirror://${PNAME}/${PNAME}-1.4-fpic-libxf86config.patch   mirror://${PNAME}/${PNAME}-1.4-fpic-libxf86config.patch
    87   mirror://${PNAME}/${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch   mirror://${PNAME}/${PNAME}-1.2.0-die-ugly-pattern-die-die-die.patch
    88  )  )
    # Line 98  UP2DATE="updatecmd_xorg ${PNAME}" Line 92  UP2DATE="updatecmd_xorg ${PNAME}"
    92    
    93  src_prepare()  src_prepare()
    94  {  {
      # must use mesa as opengl-headers!  
      [[ $(opengl-update --get-implementation) != xorg ]] &&  
      die "please change to xorg opengl-headers: opengl-update xorg"  
       
    95   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
      munpack ${MESA_SRCFILE} || die  
    96   cd ${SRCDIR}   cd ${SRCDIR}
    97    
    98   # fixes fpic issues with libxf86config on 64bit systems   # fixes fpic issues with libxf86config on 64bit systems
    # Line 129  src_compile() Line 118  src_compile()
    118   cd ${SRCDIR}   cd ${SRCDIR}
    119    
    120   xorg_src_configure \   xorg_src_configure \
      --with-mesa-source=${MESA_SRCDIR} \  
    121   --sysconfdir=/etc \   --sysconfdir=/etc \
    122   --localstatedir=/var \   --localstatedir=/var \
    123   --with-xkb-output=/var/lib/xkb \   --with-xkb-output=/var/lib/xkb \
    124   --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 \
    125   --enable-install-setuid \   --enable-install-setuid \
    126   --enable-ipv6 \   --disable-ipv6 \
    127   --enable-dmx \   --disable-dmx \
    128   --enable-xvfb \   --disable-xvfb \
    129   --enable-xnest \   --disable-xnest \
    130   --enable-dri \   --disable-dri \
    131   --enable-dri2 \   --disable-dri2 \
    132   --enable-xorg \   --enable-xorg \
    133   --enable-xtrap \   --enable-xtrap \
    134   --enable-xevie \   --enable-xevie \
    135   --disable-xprint \   --disable-xprint \
    136   --enable-glx-tls \   --disable-glx-tls \
    137     --disable-glx \
    138   --disable-static \   --disable-static \
    139   --disable-config-dbus \   --disable-config-dbus \
    140   --disable-config-hal \   --disable-config-hal \
    141   --enable-config-udev \   --enable-config-udev \
    142     --disable-composite \
    143     --disable-xinerama \
    144     --with-sha1=libsha1 \
    145   || die   || die
    146    
    147   mmake || die   mmake || die
    # Line 161  src_install() Line 153  src_install()
    153    
    154   # needed directories   # needed directories
    155   minstalldir /usr/bin || die   minstalldir /usr/bin || die
      minstalldir /usr/$(mlibdir)/opengl/xorg/extensions || die  
       
      # dynamic opengl setup  
      local i  
      for i in ${BINDIR}/usr/$(mlibdir)/xorg/modules/libglx* \  
      ${BINDIR}/usr/$(mlibdir)/xorg/modules/libdri*  
      do  
      if [ -f ${i} -o -L ${i} ]  
      then  
      mv -f ${i} ${BINDIR}/usr/$(mlibdir)/opengl/xorg/extensions || die "${i}"  
      fi  
      done  
    156    
    157   # missing symlink   # missing symlink
    158   mlink Xorg /usr/bin/X || die   mlink Xorg /usr/bin/X || die
    159  }  }
       
     preinstall()  
     {  
      # fix some deprecated symlinks from ancient xorg-1.5 servers  
      if [ -L ${MROOT}/usr/$(mlibdir)/xorg/modules/extensions/libdri.so ]  
      then  
      rm ${MROOT}/usr/$(mlibdir)/xorg/modules/extensions/libdri.so  
      fi  
       
      if [ -f ${MROOT}/usr/$(mlibdir)/opengl/xorg/extensions/libdri.so ]  
      then  
      rm ${MROOT}/usr/$(mlibdir)/opengl/xorg/extensions/libdri.so  
      fi  
       
      if [ -L ${MROOT}/usr/$(mlibdir)/xorg/modules/extensions/libglx.so ]  
      then  
      rm ${MROOT}/usr/$(mlibdir)/xorg/modules/extensions/libglx.so  
      fi  
       
      if [ -f ${MROOT}/usr/$(mlibdir)/opengl/xorg/extensions/libglx.so ]  
      then  
      rm ${MROOT}/usr/$(mlibdir)/opengl/xorg/extensions/libglx.so  
      fi  
     }  
       
     postinstall()  
     {  
      ${MROOT}/usr/sbin/opengl-update --use-old xorg  
     }  
       
     postremove()  
     {  
      # get rid of module dir to ensure opengl-update works properbly  
      if [ -e ${MROOT}/usr/$(mlibdir)/xorg/modules ]  
      then  
      if [[ -z $(magequery -n xorg-server) ]]  
      then  
      rm -rf ${MROOT}/usr/$(mlibdir)/xorg/modules  
      fi  
      fi  
     }  
    Legend:
    Removed from v.417  
    changed lines
      Added in v.418