version 0.9.9.r65.g50dbe1d-1

5 files changed, 125 insertions, 20 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..bb1b11facf91
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,37 @@
+pkgbase = libvncserver-git
+	pkgdesc = VNC server for real X displays
+	pkgver = 0.9.9.r65.g50dbe1d
+	pkgrel = 1
+	url = https://.github.io
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	source = libvncserver-git::git+http://github.com/LibVNC/libvncserver.git
+	source = build.patch
+	source = service
+	options = !emptydirs
+
+pkgname = libvncserver-git
+	depends = libpng
+	depends = libjpeg
+	depends = gnutls
+	depends = libgcrypt
+	depends = openssl
+	provides = libvncserver
+	conflicts = libvncserver
+
+pkgname = x11vnc-git
+	depends = libvncserver-git
+	depends = libxtst
+	depends = libxinerama
+	depends = libxdamage
+	depends = libxrandr
+	depends = avahi
+	depends = openssl
+	optdepends = tk: GUI support
+	optdepends = net-tools: -auth guess
+	optdepends = xf86-video-dummy: Xdummy script
+	optdepends = java-environment: java-applet support
+	provides = x11vnc
+	conflicts = x11vnc
+
diff --git a/.SRCINFO b/.SRCINFO
index e2fbae12b388..017f0085c5b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,20 @@
 pkgbase = libvncserver-git
 	pkgdesc = VNC server for real X displays
-	pkgver = 0.9.10.r38.g97f442e
+	pkgver = 0.9.9.r65.g50dbe1d
 	pkgrel = 1
-	url = https://LibVNC.github.io
+	url = https://.github.io
 	arch = i686
 	arch = x86_64
-	license = GPL
-	makedepends = autoconf-archive
+	license = GPL2
+	options = !emptydirs
+	source = libvncserver-git::git+http://github.com/LibVNC/libvncserver.git
+	source = build.patch
+	source = service
+	sha1sums = SKIP
+	sha1sums = dc92d478631acfe1a8404c7258c60d4233c7fdf7
+	sha1sums = 53e1ed7f84518a699a29607a03bee2321f9f9624
+
+pkgname = libvncserver-git
 	depends = libpng
 	depends = libjpeg
 	depends = gnutls
@@ -14,9 +22,19 @@ pkgbase = libvncserver-git
 	depends = openssl
 	provides = libvncserver
 	conflicts = libvncserver
-	options = !emptydirs
-	source = libvncserver-git::git+https://github.com/libvnc/libvncserver.git
-	sha1sums = SKIP
 
-pkgname = libvncserver-git
+pkgname = x11vnc-git
+	depends = libvncserver-git
+	depends = libxtst
+	depends = libxinerama
+	depends = libxdamage
+	depends = libxrandr
+	depends = avahi
+	depends = openssl
+	optdepends = tk: GUI support
+	optdepends = net-tools: -auth guess
+	optdepends = xf86-video-dummy: Xdummy script
+	optdepends = java-environment: java-applet support
+	provides = x11vnc
+	conflicts = x11vnc
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d59745177dc..c8051acc3deb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,21 @@
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
-pkgname=libvncserver-git
-pkgver=0.9.10.r38.g97f442e
+pkgbase=libvncserver-git
+pkgname=(libvncserver-git x11vnc-git)
+pkgver=0.9.9.r65.g50dbe1d
 pkgrel=1
 pkgdesc='VNC server for real X displays'
-url="https://LibVNC.github.io"
+url="https://${_pkgname}.github.io"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2')
 options=('!emptydirs')
-depends=(libpng libjpeg gnutls libgcrypt openssl)
-provides=(libvncserver)
-conflicts=(libvncserver)
-makedepends=(autoconf-archive)
-source=("$pkgname::git+https://github.com/libvnc/libvncserver.git")
-sha1sums=('SKIP')
+source=("$pkgbase::git+http://github.com/LibVNC/libvncserver.git"
+	'build.patch'
+        'service')
+sha1sums=('SKIP'
+          'dc92d478631acfe1a8404c7258c60d4233c7fdf7'
+          '53e1ed7f84518a699a29607a03bee2321f9f9624')
 
 pkgver() {
   cd $pkgbase
@@ -25,17 +26,43 @@ pkgver() {
 
 prepare() {
   cd $pkgbase
+  patch -Np2 -b -z .orig -i ../build.patch
   autoreconf -fiv
 }
 
 build() {
   cd $pkgbase
-  ./configure --prefix=/usr --mandir=/usr/share/man --without-libva
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-x11vnc --without-libva
   make
 }
 
-package() {
+package_libvncserver-git() {
+  depends=(libpng libjpeg gnutls libgcrypt openssl)
+  provides=(libvncserver)
+  conflicts=(libvncserver)
+
   cd $pkgbase
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C x11vnc uninstall
 }
 
+package_x11vnc-git() {
+  depends=(libvncserver-git libxtst libxinerama libxdamage libxrandr avahi openssl)
+  provides=(x11vnc)
+  conflicts=(x11vnc)
+  optdepends=(
+	'tk: GUI support'
+	'net-tools: -auth guess'
+	'xf86-video-dummy: Xdummy script'
+	'java-environment: java-applet support')
+
+  cd $pkgbase
+  make DESTDIR="$pkgdir" -C x11vnc install
+  install x11vnc/tkx11vnc x11vnc/misc/{rx11vnc,Xdummy} "$pkgdir/usr/bin"
+  install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
+  install -d "$pkgdir/usr/share/x11vnc/classes/ssl"
+  install -m644 webclients/java-applet/ssl/index.vnc "$pkgdir/usr/share/x11vnc/classes"
+  install -m644 webclients/java-applet/VncViewer.jar "$pkgdir/usr/share/x11vnc/classes"
+  install -m644 webclients/java-applet/ssl/{README,*.vnc,*.jar} "$pkgdir/usr/share/x11vnc/classes/ssl"
+  install -m755 webclients/java-applet/ssl/ss_vncviewer "$pkgdir/usr/share/x11vnc/classes/ssl"
+}
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..5e15448fee2f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,16 @@
+diff -up ./x11vnc-git/configure.ac.orig ./x11vnc-git/configure.ac
+--- ./x11vnc-git/configure.ac.orig	2014-08-11 01:40:12.000000000 -0600
++++ ./x11vnc-git/configure.ac	2014-08-11 01:41:23.000000000 -0600
+@@ -25,6 +25,12 @@ AC_PROG_LIBTOOL
+ AC_PATH_PROG([AR], [ar], [/usr/bin/ar],
+                   [$PATH:/usr/ccs/bin])
+ 
++AC_DISABLE_STATIC
++LT_PREREQ([2.4.2])
++LT_INIT([dlopen])
++LT_LANG([C])
++AC_SUBST([LIBTOOL_DEPS])
++
+ # Options
+ AH_TEMPLATE(WITH_TIGHTVNC_FILETRANSFER, [Disable TightVNCFileTransfer protocol])
+ AC_ARG_WITH(tightvnc-filetransfer,
diff --git a/service b/service
new file mode 100644
index 000000000000..0ccc2fea01b5
--- /dev/null
+++ b/service
@@ -0,0 +1,7 @@
+[Unit]
+Description=VNC Server for X11
+Requires=graphical.target
+After=graphical.target
+
+[Service]
+ExecStart=/usr/bin/x11vnc