Hello community, here is the log from the commit of package xorg-x11-Xvnc for openSUSE:Factory checked in at 2013-06-13 22:53:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-Xvnc (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-Xvnc" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2013-03-20 10:05:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-Xvnc.new/xorg-x11-Xvnc.changes 2013-06-13 22:53:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 12 15:54:27 UTC 2013 - [email protected] + +- N_tigervnc_enable-glx.patch + * Build with GLX extension. (bnc#823625) + +------------------------------------------------------------------- New: ---- N_tigervnc_enable-glx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-Xvnc.spec ++++++ --- /var/tmp/diff_new_pack.giCLHK/_old 2013-06-13 22:53:27.000000000 +0200 +++ /var/tmp/diff_new_pack.giCLHK/_new 2013-06-13 22:53:27.000000000 +0200 @@ -63,6 +63,7 @@ Patch2: N_tigervnc_keyboard-layout-handling.patch Patch3: u_aarch64-support.patch Patch4: tigervnc-1.2.80-snprintf-overflow.patch +Patch5: N_tigervnc_enable-glx.patch %else Source0: Xvnc.pl %endif @@ -83,6 +84,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch5 -p1 cd ../.. %patch4 -p1 %endif ++++++ N_tigervnc_enable-glx.patch ++++++ Subject: Enagle GLX Path-Mainline: N/A References: bnc#823625 Signed-off-by: Michal Srb <[email protected]> diff --git a/hw/vnc/Makefile.am b/hw/vnc/Makefile.am index 5166ef2..5af9c92 100644 --- a/hw/vnc/Makefile.am +++ b/hw/vnc/Makefile.am @@ -7,6 +7,10 @@ NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) +if GLX +GLX_LIB = $(top_srcdir)/glx/libglx.la +endif + noinst_LTLIBRARIES = libvnccommon.la HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \ @@ -34,7 +38,8 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ -UHAVE_CONFIG_H \ -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ - -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) + -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ + -I$(top_srcdir)/glx Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 @@ -55,7 +60,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ libvnc_la_LDFLAGS = -module -avoid-version -libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) +libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB) EXTRA_DIST = Xvnc.man diff --git a/hw/vnc/xvnc.cc b/hw/vnc/xvnc.cc index 3b848b2..4ad4466 100644 --- a/hw/vnc/xvnc.cc +++ b/hw/vnc/xvnc.cc @@ -87,6 +87,17 @@ extern "C" { #include "version-config.h" #include "site.h" #endif + +#if XORG >= 113 +#ifdef GLXEXT +/* C++ really is the worst */ +#define private _private +#include "glxserver.h" +#undef private +#include "glx_extinit.h" +#endif +#endif + #undef class #undef public } @@ -1562,6 +1573,16 @@ static void vfbClientStateChange(CallbackListPtr*, pointer, pointer) { dispatchException &= ~DE_RESET; } +#if XORG >= 113 +#ifdef GLXEXT +static ExtensionModule vnc_glx_ext = { + GlxExtensionInit, + "GLX", + &noGlxExtension +}; +#endif +#endif + void InitOutput(ScreenInfo *screenInfo, int argc, char **argv) { @@ -1571,6 +1592,12 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv) int i; int NumFormats = 0; +#if XORG >= 113 +#ifdef GLXEXT + LoadExtension(&vnc_glx_ext, TRUE); +#endif +#endif + /* initialize pixmap formats */ /* must have a pixmap depth to match every screen depth */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
