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 1235 by niro, Tue Feb 1 13:09:24 2011 UTC revision 1243 by niro, Tue Feb 1 13:53:40 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    
    24  sminclude alx cleanutils  MCORE_ONLY_KEEP="usr/bin/vncpasswd usr/$(mlibdir)/xorg/modules/extensions/*.so"
    25    sminclude mcore-split
    26    
    27  SRC_URI=(  SRC_URI=(
    28   http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}   http://mesh.dl.sourceforge.net/project/${PNAME}/${PNAME}/${PVER}/${SRCFILE}
    # Line 29  SRC_URI=( Line 30  SRC_URI=(
    30   http://ftp.x.org/pub/individual/xserver/${XORG}   http://ftp.x.org/pub/individual/xserver/${XORG}
    31   mirror://xorg-server/${XORG}   mirror://xorg-server/${XORG}
    32   mirror://${PNAME}/tigervnc_48.png   mirror://${PNAME}/tigervnc_48.png
    33     mirror://${PNAME}/${PNAME}-1.0.90-102434.patch
    34     mirror://${PNAME}/${PNAME}-1.0.90-cookie.patch
    35     mirror://${PNAME}/${PNAME}-0.0.90-viewer-reparent.patch
    36     mirror://${PNAME}/${PNAME}-1.0.90-ldnow.patch
    37  )  )
    38    
    39  src_prepare()  src_prepare()
    # Line 39  src_prepare() Line 44  src_prepare()
    44   cd ${SRCDIR}   cd ${SRCDIR}
    45    
    46   # patchwork   # patchwork
    47     # force vncviewer to read password from stdin
    48     mpatch ${PNAME}-1.0.90-102434.patch || die
    49     # create X server cookie via mcookie
    50     mpatch ${PNAME}-1.0.90-cookie.patch || die
    51     # add reparent support for x window
    52     mpatch ${PNAME}-0.0.90-viewer-reparent.patch || die
    53     # link libvnc.so "now" to catch "undefined symbol" errors during Xorg startup
    54     mpatch ${PNAME}-1.0.90-ldnow.patch || die
    55    
    56   # apply the included xorg patch   # apply the included xorg patch
    57   cd ${XORGDDIR}   cd ${XORGDDIR}
    # Line 52  src_prepare() Line 65  src_prepare()
    65   libtoolize --copy --force || die   libtoolize --copy --force || die
    66   autoreconf --verbose --install --force || die   autoreconf --verbose --install --force || die
    67    
    68   cd ${SRCDIR}/unix   cd ${SRCDIR}
    69   libtoolize --copy --force || die   libtoolize --copy --force || die
    70   autoreconf --verbose --install --force || die   autoreconf --verbose --install --force || die
    71  }  }
    72    
    73  src_compile()  src_compile()
    74  {  {
    75   cd ${SRCDIR}/unix   cd ${SRCDIR}
    76   mconfigure --disable-static || die   mconfigure --disable-static || die
    77   # only build neccessary things   # only build neccessary things
    78   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -j1 -C common || die
    79   mmake -j1 -C ../common LIBTOOL="$(which libtool)" || die   mmake -j1 -C unix/vncpasswd || die
      mmake -j1 -C vncpasswd LIBTOOL="$(which libtool)" || die  
    80    
    81   # fix build issues   # fix build issues
    82   export CFLAGS="$(pkg-config --cflags libdrm)"   export CFLAGS="$(pkg-config --cflags libdrm)"
    # Line 72  src_compile() Line 84  src_compile()
    84   # build the x11 module   # build the x11 module
    85   cd ${XORGDDIR}   cd ${XORGDDIR}
    86   mconfigure \   mconfigure \
      --prefix=/usr/X11R6 \  
      --datadir=/usr/X11R6/share \  
    87   --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 \
    88   --with-rgb-path=/usr/X11R6/share/X11/rgb.txt \   --with-rgb-path=/usr/share/X11/rgb.txt \
    89   --with-xkb-output=/usr/X11R6/share/X11/xkb \   --with-xkb-output=/usr/share/X11/xkb \
    90   --with-pic \   --with-pic \
    91   --disable-xorg \   --disable-xorg \
    92   --disable-composite \   --disable-composite \
    # Line 100  src_compile() Line 110  src_compile()
    110   --disable-shave \   --disable-shave \
    111   || die   || die
    112    
    113   # fix broken libtool: it calles sed and it ends in an infinite loop   mmake -j1 || die
      mmake -j1 LIBTOOL="$(which libtool)" || die  
    114  }  }
    115    
    116  src_install()  src_install()
    117  {  {
    118   cd ${SRCDIR}/unix   cd ${SRCDIR}
    119   # 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  
    120    
    121   cd ${XORGDDIR}/hw/vnc   cd ${XORGDDIR}/hw/vnc
    122   # 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  
    123  }  }
    Legend:
    Removed from v.1235  
    changed lines
      Added in v.1243