Skip to content

N
nx-libs
Commit 1cd7e35c authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

finally drop libNX_Xext

parent e78c5bc3
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 962 deletions
debian/control
View file @ 1cd7e35c
......@@ -18,6 +18,7 @@ Build-Depends:
libxfont-dev,
libxdmcp-dev,
libxdamage-dev,
libxext-dev,
libxcomposite-dev,
libxrandr-dev,
libxfixes-dev,
......@@ -75,6 +76,7 @@ Depends:
nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1),
Breaks: nxlibs (<= 3.5.1),
libnx-x11 (<< 2:3.5.0.29-1~),
libnx-xext6 (<< 2:3.6.0.0),
libnx-xau6 (<< 2:3.6.0.0),
libnx-xcomposite1 (<< 2:3.6.0.0),
libnx-xdamage1 (<< 2:3.6.0.0),
......@@ -86,6 +88,7 @@ Breaks: nxlibs (<= 3.5.1),
libnx-xrender1 (<< 2:3.6.0.0),
libnx-xtst6 (<< 2:3.6.0.0),
Replaces: nxlibs,
libnx-xext6,
libnx-xau6,
libnx-xcomposite1,
libnx-xdamage1,
......@@ -109,6 +112,7 @@ Provides: libnx-x11-6-dev
Section: libdevel
Architecture: any
Breaks: nxlibs-dev (<=3.5.1),
libnx-xext-dev (<< 2:3.6.0.0),
libnx-xau-dev (<< 2:3.6.0.0),
libnx-xcomposite-dev (<< 2:3.6.0.0),
libnx-xdamage-dev (<< 2:3.6.0.0),
......@@ -120,6 +124,7 @@ Breaks: nxlibs-dev (<=3.5.1),
libnx-xrender-dev (<< 2:3.6.0.0),
libnx-xtst-dev (<< 2:3.6.0.0),
Replaces: nxlibs-dev,
libnx-xext-dev,
libnx-xau-dev,
libnx-xcomposite-dev,
libnx-xdamage-dev,
......@@ -149,6 +154,7 @@ Depends:
${misc:Depends},
Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
libnx-xext6-dbg (<< 2:3.6.0.0),
libnx-xau6-dbg (<< 2:3.6.0.0),
libnx-xcomposite1-dbg (<< 2:3.6.0.0),
libnx-xdamage1-dbg (<< 2:3.6.0.0),
......@@ -160,6 +166,7 @@ Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
libnx-xrender1-dbg (<< 2:3.6.0.0),
libnx-xtst6-dbg (<< 2:3.6.0.0),
Replaces: nx-x11-dbg,
libnx-xext6-dbg,
libnx-xau6-dbg,
libnx-xcomposite1-dbg,
libnx-xdamage1-dbg,
......@@ -178,7 +185,7 @@ Description: nx-X11 client-side library (debug package)
This package contains debug symbols for the core nx-X11 libraries
customized for nxagent.
Package: nx-x11proto-composite-dev
Package: nx-x11proto-xext-dev
Section: libdevel
Architecture: any
Multi-Arch: same
......@@ -186,108 +193,49 @@ Depends:
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-1~),
Description: nx-X11 Composite extension wire protocol
libnx-xext-dev (<< 2:3.5.99.0~),
Description: nx-X11 miscellaneous extension wire protocol
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.
.
This package provides development headers describing the wire protocol
for the Composite extension in nx-X11, used to let arbitrary client
programs control drawing of the final image.
Package: nx-x11proto-damage-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
Description: nx-X11 Damage extension wire protocol (dummy package)
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.
.
This package removes the obsoleted wire protocol headers for the
libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
installed libXdamage gets used.
.
This package can be safely removed.
Package: libnx-xext6
Architecture: any
Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11 (<< 2:3.5.0.29-1~),
Description: nx-X11 miscellaneous extension library
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.
.
libNX_Xext provides an X Window System client interface to several
extensions to the X protocol.
.
libnx_Xext also provides a small set of utility functions to aid authors
of client APIs for X protocol extensions.
Package: libnx-xext-dev
Provides: libnx-xext6-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libnx-xext6 (= ${binary:Version}),
nx-x11proto-xext-dev (= ${binary:Version}),
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-1~),
Description: nx-X11 miscellaneous extension library (development headers)
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.
.
libNX_Xext provides an X Window System client interface to several
extensions to the X protocol.
.
This package contains the development headers for this library.
for various extensions, the client-side libraries of which are provided
in the Xext library.
Package: nx-x11proto-xext-dev
Package: nx-x11proto-composite-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libnx-xext6 (= ${binary:Version}),
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-1~),
libnx-xext-dev (<< 2:3.5.99.0~),
Description: nx-X11 miscellaneous extension wire protocol
Description: nx-X11 Composite extension wire protocol
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.
.
This package provides development headers describing the wire protocol
for various extensions, the client-side libraries of which are provided
in the Xext library.
for the Composite extension in nx-X11, used to let arbitrary client
programs control drawing of the final image.
Package: libnx-xext6-dbg
Package: nx-x11proto-damage-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libnx-xext6 (= ${binary:Version}),
${misc:Depends},
Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
Description: nx-X11 miscellaneous extension library (debug package)
Description: nx-X11 Damage extension wire protocol (dummy package)
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.
.
libNX_Xext provides an X Window System client interface to several
extensions to the X protocol.
This package removes the obsoleted wire protocol headers for the
libNX_Xdamage.so.1 library. With recent versions of NX, the system-wide
installed libXdamage gets used.
.
This package contains debug symbols for this library.
This package can be safely removed.
Package: nx-x11proto-xfixes-dev
Section: libdevel
......
debian/libnx-xext-dev.install deleted 100644 → 0
View file @ e78c5bc3
usr/lib/*/libNX_Xext.so
usr/include/*/nx-X11/extensions/XShm.h
usr/include/*/nx-X11/extensions/Xext.h
usr/include/*/nx-X11/extensions/extutil.h
debian/libnx-xext6.install deleted 100644 → 0
View file @ e78c5bc3
usr/lib/*/libNX_Xext.so.*
debian/libnx-xext6.symbols deleted 100644 → 0
View file @ e78c5bc3
libNX_Xext.so.6 libnx-xext6 #MINVER#
#MISSING: 2:3.5.99.0-0# DPMSCapable@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSDisable@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSEnable@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSForceLevel@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSGetTimeouts@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSGetVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSInfo@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# DPMSSetTimeouts@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XLbxGetEventBase@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XLbxQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XLbxQueryVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XMITMiscGetBugMode@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XMITMiscQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XMITMiscSetBugMode@Base 3.5.0.29
XMissingExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSecurityAllocXauth@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSecurityFreeXauth@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSecurityGenerateAuthorization@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSecurityQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSecurityRevokeAuthorization@Base 3.5.0.29
XSetExtensionErrorHandler@Base 3.5.0.29
XShapeCombineMask@Base 3.5.0.29
XShapeCombineRectangles@Base 3.5.0.29
XShapeCombineRegion@Base 3.5.0.29
XShapeCombineShape@Base 3.5.0.29
XShapeGetRectangles@Base 3.5.0.29
XShapeInputSelected@Base 3.5.0.29
XShapeOffsetShape@Base 3.5.0.29
XShapeQueryExtension@Base 3.5.0.29
XShapeQueryExtents@Base 3.5.0.29
XShapeQueryVersion@Base 3.5.0.29
XShapeSelectInput@Base 3.5.0.29
XShmAttach@Base 3.5.0.29
XShmCreateImage@Base 3.5.0.29
XShmCreatePixmap@Base 3.5.0.29
XShmDetach@Base 3.5.0.29
XShmGetEventBase@Base 3.5.0.29
XShmGetImage@Base 3.5.0.29
XShmPixmapFormat@Base 3.5.0.29
XShmPutImage@Base 3.5.0.29
XShmQueryExtension@Base 3.5.0.29
XShmQueryVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncAwait@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncChangeAlarm@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncChangeCounter@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncCreateAlarm@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncCreateCounter@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncDestroyAlarm@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncDestroyCounter@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncFreeSystemCounterList@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncGetPriority@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncInitialize@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncIntToValue@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncIntsToValue@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncListSystemCounters@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncMaxValue@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncMinValue@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncQueryAlarm@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncQueryCounter@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncSetCounter@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncSetPriority@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueAdd@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueEqual@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueGreaterOrEqual@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueGreaterThan@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueHigh32@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueIsNegative@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueIsPositive@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueIsZero@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueLessOrEqual@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueLessThan@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueLow32@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XSyncValueSubtract@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestFakeAckType@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestFakeInput@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestFlush@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestGetInput@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestInputActionType@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestMovePointer@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestPressButton@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestPressKey@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestQueryInputSize@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestReset@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XTestStopInput@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagCreateAssociation@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagCreateEmbeddedApplicationGroup@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagCreateNonembeddedApplicationGroup@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagDestroyApplicationGroup@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagDestroyAssociation@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagGetApplicationGroupAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagQueryApplicationGroup@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XagQueryVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XcupGetReservedColormapEntries@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XcupQueryVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XcupStoreColors@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeAllocateBackBufferName@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeBeginIdiom@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeDeallocateBackBufferName@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeEndIdiom@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeFreeVisualInfo@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeGetBackBufferAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeGetVisualInfo@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XdbeSwapBuffers@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XeviGetVisualInfo@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XeviQueryExtension@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XeviQueryVersion@Base 3.5.0.29
XextAddDisplay@Base 3.5.0.29
XextCreateExtension@Base 3.5.0.29
XextDestroyExtension@Base 3.5.0.29
XextFindDisplay@Base 3.5.0.29
XextRemoveDisplay@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufChangeBufferAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufChangeWindowAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufClearBufferArea@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufCreateBuffers@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufCreateStereoWindow@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufDestroyBuffers@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufDisplayBuffers@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufGetBufferAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufGetScreenInfo@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufGetVersion@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufGetWindowAttributes@Base 3.5.0.29
#MISSING: 2:3.5.99.0-0# XmbufQueryExtension@Base 3.5.0.29
_XExtensionErrorFunction@Base 3.5.0.29
debian/nx-x11proto-xext-dev.install
View file @ 1cd7e35c
......@@ -2,6 +2,5 @@ usr/include/*/nx-X11/extensions/dpmsstr.h
usr/include/*/nx-X11/extensions/xteststr.h
usr/include/*/nx-X11/extensions/xtestconst.h
usr/include/*/nx-X11/extensions/securstr.h
usr/include/*/nx-X11/extensions/shmstr.h
usr/include/*/nx-X11/extensions/syncstr.h
usr/include/*/nx-X11/extensions/Xdbeproto.h
debian/rules
View file @ 1cd7e35c
......@@ -56,7 +56,6 @@ override_dh_auto_build:
override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg
dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg
dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg
......
nx-X11/config/cf/README
View file @ 1cd7e35c
......@@ -183,7 +183,6 @@ X11.tmpl provides defaults for the following variables:
ConnectionFlags -D's for supported transports
ContribDir location of user-contributed sources
DebugLibX11 build libX11_d.a
DebugLibXext build libXext_d.a
DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path
DefaultRGBDatabase default server rgb color database
......@@ -215,11 +214,9 @@ X11.tmpl provides defaults for the following variables:
NeedDefaultDepLibs boolean for enabling default DEPLIBS
NlsDir directory in which to install nls files
NormalLibX11 build libX11.a
NormalLibXext build libXext.a
OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName
PrimaryScreenResolution resolution of default server screen
ProfileLibX11 build libX11_p.a
ProfileLibXext build libXext_p.a
ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't
SHELLPATH -D for /bin/sh
......@@ -229,7 +226,6 @@ X11.tmpl provides defaults for the following variables:
ServerOSDefines OS -D's for server
ServerAssertDefines -DNDEBUG for no assertions, /**/ for assertions
SharedLibX11 boolean for making sharable libX11.so
SharedLibXext boolean for making sharable libXext.so
ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files
UseCCMakeDepend boolean for using alternate makedepend script
......
nx-X11/config/cf/X11.tmpl
View file @ 1cd7e35c
......@@ -150,9 +150,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildLoadableXlibXcursor
#define BuildLoadableXlibXcursor (HasDlopen && SharedLibX11)
#endif
#ifndef BuildXextLib
#define BuildXextLib BuildLibraries
#endif
#ifndef BuildTestExt
#define BuildTestExt YES
#endif
......@@ -1194,31 +1191,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
DEPXLIBONLY = $(DEPXONLYLIB)
XLIBONLY = $(XONLYLIB)
LINTXONLYLIB = $(LINTXONLY)
#ifndef SharedLibXext
#define SharedLibXext HasSharedLibraries
#endif
#ifndef NormalLibXext
#define NormalLibXext (!SharedLibXext | ForceNormalLib)
#endif
#ifndef DebugLibXext
#define DebugLibXext NO /* debugged Xext library */
#endif
#ifndef ProfileLibXext
#define ProfileLibXext NO /* profiled Xext library */
#endif
XEXTLIBSRC = $(LIBSRC)/Xext
#if SharedLibXext
#ifndef SharedXextRev
#define SharedXextRev 6.4
#endif
SharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
#else
ProjectUnsharedLibReferences(EXTENSION,NX_Xext,$(XEXTLIBSRC),XBuildLibDir)
#endif
LINTEXTENSIONLIB = $(LINTEXTENSION)
DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
XLIB = $(EXTENSIONLIB) $(XONLYLIB)
LINTXLIB = $(LINTXONLYLIB)
#if HasMotif
......
nx-X11/include/extensions/Imakefile
View file @ 1cd7e35c
......@@ -55,10 +55,9 @@ EXTRAHEADERS = \
$(XRESHEADERS) \
$(NULL)
HEADERS = Xext.h \
HEADERS = \
xcmiscstr.h \
bigreqstr.h \
extutil.h \
XI.h XInput.h XIproto.h \
xtestconst.h xtestext1.h xteststr.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
......
nx-X11/include/extensions/Xext.h deleted 100644 → 0
View file @ e78c5bc3
/*
* $Xorg: Xext.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
*
Copyright 1989, 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.
*/
/* $XFree86: xc/include/extensions/Xext.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
#ifndef _XEXT_H_
#define _XEXT_H_
#include <nx-X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
extern int (*XSetExtensionErrorHandler(
int (*handler)(
Display *,
char *,
char *
)
))(
Display *,
char *,
char *
);
extern int XMissingExtension(
Display* /* dpy */,
_Xconst char* /* ext_name */
);
_XFUNCPROTOEND
#define X_EXTENSION_UNKNOWN "unknown"
#define X_EXTENSION_MISSING "missing"
#endif /* _XEXT_H_ */
nx-X11/include/extensions/extutil.h deleted 100644 → 0
View file @ e78c5bc3
/*
* $Xorg: extutil.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
*
Copyright 1989, 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.
*
* Author: Jim Fulton, MIT The Open Group
*
* Xlib Extension-Writing Utilities
*
* This package contains utilities for writing the client API for various
* protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
* ARE SUBJECT TO CHANGE!
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.9 2001/12/14 19:53:28 dawes Exp $ */
#ifndef _EXTUTIL_H_
#define _EXTUTIL_H_
#include <nx-X11/extensions/Xext.h>
/*
* We need to keep a list of open displays since the Xlib display list isn't
* public. We also have to per-display info in a separate block since it isn't
* stored directly in the Display structure.
*/
typedef struct _XExtDisplayInfo {
struct _XExtDisplayInfo *next; /* keep a linked list */
Display *display; /* which display this is */
XExtCodes *codes; /* the extension protocol codes */
XPointer data; /* extra data for extension to use */
} XExtDisplayInfo;
typedef struct _XExtensionInfo {
XExtDisplayInfo *head; /* start of list */
XExtDisplayInfo *cur; /* most recently used */
int ndisplays; /* number of displays */
} XExtensionInfo;
typedef struct _XExtensionHooks {
int (*create_gc)(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
);
int (*copy_gc)(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
);
int (*flush_gc)(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
);
int (*free_gc)(
Display* /* display */,
GC /* gc */,
XExtCodes* /* codes */
);
int (*create_font)(
Display* /* display */,
XFontStruct* /* fs */,
XExtCodes* /* codes */
);
int (*free_font)(
Display* /* display */,
XFontStruct* /* fs */,
XExtCodes* /* codes */
);
int (*close_display)(
Display* /* display */,
XExtCodes* /* codes */
);
Bool (*wire_to_event)(
Display* /* display */,
XEvent* /* re */,
xEvent* /* event */
);
Status (*event_to_wire)(
Display* /* display */,
XEvent* /* re */,
xEvent* /* event */
);
int (*error)(
Display* /* display */,
xError* /* err */,
XExtCodes* /* codes */,
int* /* ret_code */
);
char *(*error_string)(
Display* /* display */,
int /* code */,
XExtCodes* /* codes */,
char* /* buffer */,
int /* nbytes */
);
} XExtensionHooks;
extern XExtensionInfo *XextCreateExtension(
void
);
extern void XextDestroyExtension(
XExtensionInfo* /* info */
);
extern XExtDisplayInfo *XextAddDisplay(
XExtensionInfo* /* extinfo */,
Display* /* dpy */,
char* /* ext_name */,
XExtensionHooks* /* hooks */,
int /* nevents */,
XPointer /* data */
);
extern int XextRemoveDisplay(
XExtensionInfo* /* extinfo */,
Display* /* dpy */
);
extern XExtDisplayInfo *XextFindDisplay(
XExtensionInfo* /* extinfo */,
Display* /* dpy */
);
#define XextHasExtension(i) ((i) && ((i)->codes))
#define XextCheckExtension(dpy,i,name,val) \
if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; }
#define XextSimpleCheckExtension(dpy,i,name) \
if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; }
/*
* helper macros to generate code that is common to all extensions; caller
* should prefix it with static if extension source is in one file; this
* could be a utility function, but have to stack 6 unused arguments for
* something that is called many, many times would be bad.
*/
#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
XExtDisplayInfo *proc (Display *dpy) \
{ \
XExtDisplayInfo *dpyinfo; \
if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \
if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \
dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \
return dpyinfo; \
}
#define XEXT_FIND_DISPLAY_PROTO(proc) \
XExtDisplayInfo *proc(Display *dpy)
#define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \
int proc (Display *dpy, XExtCodes *codes) \
{ \
return XextRemoveDisplay (extinfo, dpy); \
}
#define XEXT_CLOSE_DISPLAY_PROTO(proc) \
int proc(Display *dpy, XExtCodes *codes)
#define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \
char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
{ \
code -= codes->first_error; \
if (code >= 0 && code < nerr) { \
char tmp[256]; \
sprintf (tmp, "%s.%d", extname, code); \
XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
return buf; \
} \
return (char *)0; \
}
#define XEXT_ERROR_STRING_PROTO(proc) \
char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
#endif
nx-X11/lib/Imakefile
View file @ 1cd7e35c
......@@ -19,14 +19,8 @@ XKBLIBDIR = xkbfile
X11LIBDIR = X11
#endif
#if BuildXextLib
XEXTLIBDIR = Xext
#endif
LINTSUBDIRS = \
$(X11LIBDIR) \
$(XEXTLIBDIR) \
$(XKBLIBDIR) \
$(NULL)
......
nx-X11/lib/Xext/Imakefile deleted 100644 → 0
View file @ e78c5bc3
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:50 cpqbld Exp $
XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.12 2002/10/16 00:37:27 dawes Exp $
NULL =
#define DoNormalLib NormalLibXext
#define DoSharedLib SharedLibXext
#define DoExtraLib SharedLibXext
#define DoDebugLib DebugLibXext
#define DoProfileLib ProfileLibXext
#define LibName NX_Xext
#define SoRev SOXEXTREV
#define LibHeaders NO
#include <Threads.tmpl>
#ifdef SharedXextReqs
REQUIREDLIBS = SharedXextReqs
#endif
#if Malloc0ReturnsNull
ALLOC_DEFINES = Malloc0ReturnsNullDefines
#endif
DEFINES = $(ALLOC_DEFINES)
INCLUDES = -I$(XLIBSRC)
SRCS = globals.c \
extutil.c \
$(NULL)
OBJS = globals.o \
extutil.o \
$(NULL)
LINTLIBS = $(LINTXLIB)
#include <Library.tmpl>
DependTarget()
nx-X11/lib/Xext/extutil.c deleted 100644 → 0
View file @ e78c5bc3
/*
* $Xorg: extutil.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $
*
Copyright 1989, 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.
*
* Author: Jim Fulton, MIT X Consortium
*
*
* Xlib Extension-Writing Utilities
*
* This package contains utilities for writing the client API for various
* protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
* ARE SUBJECT TO CHANGE!
*
* Routines include:
*
* XextCreateExtension called once per extension
* XextDestroyExtension if no longer using extension
* XextAddDisplay add another display
* XextRemoveDisplay remove a display
* XextFindDisplay is a display open
*
* In addition, the following Xlib-style interfaces are provided:
*
* XSetExtensionErrorHandler establish an extension error handler
* XMissingExtension raise an error about missing ext
*/
/* $XFree86: xc/lib/Xext/extutil.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <nx-X11/Xlibint.h>
#include <nx-X11/extensions/Xext.h>
#include <nx-X11/extensions/extutil.h>
/*
* XextCreateExtension - return an extension descriptor containing context
* information for this extension. This object is passed to all Xext
* routines.
*/
XExtensionInfo *XextCreateExtension (void)
{
register XExtensionInfo *info =
(XExtensionInfo *) Xmalloc (sizeof (XExtensionInfo));
if (info) {
info->head = NULL;
info->cur = NULL;
info->ndisplays = 0;
}
return info;
}
/*
* XextDestroyExtension - free memory the given extension descriptor
*/
void XextDestroyExtension (XExtensionInfo *info)
{
info->head = NULL; /* to catch refs after this */
info->cur = NULL;
info->ndisplays = 0;
XFree ((char *) info);
}
/*
* XextAddDisplay - add a display to this extension
*/
XExtDisplayInfo *XextAddDisplay (
XExtensionInfo *extinfo,
Display *dpy,
char *ext_name,
XExtensionHooks *hooks,
int nevents,
XPointer data)
{
XExtDisplayInfo *dpyinfo;
dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
if (!dpyinfo) return NULL;
dpyinfo->display = dpy;
dpyinfo->data = data;
dpyinfo->codes = XInitExtension (dpy, ext_name);
/*
* if the server has the extension, then we can initialize the
* appropriate function vectors
*/
if (dpyinfo->codes) {
int i, j;
for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) {
XESetWireToEvent (dpy, j, hooks->wire_to_event);
XESetEventToWire (dpy, j, hooks->event_to_wire);
}
if (hooks->create_gc)
XESetCreateGC (dpy, dpyinfo->codes->extension, hooks->create_gc);
if (hooks->copy_gc)
XESetCopyGC (dpy, dpyinfo->codes->extension, hooks->copy_gc);
if (hooks->flush_gc)
XESetFlushGC (dpy, dpyinfo->codes->extension, hooks->flush_gc);
if (hooks->free_gc)
XESetFreeGC (dpy, dpyinfo->codes->extension, hooks->free_gc);
if (hooks->create_font)
XESetCreateFont (dpy, dpyinfo->codes->extension, hooks->create_font);
if (hooks->free_font)
XESetFreeFont (dpy, dpyinfo->codes->extension, hooks->free_font);
if (hooks->close_display)
XESetCloseDisplay (dpy, dpyinfo->codes->extension,
hooks->close_display);
if (hooks->error)
XESetError (dpy, dpyinfo->codes->extension, hooks->error);
if (hooks->error_string)
XESetErrorString (dpy, dpyinfo->codes->extension,
hooks->error_string);
} else if (hooks->close_display) {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
* hook on so that the "cache" (extinfo->cur) is properly cleaned.
* (XBUG 7955)
*/
XExtCodes *codes = XAddExtension(dpy);
if (!codes) {
XFree(dpyinfo);
return NULL;
}
XESetCloseDisplay (dpy, codes->extension, hooks->close_display);
}
/*
* now, chain it onto the list
*/
_XLockMutex(_Xglobal_lock);
dpyinfo->next = extinfo->head;
extinfo->head = dpyinfo;
extinfo->cur = dpyinfo;
extinfo->ndisplays++;
_XUnlockMutex(_Xglobal_lock);
return dpyinfo;
}
/*
* XextRemoveDisplay - remove the indicated display from the extension object
*/
int XextRemoveDisplay (XExtensionInfo *extinfo, Display *dpy)
{
XExtDisplayInfo *dpyinfo, *prev;
/*
* locate this display and its back link so that it can be removed
*/
_XLockMutex(_Xglobal_lock);
prev = NULL;
for (dpyinfo = extinfo->head; dpyinfo; dpyinfo = dpyinfo->next) {
if (dpyinfo->display == dpy) break;
prev = dpyinfo;
}
if (!dpyinfo) {
_XUnlockMutex(_Xglobal_lock);
return 0; /* hmm, actually an error */
}
/*
* remove the display from the list; handles going to zero
*/
if (prev)
prev->next = dpyinfo->next;
else
extinfo->head = dpyinfo->next;
extinfo->ndisplays--;
if (dpyinfo == extinfo->cur) extinfo->cur = NULL; /* flush cache */
_XUnlockMutex(_Xglobal_lock);
Xfree ((char *) dpyinfo);
return 1;
}
/*
* XextFindDisplay - look for a display in this extension; keeps a cache
* of the most-recently used for efficiency.
*/
XExtDisplayInfo *XextFindDisplay (XExtensionInfo *extinfo, Display *dpy)
{
register XExtDisplayInfo *dpyinfo;
/*
* see if this was the most recently accessed display
*/
if ((dpyinfo = extinfo->cur)&& dpyinfo->display == dpy) return dpyinfo;
/*
* look for display in list
*/
_XLockMutex(_Xglobal_lock);
for (dpyinfo = extinfo->head; dpyinfo; dpyinfo = dpyinfo->next) {
if (dpyinfo->display == dpy) {
extinfo->cur = dpyinfo; /* cache most recently used */
_XUnlockMutex(_Xglobal_lock);
return dpyinfo;
}
}
_XUnlockMutex(_Xglobal_lock);
return NULL;
}
static int _default_exterror (Display *dpy, char *ext_name, char *reason)
{
fprintf (stderr, "Xlib: extension \"%s\" %s on display \"%s\".\n",
ext_name, reason, DisplayString(dpy));
return 0;
}
/*
* XSetExtensionErrorHandler - sets the handler that gets called when a
* requested extension is referenced. This should eventually move into Xlib.
*/
extern int (*_XExtensionErrorFunction)();
int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))()
{
int (*oldhandler)() = _XExtensionErrorFunction;
_XExtensionErrorFunction = (handler ? handler :
_default_exterror);
return oldhandler;
}
/*
* XMissingExtension - call the extension error handler
*/
int XMissingExtension (Display *dpy, _Xconst char *ext_name)
{
int (*func)() = (_XExtensionErrorFunction ?
_XExtensionErrorFunction : _default_exterror);
if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
return (*func) (dpy, ext_name, X_EXTENSION_MISSING);
}
nx-X11/lib/Xext/globals.c deleted 100644 → 0
View file @ e78c5bc3
/* $Xorg: globals.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */
/*
Copyright 1989, 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.
*/
/* $XFree86: xc/lib/Xext/globals.c,v 3.4 2001/07/29 05:01:12 tsi Exp $ */
/*
* This file should contain only those objects which must be predefined.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xlib.h>
#include <nx-X11/extensions/Xext.h>
#include <stddef.h> /* for definition of NULL */
/*
* If possible, it is useful to have the global data default to a null value.
* Some shared library implementations are *much* happier if there isn't any
* global initialized data.
*/
#ifdef NULL_NOT_ZERO /* then need to initialize */
#define SetZero(t,var,z) t var = z
#else
#define SetZero(t,var,z) t var
#endif
#ifdef ATTSHAREDLIB /* then need extra variables */
/*
* If we need to define extra variables for each global
*/
#if !defined(UNIXCPP) || defined(ANSICPP)
#define ZEROINIT(t,var,val) SetZero(t,var,val); \
SetZero (long, _libX_##var##Flag, 0); \
SetZero (void *, _libX_##var##Ptr, NULL)
#else /* else pcc concatenation */
#define ZEROINIT(t,var,val) SetZero(t,var,val); \
SetZero (long, _libX_/**/var/**/Flag, 0); \
SetZero (void *, _libX_/**/var/**/Ptr, NULL)
#endif /* concat ANSI C vs. pcc */
#else /* else not ATTSHAREDLIB */
/*
* no extra crud
*/
#define ZEROINIT(t,var,val) SetZero (t, var, val)
#endif /* ATTSHAREDLIB */
/*
* Error handlers; used to be in XlibInt.c
*/
typedef int (*funcptr)();
ZEROINIT (funcptr, _XExtensionErrorFunction, NULL);
/*
* NOTE: any additional external definition NEED
* to be inserted BELOW this point!!!
*/
/*
* NOTE: any additional external definition NEED
* to be inserted ABOVE this point!!!
*/
nx-X11/programs/Xserver/Imakefile
View file @ 1cd7e35c
......@@ -429,7 +429,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
-lNX_X11 -lNX_Xext -Xext
-lNX_X11 -lXext
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp \
-L../../../nx-X11/exports/lib \
......@@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXdmcp \
-lNX_X11 -lNX_Xext -lXext
-lNX_X11 -lXext
#else
NXAGENTNXLIBS = -L ../../../nxcomp \
-L../../../nx-X11/exports/lib \
......@@ -445,7 +445,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp \
-lXcomp \
-lXcompext -lXcompshad \
-lXrender -lXfixes -lXfont -lXcomposite -lXinerama -lXdmcp \
-lNX_X11 -lNX_Xext -lXext
-lNX_X11 -lXext
#endif
#endif
......@@ -478,7 +478,7 @@ nxagent_static_nolibs: nxagent
else exit 0; fi
$(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \
$(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \
$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_Xext -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS)
$(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS)
#endif /* NXAgentServer */
#if defined(NXWinServer) && NXWinServer
......
nx-X11/programs/Xserver/hw/nxagent/Render.c
View file @ 1cd7e35c
......@@ -44,7 +44,7 @@
#undef Pixmap
#include "region.h"
#include "extutil.h"
#include <X11/extensions/extutil.h>
#include "Display.h"
#include "Pixmaps.h"
......
nx-libs.spec
View file @ 1cd7e35c
......@@ -154,44 +154,6 @@ stream connection.
This package contains all necessary include files and libraries
needed to develop applications that require these.
%package -n libNX_Xext-devel
Group: Development/Libraries
Summary: Development files for the NX Common Extensions library
Requires: libNX_Xext6%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
%description -n libNX_Xext-devel
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 NX_Xext library contains only one X11 extension:
- The MIT Shared Memory extension (MIT-SHM/Xshm)
This package contains all necessary include files and libraries
needed to develop applications that require these.
%package -n libNX_Xext6
Group: System Environment/Libraries
Summary: Common extensions to the NX protocol
Requires: %{name}%{?_isa} >= 3.5.0.29
Obsoletes: libNX_Xext
%description -n libNX_Xext6
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 NX_Xext library contains only one X11 extension:
- The MIT Shared Memory extension (MIT-SHM/Xshm)
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.
%package -n libXcomp-devel
Group: Development/Libraries
Summary: Development files for the NX differential compression library
......@@ -255,7 +217,6 @@ Group: Development/Libraries
Summary: Development files for the NX session shadowing library
Requires: libXcompshad3%{?_isa} = %{version}-%{release}
Requires: libNX_X11-devel%{?_isa} = %{version}-%{release}
Requires: libNX_Xext-devel%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
......@@ -285,7 +246,6 @@ This package provides the session shadowing library.
Group: Development/Libraries
Summary: Include files and libraries for NX development
Requires: libNX_X11-devel%{?_isa} = %{version}-%{release}
Requires: libNX_Xext-devel%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
......@@ -428,13 +388,11 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%post -p /sbin/ldconfig
%post -n libNX_X11-6 -p /sbin/ldconfig
%post -n libNX_Xext6 -p /sbin/ldconfig
%post -n libXcomp3 -p /sbin/ldconfig
%post -n libXcompext3 -p /sbin/ldconfig
%post -n libXcompshad3 -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun -n libNX_X11-6 -p /sbin/ldconfig
%postun -n libNX_Xext6 -p /sbin/ldconfig
%postun -n libXcomp3 -p /sbin/ldconfig
%postun -n libXcompext3 -p /sbin/ldconfig
%postun -n libXcompshad3 -p /sbin/ldconfig
......@@ -468,18 +426,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_includedir}/nx-X11/Xutil.h
%{_includedir}/nx-X11/cursorfont.h
%files -n libNX_Xext-devel
%defattr(-,root,root)
%{_libdir}/libNX_Xext.so
%dir %{_includedir}/nx-X11/extensions
%{_includedir}/nx-X11/extensions/XShm.h
%{_includedir}/nx-X11/extensions/Xext.h
%{_includedir}/nx-X11/extensions/extutil.h
%files -n libNX_Xext6
%defattr(-,root,root)
%{_libdir}/libNX_Xext.so.6*
%files -n libXcomp-devel
%defattr(-,root,root)
%_libdir/libXcomp.so
......@@ -572,7 +518,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_includedir}/nx-X11/extensions/render.h
%{_includedir}/nx-X11/extensions/renderproto.h
%{_includedir}/nx-X11/extensions/securstr.h
%{_includedir}/nx-X11/extensions/shmstr.h
%{_includedir}/nx-X11/extensions/syncstr.h
%{_includedir}/nx-X11/extensions/xcmiscstr.h
%{_includedir}/nx-X11/extensions/xf86bigfont.h
......
nxcompshad/Makefile.in
View file @ 1cd7e35c
......@@ -153,7 +153,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
else
EXTRALIBS = -lNX_Xext -lXtst -lXrandr -lXdamage
EXTRALIBS = -lXext -lXtst -lXrandr -lXdamage
all: depend $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
......
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