Skip to content

N
nx-libs
Commit bd592c2e authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared…

library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).
parent b768e812
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 290 deletions
debian/control
View file @ bd592c2e
...@@ -21,12 +21,12 @@ Build-Depends: ...@@ -21,12 +21,12 @@ Build-Depends:
libxcomposite-dev, libxcomposite-dev,
libxrandr-dev, libxrandr-dev,
libxfixes-dev, libxfixes-dev,
libxtst-dev,
autoconf, autoconf,
pkg-config, pkg-config,
x11proto-core-dev, x11proto-core-dev,
expat, expat,
Build-Conflicts: Build-Conflicts:
x11proto-record-dev,
x11proto-xinerama-dev, x11proto-xinerama-dev,
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
...@@ -851,20 +851,16 @@ Multi-Arch: same ...@@ -851,20 +851,16 @@ Multi-Arch: same
Pre-Depends: Pre-Depends:
${misc:Pre-Depends}, ${misc:Pre-Depends},
Depends: Depends:
${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
Breaks: nxlibs (<= 3.5.1), Description: nx-X11 Testing -- Record extension library (dummy package)
libnx-x11 (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 Testing -- Record extension library
NX is a software suite which implements very efficient NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one. using X applications over a network, especially a slow one.
. .
libNX_Xtst provides an X Window System client interface to the Record This package removes the obsoleted libNX_Xtst.so.6 library. With
extension to the X protocol. recent versions of NX, the system-wide installed libXtst gets used.
. .
The Record extension allows X clients to synthesise input events, which This package can be safely removed.
is useful for automated testing.
Package: libnx-xtst-dev Package: libnx-xtst-dev
Provides: libnx-xtst6-dev Provides: libnx-xtst6-dev
...@@ -872,22 +868,17 @@ Section: libdevel ...@@ -872,22 +868,17 @@ Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: Depends:
libnx-xtst6 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
Breaks: nxlibs (<= 3.5.1), Description: nx-X11 Testing -- Record extension library (dummy package)
libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 Testing -- Record extension library (development headers)
NX is a software suite which implements very efficient NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one. using X applications over a network, especially a slow one.
. .
libNX_Xtst provides an X Window System client interface to the Record This package removes the obsoleted headers for the libNX_Xtst.so.6
extension to the X protocol. library. With recent versions of NX, the system-wide installed libXtst
. gets used.
The Record extension allows X clients to synthesise input events, which
is useful for automated testing.
. .
This package contains the development headers for this library. This package can be safely removed.
Package: libnx-xtst6-dbg Package: libnx-xtst6-dbg
Architecture: any Architecture: any
...@@ -895,22 +886,18 @@ Multi-Arch: same ...@@ -895,22 +886,18 @@ Multi-Arch: same
Pre-Depends: Pre-Depends:
${misc:Pre-Depends}, ${misc:Pre-Depends},
Depends: Depends:
libnx-xtst6 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
Section: debug Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~), Description: nx-X11 Testing -- Record extension library (dummy package)
Description: nx-X11 Testing -- Record extension library (debug package)
NX is a software suite which implements very efficient NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one. using X applications over a network, especially a slow one.
. .
libNX_Xtst provides an X Window System client interface to the Record This package removes the obsoleted wire protocol headers for the
extension to the X protocol. libNX_Xtst.so.6 library. With recent versions of NX, the system-wide
. installed libXtst gets used.
The Record extension allows X clients to synthesise input events, which
is useful for automated testing.
. .
This package contains debug symbols for this library. This package can be safely removed.
Package: libnx-mesa-extras-dev Package: libnx-mesa-extras-dev
Section: libdevel Section: libdevel
......
debian/libnx-xtst-dev.install.in deleted 100644 → 0
View file @ b768e812
usr/lib/*/libNX_Xtst.so
usr/include/*/nx-X11/extensions/XTest.h
debian/libnx-xtst6.symbols deleted 100644 → 0
View file @ b768e812
libNX_Xtst.so.6 libnx-xtst6 #MINVER#
XRecordAllocRange@Base 3.5.0.29
XRecordCreateContext@Base 3.5.0.29
XRecordDisableContext@Base 3.5.0.29
XRecordEnableContext@Base 3.5.0.29
XRecordEnableContextAsync@Base 3.5.0.29
XRecordFreeContext@Base 3.5.0.29
XRecordFreeData@Base 3.5.0.29
XRecordFreeState@Base 3.5.0.29
XRecordGetContext@Base 3.5.0.29
XRecordIdBaseMask@Base 3.5.0.29
XRecordProcessReplies@Base 3.5.0.29
XRecordQueryVersion@Base 3.5.0.29
XRecordRegisterClients@Base 3.5.0.29
XRecordUnregisterClients@Base 3.5.0.29
XTestCompareCurrentCursorWithWindow@Base 3.5.0.29
XTestCompareCursorWithWindow@Base 3.5.0.29
XTestDiscard@Base 3.5.0.29
XTestFakeButtonEvent@Base 3.5.0.29
XTestFakeDeviceButtonEvent@Base 3.5.0.29
XTestFakeDeviceKeyEvent@Base 3.5.0.29
XTestFakeDeviceMotionEvent@Base 3.5.0.29
XTestFakeKeyEvent@Base 3.5.0.29
XTestFakeMotionEvent@Base 3.5.0.29
XTestFakeProximityEvent@Base 3.5.0.29
XTestFakeRelativeMotionEvent@Base 3.5.0.29
XTestGrabControl@Base 3.5.0.29
XTestQueryExtension@Base 3.5.0.29
XTestSetGContextOfGC@Base 3.5.0.29
XTestSetVisualIDOfVisual@Base 3.5.0.29
debian/nx-x11proto-xext-dev.install.in
View file @ bd592c2e
usr/include/*/nx-X11/extensions/xteststr.h usr/include/*/nx-X11/extensions/xteststr.h
usr/include/*/nx-X11/extensions/xtestconst.h
usr/include/*/nx-X11/extensions/shapestr.h usr/include/*/nx-X11/extensions/shapestr.h
usr/include/*/nx-X11/extensions/shmstr.h usr/include/*/nx-X11/extensions/shmstr.h
usr/include/*/nx-X11/extensions/syncstr.h usr/include/*/nx-X11/extensions/syncstr.h
nx-X11/config/cf/README
View file @ bd592c2e
...@@ -196,7 +196,6 @@ X11.tmpl provides defaults for the following variables: ...@@ -196,7 +196,6 @@ X11.tmpl provides defaults for the following variables:
DebugLibX11 build libX11_d.a DebugLibX11 build libX11_d.a
DebugLibXau build libXau_d.a DebugLibXau build libXau_d.a
DebugLibXext build libXext_d.a DebugLibXext build libXext_d.a
DebugLibXtst build libXtst_d.a
DebugOldX build liboldX_d.a DebugOldX build liboldX_d.a
DefaultCursorTheme name of default cursor theme DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path DefaultFontPath default server font path
...@@ -232,14 +231,12 @@ X11.tmpl provides defaults for the following variables: ...@@ -232,14 +231,12 @@ X11.tmpl provides defaults for the following variables:
NormalLibX11 build libX11.a NormalLibX11 build libX11.a
NormalLibXau build libXau.a NormalLibXau build libXau.a
NormalLibXext build libXext.a NormalLibXext build libXext.a
NormalLibXtst build libXtst.a
NormalOldX build liboldX.a NormalOldX build liboldX.a
OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName
PrimaryScreenResolution resolution of default server screen PrimaryScreenResolution resolution of default server screen
ProfileLibX11 build libX11_p.a ProfileLibX11 build libX11_p.a
ProfileLibXau build libXau_p.a ProfileLibXau build libXau_p.a
ProfileLibXext build libXext_p.a ProfileLibXext build libXext_p.a
ProfileLibXtst build libXtst_p.a
ProfileOldX build liboldX_p.a ProfileOldX build liboldX_p.a
ProjectX version indicating this is the X Window System ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't RemoveTargetProgramByMoving boolean for rm -f that doesn't
...@@ -252,7 +249,6 @@ X11.tmpl provides defaults for the following variables: ...@@ -252,7 +249,6 @@ X11.tmpl provides defaults for the following variables:
SharedLibX11 boolean for making sharable libX11.so SharedLibX11 boolean for making sharable libX11.so
SharedLibXau boolean for making sharable libXau.so SharedLibXau boolean for making sharable libXau.so
SharedLibXext boolean for making sharable libXext.so SharedLibXext boolean for making sharable libXext.so
SharedLibXtst boolean for making sharable libXtst.so
SharedOldX boolean for making sharable liboldX.so SharedOldX boolean for making sharable liboldX.so
ShmDefines MIT-SHM define ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files TwmDir directory in which to install twm config files
...@@ -330,8 +326,6 @@ An <os>Lib.tmpl file provides defaults for the following variables: ...@@ -330,8 +326,6 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedXauRev version number for libXau.so SharedXauRev version number for libXau.so
SharedXextReqs required libs for libXext.so SharedXextReqs required libs for libXext.so
SharedXextRev version number for libXext.so SharedXextRev version number for libXext.so
SharedXtstReqs required libs for libXtst.so
SharedXtstRev version number for libXtst.so
Vendor.cf files and/or site/host specific .def files may define the Vendor.cf files and/or site/host specific .def files may define the
following variables: following variables:
......
nx-X11/config/cf/X11.tmpl
View file @ bd592c2e
...@@ -1463,28 +1463,6 @@ SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) ...@@ -1463,28 +1463,6 @@ SharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir) ProjectUnsharedLibReferences(OLDX,NX_oldX,$(OLDXLIBSRC),XBuildLibDir)
#endif #endif
#ifndef SharedLibXtst
#define SharedLibXtst HasSharedLibraries
#endif
#ifndef NormalLibXtst
#define NormalLibXtst (!SharedLibXtst | ForceNormalLib)
#endif
#ifndef DebugLibXtst
#define DebugLibXtst NO /* debugged Xtst library */
#endif
#ifndef ProfileLibXtst
#define ProfileLibXtst NO /* profiled Xtst library */
#endif
XTESTLIBSRC = $(LIBSRC)/Xtst
#if SharedLibXtst
#ifndef SharedXtstRev
#define SharedXtstRev 6.1
#endif
SharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
#else
ProjectUnsharedLibReferences(XTEST,NX_Xtst,$(XTESTLIBSRC),XBuildLibDir)
#endif
#if HasMotif #if HasMotif
#ifndef MotifDir #ifndef MotifDir
......
nx-X11/include/extensions/Imakefile
View file @ bd592c2e
...@@ -91,7 +91,7 @@ HEADERS = Xext.h \ ...@@ -91,7 +91,7 @@ HEADERS = Xext.h \
bigreqstr.h \ bigreqstr.h \
extutil.h \ extutil.h \
XI.h XInput.h XIproto.h \ XI.h XInput.h XIproto.h \
XTest.h xtestext1.h xteststr.h \ xtestconst.h xtestext1.h xteststr.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \ XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
Xdbe.h Xdbeproto.h \ Xdbe.h Xdbeproto.h \
Xag.h Xagstr.h Xagsrv.h \ Xag.h Xagstr.h Xagsrv.h \
......
nx-X11/include/extensions/xtestconst.h 0 → 100644
View file @ bd592c2e
/*
Copyright 1992, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
#ifndef _XTEST_H_
#define _XTEST_H_
#include <nx-X11/Xfuncproto.h>
#define X_XTestGetVersion 0
#define X_XTestCompareCursor 1
#define X_XTestFakeInput 2
#define X_XTestGrabControl 3
#define XTestNumberEvents 0
#define XTestNumberErrors 0
#define XTestMajorVersion 2
#define XTestMinorVersion 2
#define XTestExtensionName "XTEST"
#endif
nx-X11/lib/Imakefile
View file @ bd592c2e
...@@ -37,7 +37,6 @@ XEXTLIBDIR = Xext ...@@ -37,7 +37,6 @@ XEXTLIBDIR = Xext
#if BuildLibraries #if BuildLibraries
OLDXLIBDIR = oldX OLDXLIBDIR = oldX
XTSTLIBDIR = Xtst
#endif #endif
...@@ -46,7 +45,6 @@ LINTSUBDIRS = \ ...@@ -46,7 +45,6 @@ LINTSUBDIRS = \
$(X11LIBDIR) \ $(X11LIBDIR) \
$(OLDXLIBDIR) \ $(OLDXLIBDIR) \
$(XEXTLIBDIR) \ $(XEXTLIBDIR) \
$(XTSTLIBDIR) \
$(XKBLIBDIR) \ $(XKBLIBDIR) \
$(XINERAMADIR) \ $(XINERAMADIR) \
$(RENDERLIBDIR) \ $(RENDERLIBDIR) \
......
nx-X11/lib/Xtst/Imakefile deleted 100644 → 0
View file @ b768e812
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:23 cpqbld Exp $
XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.2 1998/12/20 11:57:12 dawes Exp $
#define DoNormalLib NormalLibXtst
#define DoSharedLib SharedLibXtst
#define DoExtraLib SharedLibXtst
#define DoDebugLib DebugLibXtst
#define DoProfileLib ProfileLibXtst
#define LibName NX_Xtst
#define SoRev SOXTESTREV
#define LibHeaders NO
#include <Threads.tmpl>
#ifdef SharedXtstReqs
REQUIREDLIBS = SharedXtstReqs
#endif
INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
SRCS = XTest.c XRecord.c
OBJS = XTest.o XRecord.o
LINTLIBS = $(LINTXLIB)
#include <Library.tmpl>
DependTarget()
nx-X11/lib/Xtst/Xtst-def.cpp deleted 100644 → 0
View file @ b768e812
LIBRARY XTST
VERSION LIBRARY_VERSION
EXPORTS
XTestCompareCurrentCursorWithWindow
XTestCompareCursorWithWindow
XTestDiscard
XTestFakeButtonEvent
XTestFakeDeviceButtonEvent
XTestFakeDeviceKeyEvent
XTestFakeDeviceMotionEvent
XTestFakeKeyEvent
XTestFakeMotionEvent
XTestFakeProximityEvent
XTestFakeRelativeMotionEvent
XTestGrabControl
XTestQueryExtension
XTestSetGContextOfGC
XTestSetVisualIDOfVisual
XRecordQueryVersion
XRecordCreateContext
XRecordAllocRange
XRecordRegisterClients
XRecordUnregisterClients
XRecordGetContext
XRecordFreeState
XRecordEnableContext
XRecordEnableContextAsync
XRecordProcessReplies
XRecordFreeData
XRecordDisableContext
XRecordFreeContext
/* $Xorg: Xtst-def.cpp,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ */
nx-X11/programs/Xserver/Imakefile
View file @ bd592c2e
...@@ -403,17 +403,17 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS) ...@@ -403,17 +403,17 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture) #if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lXfixes -lXfont \ -lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lXfixes -lXfont \
-L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lXdmcp \ -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lXdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#elif defined(cygwinArchitecture) #elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
-lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \ -lXcomp -lXcompext -lNX_Xrender -lX11 -lNX_Xext -lXcomposite -lXfixes -lXfont \
-L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lNX_Xtst -lXdmcp \ -L ../../../nxcompshad -lXcompshad -L../../../nx-X11/exports/lib -lXtst -lXdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#else #else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \ -lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lXfixes -lXfont \
-L../../../nx-X11/exports/lib -lNX_Xtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \ -L../../../nx-X11/exports/lib -lXtst -lXrandr -lXcomposite -lNX_Xinerama -lXdmcp \
`pkg-config --libs libxml-2.0` `pkg-config --libs libxml-2.0`
#endif #endif
......
nx-X11/programs/Xserver/Xext/extmod/modinit.h
View file @ bd592c2e
...@@ -30,7 +30,7 @@ extern void MITMiscExtensionInit(INITARGS); ...@@ -30,7 +30,7 @@ extern void MITMiscExtensionInit(INITARGS);
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(INITARGS);
#define _XTEST_SERVER_ #define _XTEST_SERVER_
#include <nx-X11/extensions/XTest.h> #include <nx-X11/extensions/xtestconst.h>
#include <nx-X11/extensions/xteststr.h> #include <nx-X11/extensions/xteststr.h>
#endif #endif
......
nx-X11/programs/Xserver/Xext/xtest.c
View file @ bd592c2e
...@@ -46,7 +46,7 @@ from The Open Group. ...@@ -46,7 +46,7 @@ from The Open Group.
#include "dixevents.h" #include "dixevents.h"
#include "sleepuntil.h" #include "sleepuntil.h"
#define _XTEST_SERVER_ #define _XTEST_SERVER_
#include <nx-X11/extensions/XTest.h> #include <nx-X11/extensions/xtestconst.h>
#include <nx-X11/extensions/xteststr.h> #include <nx-X11/extensions/xteststr.h>
#ifdef XINPUT #ifdef XINPUT
#include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XI.h>
......
nx-X11/programs/Xserver/mi/miinitext.c
View file @ bd592c2e
...@@ -195,7 +195,7 @@ typedef void (*InitExtension)(INITARGS); ...@@ -195,7 +195,7 @@ typedef void (*InitExtension)(INITARGS);
#endif #endif
#ifdef XTEST #ifdef XTEST
#define _XTEST_SERVER_ #define _XTEST_SERVER_
#include <nx-X11/extensions/XTest.h> #include <nx-X11/extensions/xtestconst.h>
#endif #endif
#ifdef XKB #ifdef XKB
#include <nx-X11/extensions/XKB.h> #include <nx-X11/extensions/XKB.h>
......
nx-libs.spec
View file @ bd592c2e
...@@ -38,6 +38,7 @@ BuildRequires: pkgconfig(xdamage) ...@@ -38,6 +38,7 @@ BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xtst)
%else %else
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
...@@ -51,6 +52,7 @@ BuildRequires: xorg-x11-libXdamage-devel ...@@ -51,6 +52,7 @@ BuildRequires: xorg-x11-libXdamage-devel
BuildRequires: xorg-x11-libXcomposite-devel BuildRequires: xorg-x11-libXcomposite-devel
BuildRequires: xorg-x11-libXrandr-devel BuildRequires: xorg-x11-libXrandr-devel
BuildRequires: xorg-x11-libXfixes-devel BuildRequires: xorg-x11-libXfixes-devel
BuildRequires: xorg-x11-libXtst-devel
%endif %endif
BuildRequires: xorg-x11-util-devel BuildRequires: xorg-x11-util-devel
%endif %endif
...@@ -64,6 +66,7 @@ BuildRequires: libXdmcp-devel ...@@ -64,6 +66,7 @@ BuildRequires: libXdmcp-devel
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: libXfixes-devel BuildRequires: libXfixes-devel
BuildRequires: libXtst-devel
%endif %endif
# For imake # For imake
...@@ -291,26 +294,6 @@ The Xrender library is designed as a lightweight library interface to ...@@ -291,26 +294,6 @@ The Xrender library is designed as a lightweight library interface to
the Render extension. the Render extension.
%package -n libNX_Xtst6
Group: System Environment/Libraries
Summary: Xlib-based client API for the XTEST and RECORD extensions on NX
Requires: %{name}%{?_isa} >= 3.5.0.29
Obsoletes: libNX_Xtst
%description -n libNX_Xtst6
NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X
applications over a network, especially a slow one.
The XTEST extension is a minimal set of client and server extensions
required to completely test the X11 server with no user intervention.
This extension is not intended to support general journaling and
playback of user actions.
The RECORD extension supports the recording and reporting of all core
X protocol and arbitrary X extension protocol.
%package -n libXcomp-devel %package -n libXcomp-devel
Group: Development/Libraries Group: Development/Libraries
Summary: Development files for the NX differential compression library Summary: Development files for the NX differential compression library
...@@ -443,10 +426,6 @@ Provides: nx%{?_isa} = %{version}-%{release} ...@@ -443,10 +426,6 @@ Provides: nx%{?_isa} = %{version}-%{release}
Requires: xorg-x11-fonts-core Requires: xorg-x11-fonts-core
%endif %endif
# Should be a weak dependency, because this package
# works without the dependency.
Requires: xkeyboard-config
%description -n nxagent %description -n nxagent
NX is a software suite which implements very efficient compression of NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X the X11 protocol. This increases performance when using X
...@@ -589,7 +568,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -589,7 +568,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%post -n libNX_Xext6 -p /sbin/ldconfig %post -n libNX_Xext6 -p /sbin/ldconfig
%post -n libNX_Xinerama1 -p /sbin/ldconfig %post -n libNX_Xinerama1 -p /sbin/ldconfig
%post -n libNX_Xrender1 -p /sbin/ldconfig %post -n libNX_Xrender1 -p /sbin/ldconfig
%post -n libNX_Xtst6 -p /sbin/ldconfig
%post -n libXcomp3 -p /sbin/ldconfig %post -n libXcomp3 -p /sbin/ldconfig
%post -n libXcompext3 -p /sbin/ldconfig %post -n libXcompext3 -p /sbin/ldconfig
%post -n libXcompshad3 -p /sbin/ldconfig %post -n libXcompshad3 -p /sbin/ldconfig
...@@ -599,7 +577,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -599,7 +577,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%postun -n libNX_Xext6 -p /sbin/ldconfig %postun -n libNX_Xext6 -p /sbin/ldconfig
%postun -n libNX_Xinerama1 -p /sbin/ldconfig %postun -n libNX_Xinerama1 -p /sbin/ldconfig
%postun -n libNX_Xrender1 -p /sbin/ldconfig %postun -n libNX_Xrender1 -p /sbin/ldconfig
%postun -n libNX_Xtst6 -p /sbin/ldconfig
%postun -n libXcomp3 -p /sbin/ldconfig %postun -n libXcomp3 -p /sbin/ldconfig
%postun -n libXcompext3 -p /sbin/ldconfig %postun -n libXcompext3 -p /sbin/ldconfig
%postun -n libXcompshad3 -p /sbin/ldconfig %postun -n libXcompshad3 -p /sbin/ldconfig
...@@ -672,7 +649,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -672,7 +649,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%{_includedir}/nx-X11/extensions/shape.h %{_includedir}/nx-X11/extensions/shape.h
%{_includedir}/nx-X11/extensions/sync.h %{_includedir}/nx-X11/extensions/sync.h
%{_includedir}/nx-X11/extensions/xtestext1.h %{_includedir}/nx-X11/extensions/xtestext1.h
%{_includedir}/nx-X11/extensions/xteststr.h
%files -n libNX_Xext6 %files -n libNX_Xext6
%defattr(-,root,root) %defattr(-,root,root)
...@@ -691,10 +667,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -691,10 +667,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libNX_Xrender.so.1* %{_libdir}/libNX_Xrender.so.1*
%files -n libNX_Xtst6
%defattr(-,root,root)
%{_libdir}/libNX_Xtst.so.6*
%files -n libXcomp-devel %files -n libXcomp-devel
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libXcomp.so %_libdir/libXcomp.so
...@@ -751,10 +723,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -751,10 +723,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libNX_Xinerama.so %{_libdir}/libNX_Xinerama.so
%{_libdir}/libNX_Xtst.so
%{_includedir}/nx-X11/X10.h %{_includedir}/nx-X11/X10.h
%dir %{_includedir}/nx-X11/extensions %dir %{_includedir}/nx-X11/extensions
%{_includedir}/nx-X11/extensions/XTest.h
%{_includedir}/nx-X11/extensions/Xevie.h %{_includedir}/nx-X11/extensions/Xevie.h
%{_includedir}/nx-X11/extensions/Xinerama.h %{_includedir}/nx-X11/extensions/Xinerama.h
%{_includedir}/nx-X11/extensions/lbxbuf.h %{_includedir}/nx-X11/extensions/lbxbuf.h
...@@ -825,6 +795,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X ...@@ -825,6 +795,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%{_includedir}/nx-X11/extensions/xf86vmstr.h %{_includedir}/nx-X11/extensions/xf86vmstr.h
%{_includedir}/nx-X11/extensions/xfixesproto.h %{_includedir}/nx-X11/extensions/xfixesproto.h
%{_includedir}/nx-X11/extensions/xfixeswire.h %{_includedir}/nx-X11/extensions/xfixeswire.h
%{_includedir}/nx-X11/extensions/xtestconst.h
%{_includedir}/nx-X11/extensions/xteststr.h
%{_includedir}/nx-X11/extensions/xtrapbits.h %{_includedir}/nx-X11/extensions/xtrapbits.h
%{_includedir}/nx-X11/extensions/xtrapddmi.h %{_includedir}/nx-X11/extensions/xtrapddmi.h
%{_includedir}/nx-X11/extensions/xtrapdi.h %{_includedir}/nx-X11/extensions/xtrapdi.h
......
nxcompshad/Makefile.in
View file @ bd592c2e
...@@ -151,7 +151,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL) ...@@ -151,7 +151,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
else else
EXTRALIBS = -lNX_Xext -lNX_Xtst -lXrandr -lXdamage EXTRALIBS = -lNX_Xext -lXtst -lXrandr -lXdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
......
nxcompshad/X11.cpp
View file @ bd592c2e
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <nx-X11/Xlibint.h> #include <nx-X11/Xlibint.h>
#include <nx-X11/Xproto.h> #include <nx-X11/Xproto.h>
#include <nx-X11/keysym.h> #include <nx-X11/keysym.h>
#include <nx-X11/extensions/XTest.h> #include "X11/include/XTest_nxcompshad.h"
#include <string.h> #include <string.h>
#include <sys/ipc.h> #include <sys/ipc.h>
#include <sys/shm.h> #include <sys/shm.h>
......
nx-X11/include/extensions/XTest.h → nxcompshad/X11/include/XTest_nxcompshad.h
View file @ bd592c2e
/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
/* /*
Copyright 1992, 1998 The Open Group Copyright 1992, 1998 The Open Group
...@@ -24,31 +23,12 @@ used in advertising or otherwise to promote the sale, use or other dealings ...@@ -24,31 +23,12 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group. in this Software without prior written authorization from The Open Group.
*/ */
/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */
#ifndef _XTEST_H_ #ifndef _XTEST_H_
#define _XTEST_H_ #define _XTEST_H_
#include <nx-X11/Xfuncproto.h> #include <nx-X11/Xfuncproto.h>
#define X_XTestGetVersion 0
#define X_XTestCompareCursor 1
#define X_XTestFakeInput 2
#define X_XTestGrabControl 3
#define XTestNumberEvents 0
#define XTestNumberErrors 0
#define XTestMajorVersion 2
#define XTestMinorVersion 2
#define XTestExtensionName "XTEST"
#ifndef _XTEST_SERVER_
#include <nx-X11/extensions/XInput.h>
_XFUNCPROTOBEGIN _XFUNCPROTOBEGIN
Bool XTestQueryExtension( Bool XTestQueryExtension(
...@@ -59,17 +39,6 @@ Bool XTestQueryExtension( ...@@ -59,17 +39,6 @@ Bool XTestQueryExtension(
int* /* minorp */ int* /* minorp */
); );
Bool XTestCompareCursorWithWindow(
Display* /* dpy */,
Window /* window */,
Cursor /* cursor */
);
Bool XTestCompareCurrentCursorWithWindow(
Display* /* dpy */,
Window /* window */
);
extern int XTestFakeKeyEvent( extern int XTestFakeKeyEvent(
Display* /* dpy */, Display* /* dpy */,
unsigned int /* keycode */, unsigned int /* keycode */,
...@@ -92,73 +61,11 @@ extern int XTestFakeMotionEvent( ...@@ -92,73 +61,11 @@ extern int XTestFakeMotionEvent(
unsigned long /* delay */ unsigned long /* delay */
); );
extern int XTestFakeRelativeMotionEvent(
Display* /* dpy */,
int /* x */,
int /* y */,
unsigned long /* delay */
);
extern int XTestFakeDeviceKeyEvent(
Display* /* dpy */,
XDevice* /* dev */,
unsigned int /* keycode */,
Bool /* is_press */,
int* /* axes */,
int /* n_axes */,
unsigned long /* delay */
);
extern int XTestFakeDeviceButtonEvent(
Display* /* dpy */,
XDevice* /* dev */,
unsigned int /* button */,
Bool /* is_press */,
int* /* axes */,
int /* n_axes */,
unsigned long /* delay */
);
extern int XTestFakeProximityEvent(
Display* /* dpy */,
XDevice* /* dev */,
Bool /* in_prox */,
int* /* axes */,
int /* n_axes */,
unsigned long /* delay */
);
extern int XTestFakeDeviceMotionEvent(
Display* /* dpy */,
XDevice* /* dev */,
Bool /* is_relative */,
int /* first_axis */,
int* /* axes */,
int /* n_axes */,
unsigned long /* delay */
);
extern int XTestGrabControl( extern int XTestGrabControl(
Display* /* dpy */, Display* /* dpy */,
Bool /* impervious */ Bool /* impervious */
); );
void XTestSetGContextOfGC(
GC /* gc */,
GContext /* gid */
);
void XTestSetVisualIDOfVisual(
Visual* /* visual */,
VisualID /* visualid */
);
Status XTestDiscard(
Display* /* dpy */
);
_XFUNCPROTOEND _XFUNCPROTOEND
#endif /* _XTEST_SERVER_ */
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment