Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/tigervnc/tigervnc-1.1.0-r1.smage2

    Diff of /smage/trunk/core/tigervnc/tigervnc-1.1.0-r1.smage2

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

    revision 3319 by niro, Mon Sep 12 14:43:52 2011 UTC revision 3320 by niro, Tue Nov 22 20:22:41 2011 UTC
    # Line 12  HOMEPAGE="http://www.tigervnc.com/" Line 12  HOMEPAGE="http://www.tigervnc.com/"
    12  SRCFILE="${PNAME}-${PVER}.tar.gz"  SRCFILE="${PNAME}-${PVER}.tar.gz"
    13  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
    14    
    15  XORG_PVER="1.11.0"  XORG_PVER="1.11.2"
    16  XORG="xorg-server-${XORG_PVER}.tar.bz2"  XORG="xorg-server-${XORG_PVER}.tar.bz2"
    17  XORGSDIR="${BUILDDIR}/xorg-server-${XORG_PVER}"  XORGSDIR="${BUILDDIR}/xorg-server-${XORG_PVER}"
    18  XORGDDIR="${SRCDIR}/unix/xserver"  XORGDDIR="${SRCDIR}/unix/xserver"
    19    
    20  DEPEND=">= x11-libs/libX11-1.4  DEPEND=">= x11-libs/libX11-1.4
    21   >= x11-libs/libXext-1.3   >= x11-libs/libXext-1.3
    22   >= x11-libs/libSM-1.1   >= x11-libs/libSM-1.2
    23   >= x11-libs/libXtst-1.2   >= x11-libs/libXtst-1.2
    24   >= x11-libs/libXi-1.4   >= x11-libs/libXi-1.4
    25   >= sys-libs/zlib-1.2   >= sys-libs/zlib-1.2.5
    26   == x11-base/xorg-server-${XORG_PVER}   == x11-base/xorg-server-${XORG_PVER}
    27   >= dev-libs/libsha1-0.3   >= dev-libs/libsha1-0.3
    28   >= media-fonts/font-adobe-75dpi-1   >= media-fonts/font-adobe-75dpi-1
    # Line 55  SDEPEND=">= dev-lang/nasm-2 Line 55  SDEPEND=">= dev-lang/nasm-2
    55   >= sys-dev/automake-4"   >= sys-dev/automake-4"
    56    
    57  ALX_ONLY_KEEP="usr/bin/vncpasswd usr/$(mlibdir)/xorg/modules/extensions/libvnc.so"  ALX_ONLY_KEEP="usr/bin/vncpasswd usr/$(mlibdir)/xorg/modules/extensions/libvnc.so"
    58  sminclude cmake alx-split  sminclude xorg alx-split
    59    
    60  SRC_URI=(  SRC_URI=(
    61   http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}   sourceforge://${PNAME}/${SRCFILE}
    62   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    63   http://ftp.x.org/pub/individual/xserver/${XORG}   http://ftp.x.org/pub/individual/xserver/${XORG}
    64   mirror://xorg-server/${XORG}   mirror://xorg-server/${XORG}
    # Line 67  SRC_URI=( Line 67  SRC_URI=(
    67   mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch   mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch
    68   mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch   mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch
    69   mirror://${PNAME}/${PNAME}-1.0.90-ldnow.patch   mirror://${PNAME}/${PNAME}-1.0.90-ldnow.patch
    70   mirror://${PNAME}/${PNAME}-1.0.90-xserver111.patch   mirror://${PNAME}/${PNAME}-${PVER}-gethomedir.patch
    71     mirror://${PNAME}/${PNAME}-${PVER}-rh692048.patch
    72     mirror://${PNAME}/${PNAME}-${PVER}-xserver110.patch
    73     mirror://${PNAME}/${PNAME}-${PVER}-xserver111.patch
    74  )  )
    75    
    76    UP2DATE="updatecmd_sourceforge ${PNAME}"
    77    
    78  src_prepare()  src_prepare()
    79  {  {
    80   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
    # Line 86  src_prepare() Line 91  src_prepare()
    91   mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die   mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die
    92   # link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup   # link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup
    93   mpatch ${PNAME}-1.0.90-ldnow.patch || die   mpatch ${PNAME}-1.0.90-ldnow.patch || die
      # xorg-server-1.11 support  
      mpatch ${PNAME}-1.0.90-xserver111.patch || die  
    94    
    95   # apply the included xorg patch   mpatch ${PNAME}-${PVER}-gethomedir.patch || die
    96     mpatch ${PNAME}-${PVER}-rh692048.patch || die
    97   cd ${XORGDDIR}   cd ${XORGDDIR}
    98   #local xorg_patch_ver="${XORG_PVER%.*}"   mpatch ${PNAME}-${PVER}-xserver110.patch || die
    99   local xorg_patch_ver="1.10"   cd ${SRCDIR}
    100   xorg_patch_ver="${xorg_patch_ver//.}"   mpatch ${PNAME}-${PVER}-xserver111.patch || die
    101   patch -Np1 -i ../xserver${xorg_patch_ver}.patch || die  
    102    # applied above
    103    # # apply the included xorg patch
    104    # cd ${XORGDDIR}
    105    # local xorg_patch_ver="${XORG_PVER%.*}"
    106    # xorg_patch_ver="${xorg_patch_ver//.}"
    107    # patch -Np1 -i ../xserver${xorg_patch_ver}.patch || die
    108    
    109   # reconfigure everything   # reconfigure everything
    110   cd ${XORGDDIR}   cd ${XORGDDIR}
    # Line 121  src_compile() Line 131  src_compile()
    131   cd ${XORGDDIR}   cd ${XORGDDIR}
    132   mconfigure \   mconfigure \
    133   --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 \
    134     --with-fontdir=/usr/share/fonts \
    135   --with-rgb-path=/usr/share/X11/rgb.txt \   --with-rgb-path=/usr/share/X11/rgb.txt \
    136   --with-xkb-output=/usr/share/X11/xkb \   --with-xkb-output=/usr/share/X11/xkb \
    137   --with-module-dir=/usr/$(mlibdir)/xorg/modules \   --with-module-dir=/usr/$(mlibdir)/xorg/modules \
    138     --with-dri-driver-path=/usr/$(mlibdir)/dri \
    139   --with-pic \   --with-pic \
    140     --without-dtrace \
    141   --disable-xorg \   --disable-xorg \
    142   --disable-composite \   --disable-composite \
    143   --enable-xtrap \   --enable-xtrap \
    # Line 143  src_compile() Line 156  src_compile()
    156   --enable-dri2 \   --enable-dri2 \
    157   --disable-config-dbus \   --disable-config-dbus \
    158   --disable-config-hal \   --disable-config-hal \
    159     --disable-config-udev \
    160   --enable-install-libxf86config \   --enable-install-libxf86config \
      --disable-shave \  
    161   --with-sha1=libsha1 \   --with-sha1=libsha1 \
      --disable-dtrace \  
    162   --disable-unit-tests \   --disable-unit-tests \
    163   || die   || die
    164    
    165   mmake -j1 || die   mmake || die
    166  }  }
    167    
    168  alx_generic_src_install()  alx_generic_src_install()
    Legend:
    Removed from v.3319  
    changed lines
      Added in v.3320