Magellan Linux

  • Back to homepage
    • /[mcore-svn]/smage/trunk/extras/tigervnc/tigervnc-1.0.90_svn4262-r1.smage2

    Diff of /smage/trunk/extras/tigervnc/tigervnc-1.0.90_svn4262-r1.smage2

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

    revision 1237 by niro, Tue Feb 1 13:21:31 2011 UTC revision 1240 by niro, Tue Feb 1 13:32:51 2011 UTC
    # Line 21  XORGDDIR="${SRCDIR}/unix/xserver" Line 21  XORGDDIR="${SRCDIR}/unix/xserver"
    21  DEPEND=">= virtual/x11"  DEPEND=">= virtual/x11"
    22  SDEPEND=">= dev-lang/nasm-2"  SDEPEND=">= dev-lang/nasm-2"
    23    
     sminclude alx cleanutils  
       
    24  SRC_URI=(  SRC_URI=(
    25   http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}   http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}
    26   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
    27   http://ftp.x.org/pub/individual/xserver/${XORG}   http://ftp.x.org/pub/individual/xserver/${XORG}
    28   mirror://xorg-server/${XORG}   mirror://xorg-server/${XORG}
    29   mirror://${PNAME}/tigervnc_48.png   mirror://${PNAME}/tigervnc_48.png
    30     mirror://${PNAME}/${PNAME}-1.0.90-102434.patch
    31     mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch
    32     mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch
    33     mirror://${PNAME}/${PNAME}-1.0.90-ldnow.patch
    34  )  )
    35    
    36  src_prepare()  src_prepare()
    # Line 39  src_prepare() Line 41  src_prepare()
    41   cd ${SRCDIR}   cd ${SRCDIR}
    42    
    43   # patchwork   # patchwork
    44     # force vncviewer to read password from stdin
    45     mpatch ${PNAME}-1.0.90-102434.patch || die
    46     # create X server cookie via mcookie
    47     mpatch ${PNAME}-1.0.90-cookie.patch || die
    48     # add reparent support for x window
    49     mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die
    50     # link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup
    51     mpatch ${PNAME}-1.0.90-ldnow.patch || die
    52    
    53   # apply the included xorg patch   # apply the included xorg patch
    54   cd ${XORGDDIR}   cd ${XORGDDIR}
    # Line 59  src_prepare() Line 69  src_prepare()
    69    
    70  src_compile()  src_compile()
    71  {  {
    72   cd ${SRCDIR}/unix   cd ${SRCDIR}
    73   mconfigure --disable-static || die   mconfigure --disable-static || die
    74   # only build neccessary things   # only build neccessary things
    75   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -j1 -C common || die
    76   mmake -j1 -C ../common LIBTOOL="$(which libtool)" || die   mmake -j1 -C vncpasswd || die
      mmake -j1 -C vncpasswd LIBTOOL="$(which libtool)" || die  
    77    
    78   # fix build issues   # fix build issues
    79   export CFLAGS="$(pkg-config --cflags libdrm)"   export CFLAGS="$(pkg-config --cflags libdrm)"
    # Line 100  src_compile() Line 109  src_compile()
    109   --disable-shave \   --disable-shave \
    110   || die   || die
    111    
    112   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -j1 || die
      mmake -j1 LIBTOOL="$(which libtool)" || die  
    113  }  }
    114    
    115  src_install()  src_install()
    116  {  {
    117   cd ${SRCDIR}/unix   cd ${SRCDIR}
    118   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -C vncpasswd DESTDIR=${BINDIR} install || die
      mmake -C vncpasswd DESTDIR=${BINDIR} LIBTOOL="$(which libtool)" install || die  
    119    
    120   cd ${XORGDDIR}/hw/vnc   cd ${XORGDDIR}/hw/vnc
    121   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake DESTDIR=${BINDIR} install || die
      mmake DESTDIR=${BINDIR} LIBTOOL="$(which libtool)" install || die  
    122  }  }
    Legend:
    Removed from v.1237  
    changed lines
      Added in v.1240