| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
include/extensions: Xag.h, Xagsrv.h, Xagstr.h
Xserver/Xext: appgroup.c, appgroup.h
lib/Xext: XAppgroup.c
include/extensions: Xcup.h, Xcupstr.h,
Xserver/Xext: cup.c
lib/Xext: cup.c
include/extensions: Xdbe.h
Xserver/Xext: Xdbe.c
Xserver/Xext: dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h
include/extensions: Xevie.h, Xeviestr.h
include/extensions: XEVI.h, XEVIstr.h
Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c
lib/Xext: XEVI.c
include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h
Xserver/Xext: fontcache.c
include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h
lib/Xext: XLbx.c
include/extensions: multibuf.h, multibufst.h
lib/Xext: XMultibuf.c
Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c
include/extensions: xf86vmode.h, xf86vmstr.h
Xserver/Xext: vidmodeproc.h, xf86vmode.c
lib/Xext: MITMisc.c
Xserver/Xext: mitmisc.c
Xserver/Xext: xf86misc.c, xf86miscproc.h
Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c
include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
Fixes: ArcticaProject/nx-libs#116
X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01
Plus: Drop various Imake'ish defines where not needed anymore.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In the process of building nxagent against more and more system-wide installed
X.org libraries, we come to the limit of including structs from this (bundled
nx-X11) and that (system-wide X.Org) library.
This commit introduces a clear namespace separation of headers provided by
nx-X11 and headers provided by X.Org. This approach is only temporary as we
want to drop all nx-X11 bundled libraries from nx-libs.
However, for a while we need to make this separation clear and also ship
some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
symbols at the same time.
This patch has been tested on Debian jessie and unstable and requires no
overall testing on various distros and distro versions, as we finally will
drop all libNX_X* libraries and build against X.org's client libs.
For now, this hack eases our development / cleanup process.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch).
We really want to make use of rpm's automatic dependency finding.
Binaries are scanned for DT_NEEDED entries, the latter of which are
then used for populating the "Requires"-type deps. The "nxagent"
binary for example would require libX11.so.6. That incurs problems:
1. A package manager told to install nxagent could select xorg-x11
rather than nx-libs, even though nxagent depends on the NX version.
2. A package manager told to install $some_program could select nx-libs
rather than xorg-x11 (since both provide libX11.so.6), but, since
the NX library is in an obscure directory, running $some_program
would fail as libX11.so.6 is not found.
To solve this, give the NX libraries unique names different from the
Xorg ones.
|
