Skip to content

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

library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage…

library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826).
parent dba779d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 1062 deletions
debian/control
View file @ 06aa4167
......@@ -17,6 +17,7 @@ Build-Depends:
libxpm-dev,
libxfont-dev,
libxdmcp-dev,
libxdamage-dev,
autoconf,
pkg-config,
x11proto-core-dev,
......@@ -283,20 +284,16 @@ Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11 (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 damaged region extension library
Description: nx-X11 damaged region extension library (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_Xdamage provides an X Window System client interface to the DAMAGE
extension to the X protocol.
This package removes the obsoleted libNX_Xdamage.so.1 library. With
recent versions of NX, the system-wide installed libXdamage gets used.
.
The Damage extension provides for notification of when on-screen regions have
been 'damaged' (altered)
This package can be safely removed.
Package: libnx-xdamage-dev
Provides: libnx-xdamage1-dev
......@@ -304,23 +301,17 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libnx-xdamage1 (= ${binary:Version}),
nx-x11proto-damage-dev (= ${binary:Version}),
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 damaged region extension library (development headers)
Description: nx-X11 damaged region extension library (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_Xdamage provides an X Window System client interface to the DAMAGE
extension to the X protocol.
.
The Damage extension provides for notification of when on-screen regions have
been 'damaged' (altered)
This package removes the obsoleted headers for the libNX_Xdamage.so.1
library. With recent versions of NX, the system-wide installed libXdamage
gets used.
.
This package contains the development headers for this library.
This package can be safely removed.
Package: nx-x11proto-damage-dev
Section: libdevel
......@@ -328,16 +319,16 @@ Architecture: any
Multi-Arch: same
Depends:
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 Damage extension wire protocol
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 provides development headers describing the wire protocol
for the Damage extension in nx-X11, used to notify clients of changes
made to particular areas.
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-xdamage1-dbg
Architecture: any
......@@ -345,22 +336,18 @@ Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
Depends:
libnx-xdamage1 (= ${binary:Version}),
${misc:Depends},
Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-0x2go2~),
Description: nx-X11 damaged region extension library (debug package)
Description: nx-X11 damaged region extension library (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_Xdamage provides an X Window System client interface to the DAMAGE
extension to the X protocol.
.
The Damage extension provides for notification of when on-screen regions have
been 'damaged' (altered)
This package removes the obsoleted debug symbols 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: libnx-xdmcp6
Architecture: any
......
debian/libnx-xdamage-dev.install.in deleted 100644 → 0
View file @ dba779d9
usr/lib/*/libNX_Xdamage.so
usr/include/*/nx/X11/extensions/Xdamage.h
debian/libnx-xdamage1.install.in deleted 100644 → 0
View file @ dba779d9
usr/lib/*/libNX_Xdamage.so.*
debian/libnx-xdamage1.symbols deleted 100644 → 0
View file @ dba779d9
libNX_Xdamage.so.1 libnx-xdamage1 #MINVER#
XDamageCreate@Base 3.5.0.29
XDamageDestroy@Base 3.5.0.29
XDamageExtensionInfo@Base 3.5.0.29
XDamageExtensionName@Base 3.5.0.29
XDamageFindDisplay@Base 3.5.0.29
XDamageQueryExtension@Base 3.5.0.29
XDamageQueryVersion@Base 3.5.0.29
XDamageSubtract@Base 3.5.0.29
debian/nx-x11proto-damage-dev.install.in deleted 100644 → 0
View file @ dba779d9
usr/include/*/nx/X11/extensions/damageproto.h
usr/include/*/nx/X11/extensions/damagewire.h
\ No newline at end of file
debian/rules
View file @ 06aa4167
......@@ -81,7 +81,6 @@ override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
dh_strip -plibnx-xcomposite1 --dbg-package=libnx-xcomposite1-dbg
dh_strip -plibnx-xdamage1 --dbg-package=libnx-xdamage1-dbg
dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
dh_strip -plibnx-xfixes3 --dbg-package=libnx-xfixes3-dbg
dh_strip -plibnx-xinerama1 --dbg-package=libnx-xinerama1-dbg
......
nx-X11/config/cf/X11.tmpl
View file @ 06aa4167
......@@ -339,16 +339,12 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildDamage
#define BuildDamage BuildXfixes
#endif
#ifndef BuildDamageLibrary
#define BuildDamageLibrary !BuildServersOnly
#endif
#ifndef BuildComposite
#define BuildComposite (BuildXfixes && BuildDamage)
#endif
#ifndef BuildCompositeLibrary
#define BuildCompositeLibrary !BuildServersOnly && (BuildXfixesLibrary && \
BuildDamageLibrary)
#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary
#endif
#ifndef BuildXevie
......@@ -1581,30 +1577,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXfixes NO
#endif
#if BuildDamageLibrary
#ifndef SharedLibXdamage
#define SharedLibXdamage HasSharedLibraries
#endif
#ifndef NormalLibXdamage
#define NormalLibXdamage (!SharedLibXdamage || ForceNormalLib)
#endif
#ifndef DebugLibXdamage
#define DebugLibXdamage NO
#endif
#ifndef ProfileLibXdamage
#define ProfileLibXdamage NO
#endif
#else
#undef SharedLibXdamage
#define SharedLibXdamage NO
#undef NormalLibXdamage
#define NormalLibXdamage NO
#undef DebugLibXdamage
#define DebugLibXdamage NO
#undef ProfileLibXdamage
#define ProfileLibXdamage NO
#endif
#if BuildCompositeLibrary
#ifndef SharedLibXcomposite
#define SharedLibXcomposite HasSharedLibraries
......@@ -1801,16 +1773,6 @@ SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev
ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
#endif
XDAMAGELIBSRC = $(LIBSRC)/Xdamage
#if SharedLibXdamage
#ifndef SharedXdamageRev
#define SharedXdamageRev 1.0
#endif
SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
#else
ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
#endif
XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
#if SharedLibXcomposite
#ifndef SharedXcompositeRev
......
nx-X11/config/cf/host.def
View file @ 06aa4167
......@@ -123,8 +123,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildLibraries YES
#endif
#define BuildDamageLibrary YES
#define BuildXfixesLibrary YES
#define BuildCompositeLibrary YES
......
nx-X11/include/extensions/Imakefile
View file @ 06aa4167
......@@ -47,9 +47,6 @@ RENDERHEADERS = render.h renderproto.h
#if BuildXfixes || BuildXfixesLibrary
XFIXESHEADERS = xfixeswire.h xfixesproto.h
#endif
#if BuildDamage || BuildDamageLibrary
DAMAGEHEADERS = damagewire.h damageproto.h
#endif
#if BuildComposite || BuildCompositeLibrary
COMPOSITEHEADERS = composite.h compositeproto.h
#endif
......@@ -82,7 +79,6 @@ EXTRAHEADERS = \
$(RENDERHEADERS) \
$(RANDRHEADERS) \
$(XFIXESHEADERS) \
$(DAMAGEHEADERS) \
$(COMPOSITEHEADERS) \
$(XEVIEHEADERS) \
$(XTRAPHEADERS) \
......
nx-X11/include/extensions/damageproto.h deleted 100644 → 0
View file @ dba779d9
/*
* $Id: damageproto.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $
*
* Copyright © 2003 Keith Packard
*
* 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, and that the name of Keith Packard not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Keith Packard makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _DAMAGEPROTO_H_
#define _DAMAGEPROTO_H_
#include <X11/Xmd.h>
#include <X11/extensions/xfixesproto.h>
#include <X11/extensions/damagewire.h>
#define Window CARD32
#define Drawable CARD32
#define Font CARD32
#define Pixmap CARD32
#define Cursor CARD32
#define Colormap CARD32
#define GContext CARD32
#define Atom CARD32
#define VisualID CARD32
#define Time CARD32
#define KeyCode CARD8
#define KeySym CARD32
#define Picture CARD32
#define Region CARD32
#define Damage CARD32
/************** Version 0 ******************/
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
CARD16 length B16;
} xDamageReq;
/*
* requests and replies
*/
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
CARD16 length B16;
CARD32 majorVersion B32;
CARD32 minorVersion B32;
} xDamageQueryVersionReq;
#define sz_xDamageQueryVersionReq 12
typedef struct {
BYTE type; /* X_Reply */
BYTE pad1;
CARD16 sequenceNumber B16;
CARD32 length B32;
CARD32 majorVersion B32;
CARD32 minorVersion B32;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
} xDamageQueryVersionReply;
#define sz_xDamageQueryVersionReply 32
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
CARD16 length B16;
Damage damage B32;
Drawable drawable B32;
CARD8 level;
CARD8 pad1;
CARD16 pad2 B16;
} xDamageCreateReq;
#define sz_xDamageCreateReq 16
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
CARD16 length B16;
Damage damage B32;
} xDamageDestroyReq;
#define sz_xDamageDestroyReq 8
typedef struct {
CARD8 reqType;
CARD8 damageReqType;
CARD16 length B16;
Damage damage B32;
Region repair B32;
Region parts B32;
} xDamageSubtractReq;
#define sz_xDamageSubtractReq 16
/* Events */
#define DamageNotifyMore 0x80
typedef struct {
CARD8 type;
CARD8 level;
CARD16 sequenceNumber B16;
Drawable drawable B32;
Damage damage B32;
Time timestamp B32;
xRectangle area;
xRectangle geometry;
} xDamageNotifyEvent;
#undef Damage
#undef Region
#undef Picture
#undef Window
#undef Drawable
#undef Font
#undef Pixmap
#undef Cursor
#undef Colormap
#undef GContext
#undef Atom
#undef VisualID
#undef Time
#undef KeyCode
#undef KeySym
#endif /* _DAMAGEPROTO_H_ */
nx-X11/include/extensions/damagewire.h deleted 100644 → 0
View file @ dba779d9
/*
* $Id: damagewire.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $
*
* Copyright © 2003 Keith Packard
*
* 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, and that the name of Keith Packard not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Keith Packard makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _DAMAGEWIRE_H_
#define _DAMAGEWIRE_H_
#define DAMAGE_NAME "DAMAGE"
#define DAMAGE_MAJOR 1
#define DAMAGE_MINOR 0
/************* Version 1 ****************/
/* Constants */
#define XDamageReportRawRectangles 0
#define XDamageReportDeltaRectangles 1
#define XDamageReportBoundingBox 2
#define XDamageReportNonEmpty 3
/* Requests */
#define X_DamageQueryVersion 0
#define X_DamageCreate 1
#define X_DamageDestroy 2
#define X_DamageSubtract 3
#define XDamageNumberRequests (X_DamageSubtract + 1)
/* Events */
#define XDamageNotify 0
#define XDamageNumberEvents (XDamageNotify + 1)
/* Errors */
#define BadDamage 0
#define XDamageNumberErrors (BadDamage + 1)
#endif /* _DAMAGEWIRE_H_ */
nx-X11/lib/Imakefile
View file @ 06aa4167
......@@ -59,10 +59,6 @@ RANDRLIBDIR = Xrandr
XFIXESLIBDIR = Xfixes
#endif
#if BuildDamageLibrary
DAMAGELIBDIR = Xdamage
#endif
#if BuildCompositeLibrary
COMPOSITELIBDIR = Xcomposite
#endif
......@@ -110,7 +106,6 @@ LINTSUBDIRS = \
$(RANDRLIBDIR) \
$(XRESLIBDIR) \
$(XFIXESLIBDIR) \
$(DAMAGELIBDIR) \
$(COMPOSITELIBDIR) \
$(NULL)
......
nx-X11/lib/Xdamage/COPYING deleted 100644 → 0
View file @ dba779d9
$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $
Copyright © 2001,2003 Keith Packard
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, and that the name of Keith Packard not be used in
advertising or publicity pertaining to distribution of the software without
specific, written prior permission. Keith Packard makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
nx-X11/lib/Xdamage/ChangeLog deleted 100644 → 0
View file @ dba779d9
Tue May 17 12:59:47 2005 Søren Sandmann <sandmann@redhat.com>
* Xdamage.c: Conditionally include config.h
2004-02-03 Jim Gettys <jg@freedesktop.org>
* AUTHORS: Add authors.
2004-01-15 Daniel Stone <daniel@fooishbar.org>
* Tag release 1.0.1 for first freedesktop.org clientside lib release.
2004-01-15 Harold L Hunt II <huntharo@msu.edu>
* Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
nx-X11/lib/Xdamage/INSTALL deleted 100644 → 0
View file @ dba779d9
Render is built with the traditional configure script:
$ ./configure --prefix=/usr/X11R6
This should generate valid Makefiles, then:
$ make
$ make install
nx-X11/lib/Xdamage/Imakefile deleted 100644 → 0
View file @ dba779d9
XCOMM $XdotOrg: xc/lib/Xdamage/Imakefile,v 1.1 2004/07/31 05:50:39 anholt Exp $
#ifndef NormalLibXdamage
#define NormalLibXdamage YES
SOXDAMAGEREV=1.0.1
#endif
#ifndef SharedLibXdamage
#define SharedLibXdamage YES
#endif
#define DoNormalLib NormalLibXdamage
#define DoSharedLib SharedLibXdamage
#define DoDebugLib DebugLibXdamage
#define DoProfileLib ProfileLibXdamage
#define LibName NX_Xdamage
#define SoRev SOXDAMAGEREV
#define IncSubdir X11
#define IncSubSubdir extensions
#include <Threads.tmpl>
#ifdef SharedXdamageReqs
REQUIREDLIBS = SharedXdamageReqs
#endif
XDAMAGE_VERSION=1.0.1
X_LIBS=-L$(SHLIBDIR) $(XONLYLIB)
X_CFLAGS=-I$(INCROOT) $(THREADS_DEFINES)
XDAMAGE_LIBS = $(XFIXESLIB)
XDAMAGE_CFLAGS =
RPATH_CFLAG = HardCodeLibdirFlag
SRCS = Xdamage.c
OBJS = Xdamage.o
HEADERS = Xdamage.h
SUBSTVARS=prefix="$(PROJECTROOT)" \
exec_prefix="$(BINDIR)" \
libdir="$(USRLIBDIR)" \
hardcode_libdir_flag_spec="$(RPATH_CFLAG)" \
includedir="$(INCROOT)" \
X_LIBS="$(X_LIBS)" \
X_CFLAGS="$(X_CFLAGS)" \
XDAMAGE_LIBS="$(XDAMAGE_LIBS)" \
XDAMAGE_CFLAGS="$(XDAMAGE_CFLAGS)" \
VERSION="$(XDAMAGE_VERSION)"
#include <Library.tmpl>
DependTarget()
all:: xdamage.pc
xdamage.pc: xdamage.pc.in
RemoveFile($@)
sh ../Xrender/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
clean::
RemoveFile(xdamage.pc)
nx-X11/lib/Xdamage/README deleted 100644 → 0
View file @ dba779d9
RandR
X RandR Extension
Version 1.0
2002-10-4
This package contains header files and documentation for the X RandR
extension. Library and server implementations are separate.
Keith Packard
keithp@keithp.com
nx-X11/lib/Xdamage/Xdamage.h deleted 100644 → 0
View file @ dba779d9
/*
* $Id: Xdamage.h,v 1.3 2005/07/03 07:00:56 daniels Exp $
*
* Copyright © 2003 Keith Packard
*
* 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, and that the name of Keith Packard not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Keith Packard makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _XDAMAGE_H_
#define _XDAMAGE_H_
#include <X11/extensions/damagewire.h>
#include <X11/extensions/Xfixes.h>
#include <X11/Xfuncproto.h>
typedef XID Damage;
typedef struct {
int type; /* event base */
unsigned long serial;
Bool send_event;
Display *display;
Drawable drawable;
Damage damage;
int level;
Bool more; /* more events will be delivered immediately */
Time timestamp;
XRectangle area;
XRectangle geometry;
} XDamageNotifyEvent;
_XFUNCPROTOBEGIN
Bool XDamageQueryExtension (Display *dpy, int *event_basep, int *error_basep);
Status XDamageQueryVersion (Display *dpy,
int *major_versionp,
int *minor_versionp);
Damage
XDamageCreate (Display *dpy, Drawable drawable, int level);
void
XDamageDestroy (Display *dpy, Damage damage);
void
XDamageSubtract (Display *dpy, Damage damage,
XserverRegion repair, XserverRegion parts);
_XFUNCPROTOEND
#endif /* _XDAMAGE_H_ */
nx-X11/lib/Xdamage/autogen.sh deleted 100755 → 0
View file @ dba779d9
#! /bin/sh
autoreconf -v --install || exit 1
./configure --enable-maintainer-mode "$@"
nx-X11/lib/Xdamage/configure.ac deleted 100644 → 0
View file @ dba779d9
dnl
dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation, and that the name of Keith Packard not be used in
dnl advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Keith Packard makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
dnl
dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
dnl
dnl Version should match the current XFixes version. XFixesQueryVersion
dnl returns the version from xfixeswire.h, NOT the version we set here. But we
dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n
dnl
AC_INIT(libXdamage, 1.0.1, [keithp@keithp.com], libXdamage)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR(.)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
# Check for X
PKG_CHECK_MODULES(X, x11,
[x_found_with_pkgconfig=yes],
[x_found_with_pkgconfig=no])
if test "$x_found_with_pkgconfig" = "no"
then
AC_PATH_XTRA
X_LIBS="$X_LIBS -lX11"
if test "x$no_x" = "xyes"
then
AC_MSG_ERROR([X is required, but it was either disabled or not found.])
fi
save_LIBS="$LIBS"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
AC_MSG_CHECKING([for XTHREADS in Xlib])
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
[[return XInitThreads() == 0 ? 0 : 1;]])],
[xthreads=no],
[xthreads=yes],
[xthreads=yes])
AC_MSG_RESULT($xthreads)
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
if test "x$xthreads" = "xyes"
then
X_CFLAGS="$X_CFLAGS -DXTHREADS"
fi
fi
# Check damageext configuration, strip extra digits from package version to
# find the required protocol version
DAMAGEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
PKG_CHECK_MODULES(XDAMAGE, [damageext >= $DAMAGEEXT_VERSION] xfixes)
AC_OUTPUT([Makefile
xdamage.pc])
nx-X11/lib/Xdamage/xdamage.pc.in deleted 100644 → 0
View file @ dba779d9
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: Xdamage
Description: X Damage Library
Version: @VERSION@
Cflags: -I${includedir} @XDAMAGE_CFLAGS@ @X_CFLAGS@
Libs: -L${libdir} -lNX_Xdamage @XDAMAGE_LIBS@ @X_LIBS@
nx-X11/lib/Xdamage/xdamageint.h deleted 100644 → 0
View file @ dba779d9
/*
* $Id: xdamageint.h,v 1.2 2005/07/03 07:00:56 daniels Exp $
*
* Copyright © 2003 Keith Packard
*
* 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, and that the name of Keith Packard not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Keith Packard makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _XDAMAGEINT_H_
#define _XDAMAGEINT_H_
#define NEED_EVENTS
#define NEED_REPLIES
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/damageproto.h>
#include "Xdamage.h"
typedef struct _XDamageExtDisplayInfo {
struct _XDamageExtDisplayInfo *next; /* keep a linked list */
Display *display; /* which display this is */
XExtCodes *codes; /* the extension protocol codes */
int major_version; /* -1 means we don't know */
int minor_version; /* -1 means we don't know */
} XDamageExtDisplayInfo;
/* replaces XExtensionInfo */
typedef struct _XDamageExtInfo {
XDamageExtDisplayInfo *head; /* start of the list */
XDamageExtDisplayInfo *cur; /* most recently used */
int ndisplays; /* number of displays */
} XDamageExtInfo;
extern XDamageExtInfo XDamageExtensionInfo;
extern const char XDamageExtensionName[];
XDamageExtDisplayInfo *
XDamageFindDisplay (Display *dpy);
#define XDamageHasExtension(i) ((i) && ((i)->codes))
#define XDamageCheckExtension(dpy,i,val) \
if (!XDamageHasExtension(i)) { return val; }
#define XDamageSimpleCheckExtension(dpy,i) \
if (!XDamageHasExtension(i)) { return; }
#endif /* _XDAMAGEINT_H_ */
nx-X11/programs/Xserver/Imakefile
View file @ 06aa4167
......@@ -427,7 +427,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lrt -L/usr/sfw/lib -lNX_Xrender -lNX_Xfixes -lXfont \
-L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lXdmcp \
-L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lXdmcp \
`pkg-config --libs libxml-2.0`
#elif defined(cygwinArchitecture)
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
......@@ -437,7 +437,7 @@ NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext \
#else
NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -L ../../../nxcompshad \
-lXcomp -lXcompext -lXcompshad -lNX_Xrender -lNX_X11 -lNX_Xext -lNX_Xfixes -lXfont \
-L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xdamage -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \
-L../../../nx-X11/exports/lib -lNX_Xtst -lNX_Xrandr -lNX_Xcomposite -lNX_Xinerama -lXdmcp \
`pkg-config --libs libxml-2.0`
#endif
......
nx-libs.spec
View file @ 06aa4167
......@@ -34,6 +34,7 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xfont)
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xdamage)
%else
BuildRequires: libexpat-devel
BuildRequires: libpng-devel
......@@ -43,6 +44,7 @@ BuildRequires: xorg-x11-libXext-devel
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libXfont-devel
BuildRequires: xorg-x11-libXdmcp-devel
BuildRequires: xorg-x11-libXdamage-devel
%endif
BuildRequires: xorg-x11-util-devel
%endif
......@@ -53,6 +55,7 @@ BuildRequires: libpng-devel
BuildRequires: libxml2-devel
BuildRequires: libXfont-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXdamage-devel
%endif
# For imake
......@@ -202,21 +205,6 @@ off-screen buffer can be automatically merged into the parent window
or merged by external programs, called compositing managers.
%package -n libNX_Xdamage1
Group: System Environment/Libraries
Summary: NX Damage Extension library
Requires: %{name}%{?_isa} >= 3.5.0.29
Obsoletes: libNX_Xdamage
%description -n libNX_Xdamage1
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 X Damage Extension allows applications to track modified regions
of drawables.
%package -n libNX_Xext-devel
Group: Development/Libraries
Summary: Development files for the NX Common Extensions library
......@@ -656,7 +644,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%post -n libNX_X11-6 -p /sbin/ldconfig
%post -n libNX_Xau6 -p /sbin/ldconfig
%post -n libNX_Xcomposite1 -p /sbin/ldconfig
%post -n libNX_Xdamage1 -p /sbin/ldconfig
%post -n libNX_Xext6 -p /sbin/ldconfig
%post -n libNX_Xfixes3 -p /sbin/ldconfig
%post -n libNX_Xinerama1 -p /sbin/ldconfig
......@@ -670,7 +657,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%postun -n libNX_X11-6 -p /sbin/ldconfig
%postun -n libNX_Xau6 -p /sbin/ldconfig
%postun -n libNX_Xcomposite1 -p /sbin/ldconfig
%postun -n libNX_Xdamage1 -p /sbin/ldconfig
%postun -n libNX_Xext6 -p /sbin/ldconfig
%postun -n libNX_Xfixes3 -p /sbin/ldconfig
%postun -n libNX_Xinerama1 -p /sbin/ldconfig
......@@ -728,10 +714,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%defattr(-,root,root)
%{_libdir}/libNX_Xcomposite.so.1*
%files -n libNX_Xdamage1
%defattr(-,root,root)
%{_libdir}/libNX_Xdamage.so.1*
%files -n libNX_Xext-devel
%defattr(-,root,root)
%{_libdir}/libNX_Xext.so
......@@ -850,7 +832,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%files devel
%defattr(-,root,root)
%{_libdir}/libNX_Xcomposite.so
%{_libdir}/libNX_Xdamage.so
%{_libdir}/libNX_Xinerama.so
%{_libdir}/libNX_Xrandr.so
%{_libdir}/libNX_Xtst.so
......@@ -859,7 +840,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%{_includedir}/nx/X11/extensions/XRes.h
%{_includedir}/nx/X11/extensions/XTest.h
%{_includedir}/nx/X11/extensions/Xcomposite.h
%{_includedir}/nx/X11/extensions/Xdamage.h
%{_includedir}/nx/X11/extensions/Xevie.h
%{_includedir}/nx/X11/extensions/Xinerama.h
%{_includedir}/nx/X11/extensions/Xrandr.h
......@@ -909,8 +889,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
%{_includedir}/nx/X11/extensions/bigreqstr.h
%{_includedir}/nx/X11/extensions/composite.h
%{_includedir}/nx/X11/extensions/compositeproto.h
%{_includedir}/nx/X11/extensions/damageproto.h
%{_includedir}/nx/X11/extensions/damagewire.h
%{_includedir}/nx/X11/extensions/panoramiXproto.h
%{_includedir}/nx/X11/extensions/randr.h
%{_includedir}/nx/X11/extensions/randrproto.h
......
nxcompshad/Makefile.in
View file @ 06aa4167
......@@ -148,7 +148,7 @@ all: depend $(LIBARCHIVE) $(LIBDLL)
else
EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -lNX_Xdamage
EXTRALIBS = -lNX_Xext -lNX_Xtst -lNX_Xrandr -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