1.3.0.
This commit is contained in:
Tim Waugh
parent
a27c2a51b2
commit
a52f174ac5
@ -1,15 +1,13 @@
|
|||||||
%global snap 20130314svn5065
|
|
||||||
|
|
||||||
Name: tigervnc
|
Name: tigervnc
|
||||||
Version: 1.2.80
|
Version: 1.3.0
|
||||||
Release: 0.18.%{snap}%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A TigerVNC remote display system
|
Summary: A TigerVNC remote display system
|
||||||
|
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.tigervnc.com
|
URL: http://www.tigervnc.com
|
||||||
|
|
||||||
Source0: %{name}-%{version}-%{snap}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source1: vncserver.service
|
Source1: vncserver.service
|
||||||
Source2: vncserver.sysconfig
|
Source2: vncserver.sysconfig
|
||||||
Source3: 10-libvnc.conf
|
Source3: 10-libvnc.conf
|
||||||
@ -43,7 +41,6 @@ Patch4: tigervnc-cookie.patch
|
|||||||
Patch10: tigervnc11-ldnow.patch
|
Patch10: tigervnc11-ldnow.patch
|
||||||
Patch11: tigervnc11-gethomedir.patch
|
Patch11: tigervnc11-gethomedir.patch
|
||||||
Patch13: tigervnc11-rh692048.patch
|
Patch13: tigervnc11-rh692048.patch
|
||||||
Patch14: tigervnc12-xorg113-glx.patch
|
|
||||||
Patch15: tigervnc-inetd-nowait.patch
|
Patch15: tigervnc-inetd-nowait.patch
|
||||||
Patch16: tigervnc-setcursor-crash.patch
|
Patch16: tigervnc-setcursor-crash.patch
|
||||||
Patch17: tigervnc-manpages.patch
|
Patch17: tigervnc-manpages.patch
|
||||||
@ -139,7 +136,7 @@ BuildArch: noarch
|
|||||||
This package contains icons for TigerVNC viewer
|
This package contains icons for TigerVNC viewer
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}-%{snap}
|
%setup -q
|
||||||
|
|
||||||
%patch4 -p1 -b .cookie
|
%patch4 -p1 -b .cookie
|
||||||
%patch10 -p1 -b .ldnow
|
%patch10 -p1 -b .ldnow
|
||||||
@ -154,8 +151,6 @@ done
|
|||||||
patch -p1 -b --suffix .vnc < ../xserver114.patch
|
patch -p1 -b --suffix .vnc < ../xserver114.patch
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%patch14 -p1 -b .glx
|
|
||||||
|
|
||||||
# Applied Debian patch to fix busy loop when run from inetd in nowait
|
# Applied Debian patch to fix busy loop when run from inetd in nowait
|
||||||
# mode (bug #920373).
|
# mode (bug #920373).
|
||||||
%patch15 -p1 -b .inetd-nowait
|
%patch15 -p1 -b .inetd-nowait
|
||||||
@ -332,6 +327,9 @@ fi
|
|||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 8 2013 Tim Waugh <twaugh@redhat.com> 1.3.0-1
|
||||||
|
- 1.3.0.
|
||||||
|
|
||||||
* Wed Jul 3 2013 Tim Waugh <twaugh@redhat.com> 1.2.80-0.18.20130314svn5065
|
* Wed Jul 3 2013 Tim Waugh <twaugh@redhat.com> 1.2.80-0.18.20130314svn5065
|
||||||
- Removed systemd_requires macro in order to fix the build.
|
- Removed systemd_requires macro in order to fix the build.
|
||||||
|
|
||||||
|
|||||||
@ -1,84 +0,0 @@
|
|||||||
diff -up tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am.jx tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am
|
|
||||||
--- tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am.jx 2012-09-28 13:24:53.000000000 -0400
|
|
||||||
+++ tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/Makefile.am 2012-09-28 13:35:59.918561641 -0400
|
|
||||||
@@ -8,6 +8,10 @@ XREGION_LIB=$(LIB_DIR)/Xregion/libXregio
|
|
||||||
OS_LIB=$(LIB_DIR)/os/libos.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 \
|
|
||||||
@@ -35,7 +39,8 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGER
|
|
||||||
-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
|
|
||||||
@@ -56,7 +61,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
|
|
||||||
|
|
||||||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
|
|
||||||
|
|
||||||
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
|
|
||||||
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) $(GLX_LIB)
|
|
||||||
|
|
||||||
EXTRA_DIST = Xvnc.man
|
|
||||||
|
|
||||||
--- tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/xvnc.cc.jx 2012-09-05 09:29:19.000000000 -0400
|
|
||||||
+++ tigervnc-1.2.80-20120905svn4996/unix/xserver/hw/vnc/xvnc.cc 2012-09-28 13:39:41.178815125 -0400
|
|
||||||
@@ -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(Callbac
|
|
||||||
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,13 @@ InitOutput(ScreenInfo *screenInfo, int a
|
|
||||||
int i;
|
|
||||||
int NumFormats = 0;
|
|
||||||
|
|
||||||
+#if XORG >= 113
|
|
||||||
+#ifdef GLXEXT
|
|
||||||
+ if (serverGeneration == 1)
|
|
||||||
+ LoadExtension(&vnc_glx_ext, TRUE);
|
|
||||||
+#endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/* initialize pixmap formats */
|
|
||||||
|
|
||||||
/* must have a pixmap depth to match every screen depth */
|
|
||||||
Loading…
Reference in New Issue
Block a user