[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (bc1c38095b152fa01b8416ccb93395a1386b2025)

Vlad Glagolev scm at sourcemage.org
Wed Mar 24 16:27:54 EDT 2010


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 x11/libvncserver/BUILD                      |    3 
 x11/libvncserver/CONFIGURE                  |    9 ++
 x11/libvncserver/DEPENDS                    |   12 ++-
 x11/libvncserver/DETAILS                    |   16 +---
 x11/libvncserver/HISTORY                    |    5 +
 x11/x11vnc/BUILD                            |    3 
 x11/x11vnc/CONFIGURE                        |   14 ++++
 x11/x11vnc/DEPENDS                          |   90 +++++++++++++++++++++++++++-
 x11/x11vnc/DETAILS                          |   15 +---
 x11/x11vnc/HISTORY                          |    5 +
 xorg-xserver/xorg-server/EXPORTS            |    1 
 xorg-xserver/xorg-server/HISTORY            |    3 
 xorg-xserver/xorg-server/REPAIR^all^EXPORTS |    1 
 13 files changed, 154 insertions(+), 23 deletions(-)

New commits:
commit bc1c38095b152fa01b8416ccb93395a1386b2025
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    x11vnc: => 0.9.9

commit e61c17fa870a54a4e192e3fc080d2a5be3bfc2b0
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xorg-server: added EXPORTS to provide XORG_SERVER_OPTS outside

commit 227970fef8094c2ca2819bae56803f270c1bb19a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libvncserver: => 0.9.7

diff --git a/x11/libvncserver/BUILD b/x11/libvncserver/BUILD
new file mode 100755
index 0000000..1d78346
--- /dev/null
+++ b/x11/libvncserver/BUILD
@@ -0,0 +1,3 @@
+OPTS="$LIBVNCSERVER_OPTS $OPTS"
+
+default_build
diff --git a/x11/libvncserver/CONFIGURE b/x11/libvncserver/CONFIGURE
new file mode 100755
index 0000000..80907a4
--- /dev/null
+++ b/x11/libvncserver/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_option LIBVNCSERVER_OPTS \
+                    "Enable libpthread support?" y \
+                    "--with-pthread" \
+                    "--without-pthread" &&
+
+config_query_option LIBVNCSERVER_OPTS \
+                    "Enable 24 bpp framebuffers?" y \
+                    "--with-24bpp" \
+                    "--without-24bpp"
diff --git a/x11/libvncserver/DEPENDS b/x11/libvncserver/DEPENDS
index 6c14075..f426043 100755
--- a/x11/libvncserver/DEPENDS
+++ b/x11/libvncserver/DEPENDS
@@ -1,3 +1,9 @@
-depends xorg-libs &&
-depends jpeg     &&
-depends zlib
+optional_depends jpeg \
+                 "--with-jpeg" \
+                 "--without-jpeg" \
+                 "for jpeg support" &&
+
+optional_depends zlib \
+                 "--with-zlib" \
+                 "--without-zlib" \
+                 "for deflate support"
diff --git a/x11/libvncserver/DETAILS b/x11/libvncserver/DETAILS
index a9bfeea..e00454d 100755
--- a/x11/libvncserver/DETAILS
+++ b/x11/libvncserver/DETAILS
@@ -1,18 +1,14 @@
            SPELL=libvncserver
-         VERSION=0.9.1
+         VERSION=0.9.7
           SOURCE=LibVNCServer-$VERSION.tar.gz
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:664fc00a11cb7ff003df1aca56c667b77f500ce9cbaa452c42ef4e8ad8f91465b673b60f210cfe3bdb992da90ff04ac85473c9725d7acd01ac0fba6533b1129a
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:546044e4accfcf2b1570bd792dcdf8e1ba3dc97be1d529b25bbbc93c39459489c8fad929f5d68a274fbf7f3eecb36b54e9c9ec8f6e35a45de26652cc09b16897
         WEB_SITE=http://libvncserver.sourceforge.net/
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/LibVNCServer-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/LibVNCServer-$VERSION"
          ENTERED=20040404
       LICENSE[0]=LGPL
         KEYWORDS="x11"
-           SHORT="libvncserver - A library to implement VNC servers / RFB protocol"
+           SHORT="library to implement VNC servers / RFB protocol"
 cat << EOF
-A library to implement VNC servers / RFB protocol
-
-The contrib directory contains x11vnc, an x0rfbserver clone as
-well as LinuxVNC, a server for the linux console.
-(see also http://www.karlrunge.com/x11vnc/index.html)
+A library to implement VNC servers / RFB protocol.
 EOF
diff --git a/x11/libvncserver/HISTORY b/x11/libvncserver/HISTORY
index c006662..d0e7151 100644
--- a/x11/libvncserver/HISTORY
+++ b/x11/libvncserver/HISTORY
@@ -1,3 +1,8 @@
+2010-03-24 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.9.7; quoting paths; corrected desc
+	* DEPENDS: removed completely wrong dependencies; rewritten
+	* BUILD, CONFIGURE: added, to use custom build options
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11/x11vnc/BUILD b/x11/x11vnc/BUILD
new file mode 100755
index 0000000..5f1b5c8
--- /dev/null
+++ b/x11/x11vnc/BUILD
@@ -0,0 +1,3 @@
+OPTS="$X11VNC_OPTS $OPTS"
+
+default_build
diff --git a/x11/x11vnc/CONFIGURE b/x11/x11vnc/CONFIGURE
new file mode 100755
index 0000000..676b35e
--- /dev/null
+++ b/x11/x11vnc/CONFIGURE
@@ -0,0 +1,14 @@
+config_query_option X11VNC_OPTS \
+                    "Enable TightVNC file transfer protocol?" y \
+                    "--with-filetransfer" \
+                    "--without-filetransfer" &&
+
+config_query_option X11VNC_OPTS \
+                    "Enable libcrypt support?" y \
+                    "--with-crypt" \
+                    "--without-crypt" &&
+
+config_query_option X11VNC_OPTS \
+                    "Enable xkeyboard extension support?" y \
+                    "--with-xkeyboard" \
+                    "--without-xkeyboard"
diff --git a/x11/x11vnc/DEPENDS b/x11/x11vnc/DEPENDS
index 7971004..01c3385 100755
--- a/x11/x11vnc/DEPENDS
+++ b/x11/x11vnc/DEPENDS
@@ -1 +1,89 @@
-depends xorg-server 
+depends xorg-server &&
+
+optional_depends libvncserver \
+                 "--with-system-libvncserver" \
+                 "--without-system-libvncserver" \
+                 "to use system libvncserver instead of bundled" &&
+
+if ! is_depends_enabled $SPELL libvncserver; then
+  optional_depends jpeg \
+                   "--with-jpeg" \
+                   "--without-jpeg" \
+                   "for jpeg support" &&
+
+  optional_depends zlib \
+                   "--with-zlib" \
+                   "--without-zlib" \
+                   "for deflate support" &&
+
+  config_query_option X11VNC_OPTS \
+                      "Enable libpthread support?" y \
+                      "--with-pthread" \
+                      "--without-pthread" &&
+
+  config_query_option X11VNC_OPTS \
+                      "Enable 24 bpp framebuffers?" y \
+                      "--with-24bpp" \
+                      "--without-24bpp"
+fi &&
+
+optional_depends openssl \
+                 "--with-ssl" \
+                 "--without-ssl" \
+                 "for SSL support" &&
+
+if is_depends_enabled $SPELL openssl; then
+  config_query_option X11VNC_OPTS \
+                      "Enable libcrypto usage in OpenSSL?" y \
+                      "--with-crypto" \
+                      "--without-crypto"
+fi &&
+
+optional_depends avahi \
+                 "--with-avahi" \
+                 "--without-avahi" \
+                 "for Avahi/mDNS support" &&
+
+optional_depends ffmpeg \
+                 "--with-ffmpeg" \
+                 "--without-ffmpeg" \
+                 "for FFMPEG support" &&
+
+optional_depends libxtrap \
+                 "--with-xtrap" \
+                 "--without-xtrap" \
+                 "for xtrap extension support" &&
+
+optional_depends libxdamage \
+                 "--with-xdamage" \
+                 "--without-xdamage" \
+                 "for xdamage extension support" &&
+
+optional_depends libxfixes \
+                 "--with-xfixes" \
+                 "--without-xfixes" \
+                 "for xfixes extension support" &&
+
+optional_depends libxrandr \
+                 "--with-xrandr" \
+                 "--without-xrandr" \
+                 "for xrandr extension support" &&
+
+optional_depends libxinerama \
+                 "--with-xinerama" \
+                 "--without-xinerama" \
+                 "for xinerama extension support" &&
+
+optional_depends -sub DPMS xorg-server \
+                 "--with-dpms" \
+                 "--without-dpms" \
+                 "for dpms extension support" &&
+
+persistent_read xorg-server XORG_SERVER_OPTS XORG_SERVER_OPTS &&
+
+if list_find "$XORG_SERVER_OPTS" "--enable-record"; then
+  config_query_option X11VNC_OPTS \
+                      "Enable xrecord extension support?" y \
+                      "--with-xrecord" \
+                      "--without-xrecord"
+fi
diff --git a/x11/x11vnc/DETAILS b/x11/x11vnc/DETAILS
index b8592c0..bd47f04 100755
--- a/x11/x11vnc/DETAILS
+++ b/x11/x11vnc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=x11vnc
-         VERSION=0.9.8
-     SOURCE_HASH=sha512:1eaeb5276aaf6f94e93ec0a8a656200ed1ea99b46be555804e0ad8c9d3bcb7070d16a11d52f9b882f908983f99c6ecd04c2bd0fbd69d9a8248f21e730a35f6d4
+         VERSION=0.9.9
+     SOURCE_HASH=sha512:7e8754b351177e5021d1d9477b3ffe801985ddd394b1a75287720ea15a2a24862523ff675de89968531f2ca1910845d6eef5c214ce53996fbe777b7cbd827264
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/libvncserver/$SOURCE
         WEB_SITE=http://www.karlrunge.com/x11vnc/
@@ -8,12 +8,9 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          ENTERED=20040404
       LICENSE[0]=GPL
         KEYWORDS="x11"
-           SHORT="client to implement vnc with x11"
+           SHORT="VNC server for real X displays"
 cat << EOF
-A library to implement VNC servers / RFB protocol.
-
-The contrib directory contains x11vnc, an x0rfbserver clone as well as
-LinuxVNC, a server for the linux console.
-
-See also http://www.karlrunge.com/x11vnc/
+x11vnc allows one to view remotely and interact with real X displays (i.e. a
+display corresponding to a physical monitor, keyboard, and mouse) with any
+VNC viewer.
 EOF
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index 2e3dfaa..8fa4c33 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,8 @@
+2010-03-24 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.9.9; corrected desc
+	* BUILD, CONFIGURE: added, for custom build options
+	* DEPENDS: added missing dependencies; rewritten
+
 2009-07-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.9.8
 
diff --git a/xorg-xserver/xorg-server/EXPORTS b/xorg-xserver/xorg-server/EXPORTS
new file mode 100755
index 0000000..16799e1
--- /dev/null
+++ b/xorg-xserver/xorg-server/EXPORTS
@@ -0,0 +1 @@
+XORG_SERVER_OPTS
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index f355e77..e569372 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2010-03-24 Vlad Glagolev <stealth at sourcemage.org>
+	* [REPAIR^all^]EXPORTS: added, to provide XORG_SERVER_OPTS outside
+
 2010-03-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.7.6
 
diff --git a/xorg-xserver/xorg-server/REPAIR^all^EXPORTS b/xorg-xserver/xorg-server/REPAIR^all^EXPORTS
new file mode 100755
index 0000000..16799e1
--- /dev/null
+++ b/xorg-xserver/xorg-server/REPAIR^all^EXPORTS
@@ -0,0 +1 @@
+XORG_SERVER_OPTS



More information about the SM-Commit mailing list