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 3188 by niro, Mon Sep 12 14:05:44 2011 UTC revision 3189 by niro, Mon Sep 12 14:09:38 2011 UTC
    # Line 52  SDEPEND=">= dev-lang/nasm-2 Line 52  SDEPEND=">= dev-lang/nasm-2
    52   >= x11-proto/renderproto-0.11   >= x11-proto/renderproto-0.11
    53   >= x11-libs/libpciaccess-0.12   >= x11-libs/libpciaccess-0.12
    54   >= sys-dev/autoconf-9   >= sys-dev/autoconf-9
    55   >= sys-dev/automake-4   >= sys-dev/automake-4"
      >= dev-util/cmake-2.8"  
    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 cmake alx-split
    # Line 69  SRC_URI=( Line 68  SRC_URI=(
    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}-1.0.90-xserver111.patch
    71     mirror://${PNAME}/${PNAME}-1.0.90_svn4323-xserver110-patch-fix.patch
    72     mirror://${PNAME}/${PNAME}-1.0.90_svn4323-xserver110-patch-missing-miext_sync_ldadd.patch
    73  )  )
    74    
    75  src_prepare()  src_prepare()
    # Line 89  src_prepare() Line 90  src_prepare()
    90   mpatch ${PNAME}-1.0.90-ldnow.patch || die   mpatch ${PNAME}-1.0.90-ldnow.patch || die
    91   # xorg-server-1.11 support   # xorg-server-1.11 support
    92   mpatch ${PNAME}-1.0.90-xserver111.patch || die   mpatch ${PNAME}-1.0.90-xserver111.patch || die
    93     cd ${SRCDIR}/unix
    94     # fix the included patch to work with xorg-server-1.10.0 final
    95     mpatch ${PNAME}-${PVER}-xserver110-patch-fix.patch || die
    96     # fix some missing ldflags to successfully build Xvnc against xorg-server-1.10.0 final
    97     mpatch ${PNAME}-${PVER}-xserver110-patch-missing-miext_sync_ldadd.patch || die
    98    
    99   # apply the included xorg patch   # apply the included xorg patch
    100   cd ${XORGDDIR}   cd ${XORGDDIR}
    # Line 101  src_prepare() Line 107  src_prepare()
    107   cd ${XORGDDIR}   cd ${XORGDDIR}
    108   libtoolize --copy --force || die   libtoolize --copy --force || die
    109   autoreconf --verbose --install --force || die   autoreconf --verbose --install --force || die
    110    
    111     cd ${SRCDIR}
    112     libtoolize --copy --force || die
    113     autoreconf --verbose --install --force || die
    114  }  }
    115    
    116  src_compile()  src_compile()
    117  {  {
    118   cd ${SRCDIR}   cd ${SRCDIR}
    119   cmake_configure $(cmake_build_not STATIC) || die   mconfigure --disable-static || die
    120   # only build neccessary things   # only build neccessary things
    121   mmake -j1 -C common || die   mmake -j1 -C common || die
    122   mmake -j1 -C unix/vncpasswd || die   mmake -j1 -C unix/vncpasswd || die
    Legend:
    Removed from v.3188  
    changed lines
      Added in v.3189