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 1238 by niro, Tue Feb 1 13:26:14 2011 UTC revision 1242 by niro, Tue Feb 1 13:47:21 2011 UTC
    # Line 30  SRC_URI=( Line 30  SRC_URI=(
    30   mirror://${PNAME}/${PNAME}-1.0.90-102434.patch   mirror://${PNAME}/${PNAME}-1.0.90-102434.patch
    31   mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch   mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch
    32   mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch   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 46  src_prepare() Line 47  src_prepare()
    47   mpatch ${PNAME}-1.0.90-cookie.patch || die   mpatch ${PNAME}-1.0.90-cookie.patch || die
    48   # add reparent support for x window   # add reparent support for x window
    49   mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die   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 69  src_compile() Line 72  src_compile()
    72   cd ${SRCDIR}   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 unix/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 79  src_compile() Line 81  src_compile()
    81   # build the x11 module   # build the x11 module
    82   cd ${XORGDDIR}   cd ${XORGDDIR}
    83   mconfigure \   mconfigure \
      --prefix=/usr/X11R6 \  
      --datadir=/usr/X11R6/share \  
    84   --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 \
    85   --with-rgb-path=/usr/X11R6/share/X11/rgb.txt \   --with-rgb-path=/usr/share/X11/rgb.txt \
    86   --with-xkb-output=/usr/X11R6/share/X11/xkb \   --with-xkb-output=/usr/share/X11/xkb \
    87   --with-pic \   --with-pic \
    88   --disable-xorg \   --disable-xorg \
    89   --disable-composite \   --disable-composite \
    # Line 107  src_compile() Line 107  src_compile()
    107   --disable-shave \   --disable-shave \
    108   || die   || die
    109    
    110   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -j1 || die
      mmake -j1 LIBTOOL="$(which libtool)" || die  
    111  }  }
    112    
    113  src_install()  src_install()
    114  {  {
    115   cd ${SRCDIR}   cd ${SRCDIR}
    116   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -C unix/vncpasswd DESTDIR=${BINDIR} install || die
      mmake -C vncpasswd DESTDIR=${BINDIR} LIBTOOL="$(which libtool)" install || die  
    117    
    118   cd ${XORGDDIR}/hw/vnc   cd ${XORGDDIR}/hw/vnc
    119   # 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  
    120  }  }
    Legend:
    Removed from v.1238  
    changed lines
      Added in v.1242