[arch-commits] Commit in tigervnc/trunk (PKGBUILD xorg114.patch xserver114.patch)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Wed Mar 20 15:09:08 UTC 2013
Date: Wednesday, March 20, 2013 @ 16:09:07
Author: spupykin
Revision: 86601
upgpkg: tigervnc 1.2.0-12
upd
Added:
tigervnc/trunk/xorg114.patch
tigervnc/trunk/xserver114.patch
Modified:
tigervnc/trunk/PKGBUILD
------------------+
PKGBUILD | 13 +++++---
xorg114.patch | 28 +++++++++++++++++
xserver114.patch | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 121 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-20 14:37:11 UTC (rev 86600)
+++ PKGBUILD 2013-03-20 15:09:07 UTC (rev 86601)
@@ -4,8 +4,8 @@
pkgname=tigervnc
pkgver=1.2.0
-pkgrel=11
-_xorgver=1.13.2
+pkgrel=12
+_xorgver=1.14.0
pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC."
arch=('i686' 'x86_64')
url="http://www.tigervnc.org"
@@ -26,19 +26,23 @@
xorg111.patch
xorg112.patch
xorg113.patch
+ xorg114.patch
xserver113.patch
+ xserver114.patch
glx.patch
gnutls.patch
gethomedir.patch
cmakelists.patch)
md5sums=('3a5755b4ed600a81c3a17976c6f8420d'
- '553fd7902e1156115f15cc1656f46a6f'
+ '86110278b784e279381b7f6f2295c508'
'0903d5a0dfa38e0b04964505b644585c'
'15c0405f920c3dac250692e8922578d1'
'b680b55f7f9f569cd26ac0b330012a8b'
'f73e055153889ae7b5aac8e697f7a841'
'ef4078ba31a583dc3134e9090fbd30d0'
+ '72518a7a1e7d3721ebe7404dcd8b3d01'
'fabbe561d4ac845317ffdbf1bb2eeb02'
+ '928faf837ba5b1b34283f9f018df2f5e'
'4b86c015c78a0360205fdcf511ea1c39'
'1a5fe8867ab3e49e20aafc70c415494f'
'fa059baabe72308bf82622bca73cb3e0'
@@ -54,6 +58,7 @@
patch -Np1 -i ${srcdir}/xorg111.patch
patch -Np1 -i ${srcdir}/xorg112.patch
patch -Np1 -i ${srcdir}/xorg113.patch
+ patch -Np1 -i ${srcdir}/xorg114.patch
patch -Np1 -i ${srcdir}/glx.patch
cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes
@@ -61,7 +66,7 @@
make -C media
cd unix/xserver
- patch -Np3 -i ${srcdir}/xserver113.patch
+ patch -Np1 -i ${srcdir}/xserver114.patch
autoreconf -fiv
./configure --prefix=/usr \
--disable-static --disable-xinerama --without-dtrace \
Added: xorg114.patch
===================================================================
--- xorg114.patch (rev 0)
+++ xorg114.patch 2013-03-20 15:09:07 UTC (rev 86601)
@@ -0,0 +1,28 @@
+diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:22:42.240358422 +0100
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:23:33.846355724 +0100
+@@ -42,8 +42,10 @@
+ #define XORG 112
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
+ #define XORG 113
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
++#define XORG 114
+ #else
+-#error "X.Org newer than 1.13 is not supported"
++#error "X.Org newer than 1.14 is not supported"
+ #endif
+
+ #endif
+diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc
+--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:22:51.327357948 +0100
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:23:33.847355727 +0100
+@@ -54,7 +54,9 @@
+ #include "servermd.h"
+ #include "fb.h"
+ #include "mi.h"
++#if XORG < 114
+ #include "mibstore.h"
++#endif
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
Added: xserver114.patch
===================================================================
--- xserver114.patch (rev 0)
+++ xserver114.patch 2013-03-20 15:09:07 UTC (rev 86601)
@@ -0,0 +1,84 @@
+diff -up xorg-server-20130109/configure.ac.vnc xorg-server-20130109/configure.ac
+--- xorg-server-20130109/configure.ac.vnc 2013-01-24 13:01:31.013267503 +0100
++++ xorg-server-20130109/configure.ac 2013-01-24 13:08:43.283941751 +0100
+@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then
+ AC_SUBST([XVFB_SYS_LIBS])
+ fi
+
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+
+ dnl Xnest DDX
+
+@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ if test "x$XORG" = xyes; then
+ XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+ XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+@@ -1826,7 +1833,6 @@ if test "x$XORG" = xyes; then
+ AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+ AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+ AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+ AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+ AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+ AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+@@ -2291,6 +2297,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
+ hw/vfb/Makefile
+ hw/vfb/man/Makefile
++hw/vnc/Makefile
+ hw/xnest/Makefile
+ hw/xnest/man/Makefile
+ hw/xwin/Makefile
+diff -up xorg-server-20130109/hw/Makefile.am.vnc xorg-server-20130109/hw/Makefile.am
+--- xorg-server-20130109/hw/Makefile.am.vnc 2013-01-10 06:06:16.000000000 +0100
++++ xorg-server-20130109/hw/Makefile.am 2013-01-24 13:08:43.283941751 +0100
+@@ -33,7 +33,8 @@ SUBDIRS = \
+ $(XNEST_SUBDIRS) \
+ $(DMX_SUBDIRS) \
+ $(KDRIVE_SUBDIRS) \
+- $(XQUARTZ_SUBDIRS)
++ $(XQUARTZ_SUBDIRS) \
++ vnc
+
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
+
+diff -up xorg-server-20130109/mi/miinitext.c.vnc xorg-server-20130109/mi/miinitext.c
+--- xorg-server-20130109/mi/miinitext.c.vnc 2013-01-10 06:06:16.000000000 +0100
++++ xorg-server-20130109/mi/miinitext.c 2013-01-24 13:08:43.283941751 +0100
+@@ -112,6 +112,10 @@ SOFTWARE.
+ #include "micmap.h"
+ #include "globals.h"
+
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* The following is only a small first step towards run-time
+ * configurable extensions.
+ */
+@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[
+ #ifdef XSELINUX
+ {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
+ #endif
++#ifdef TIGERVNC
++ {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+ };
+
+ static ExtensionModule *ExtensionModuleList = NULL;
More information about the arch-commits
mailing list