Revision: 4387
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4387&view=rev
Author: atkac
Date: 2011-04-27 13:40:26 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
[Bugfix] Fix Xvnc linking issues (missing -lpthread and miext/sync/libsync.la)
Fixes bug ID:3287869
Modified Paths:
--------------
branches/1_1/unix/xserver/hw/vnc/Makefile.am
branches/1_1/unix/xserver110.patch
Property Changed:
----------------
branches/1_1/
Property changes on: branches/1_1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/unified_buildsys:3892-3898
/trunk:4315
+ /branches/unified_buildsys:3892-3898
/trunk:4315,4386
Modified: branches/1_1/unix/xserver/hw/vnc/Makefile.am
===================================================================
--- branches/1_1/unix/xserver/hw/vnc/Makefile.am 2011-04-27 13:26:36 UTC
(rev 4386)
+++ branches/1_1/unix/xserver/hw/vnc/Makefile.am 2011-04-27 13:40:26 UTC
(rev 4387)
@@ -35,7 +35,7 @@
-I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
- $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
+ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
Modified: branches/1_1/unix/xserver110.patch
===================================================================
--- branches/1_1/unix/xserver110.patch 2011-04-27 13:26:36 UTC (rev 4386)
+++ branches/1_1/unix/xserver110.patch 2011-04-27 13:40:26 UTC (rev 4387)
@@ -1,6 +1,6 @@
diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc 2011-03-14 13:57:11.716142896 +0100
-+++ xserver/configure.ac 2011-03-14 13:58:14.816003575 +0100
+--- xserver/configure.ac.vnc 2011-03-22 10:41:05.508614018 +0100
++++ xserver/configure.ac 2011-03-22 10:47:01.592023995 +0100
@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.0, [https://
RELEASE_DATE="2011-2-25"
AC_CONFIG_SRCDIR([Makefile.am])
@@ -17,13 +17,14 @@
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
AC_DISABLE_STATIC
-@@ -1510,6 +1510,13 @@ if test "x$XVFB" = xyes; then
+@@ -1510,6 +1510,14 @@ if test "x$XVFB" = xyes; then
AC_SUBST([XVFB_SYS_LIBS])
fi
+dnl Xvnc DDX
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC
$RENDER_INC $RANDR_INC"])
-+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_DAMAGE_LIB
$MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++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 This is necessary to allow Xvnc to statically link with GnuTLS
+AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g.
-L{GnuTLS directory}/lib -lgnutls])
@@ -31,7 +32,7 @@
dnl Xnest DDX
-@@ -1548,6 +1555,8 @@ xorg_bus_linuxpci=no
+@@ -1548,6 +1556,8 @@ xorg_bus_linuxpci=no
xorg_bus_bsdpci=no
xorg_bus_sparc=no
@@ -40,7 +41,7 @@
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'
-@@ -1792,7 +1801,6 @@ if test "x$XORG" = xyes; then
+@@ -1792,7 +1802,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
@@ -48,7 +49,7 @@
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])
-@@ -2254,6 +2262,7 @@ hw/dmx/Makefile
+@@ -2254,6 +2263,7 @@ hw/dmx/Makefile
hw/dmx/man/Makefile
hw/vfb/Makefile
hw/vfb/man/Makefile
@@ -57,8 +58,8 @@
hw/xnest/man/Makefile
hw/xwin/Makefile
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc 2011-03-14 13:57:12.286141640 +0100
-+++ xserver/hw/Makefile.am 2011-03-14 13:57:14.116137603 +0100
+--- xserver/hw/Makefile.am.vnc 2011-03-22 10:41:05.528613984 +0100
++++ xserver/hw/Makefile.am 2011-03-22 10:41:05.630613813 +0100
@@ -33,7 +33,8 @@ SUBDIRS = \
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \
@@ -70,8 +71,8 @@
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc 2011-03-14 13:57:13.756138397 +0100
-+++ xserver/mi/miinitext.c 2011-03-14 13:57:14.116137603 +0100
+--- xserver/mi/miinitext.c.vnc 2011-03-22 10:41:05.591613878 +0100
++++ xserver/mi/miinitext.c 2011-03-22 10:41:05.630613813 +0100
@@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS
extern void CompositeExtensionInit(INITARGS);
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
