aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/drop-really-old-X10-API-code' into 3.6.xMike Gabriel2016-07-0116-1310/+0
|\ | | | | | | | | Attributes GH PR #148: https://github.com/ArcticaProject/nx-libs/pull/148 Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 03:12:26 -0700
| * nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent.Mike Gabriel2016-07-0116-1310/+0
|/
* Merge branch 'sunweaver-pr/properly-apply-optflags-at-buildtime' into 3.6.xMike Gabriel2016-07-0113-85/+62
|\ | | | | | | | | Attributes GH PR #149: https://github.com/ArcticaProject/nx-libs/pull/149 Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 02:02:49 -0700
| * OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the ↵Mike Gabriel2016-07-0113-85/+62
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
* debian/libnx-x11-6.symbols: Update symbols (added: _XEatDataWords@Base ↵Mike Gabriel2016-06-301-0/+2
| | | | 3.5.99.0, _XGetRequest@Base 3.5.99.0).
* Merge branch 'sunweaver-pr/drop-embedded-imake-and-makedepend' into 3.6.xMike Gabriel2016-06-3028-8306/+12
|\ | | | | | | | | Attributes GH PR #146: https://github.com/ArcticaProject/nx-libs/pull/146 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Thu, 30 Jun 2016 06:30:46 -0700
| * nx-X11/Makefile: Drop build support for World.Win32 and World.OS2. Not our ↵Mike Gabriel2016-06-301-49/+0
| | | | | | | | target platforms.
| * nx-X11/config/{imake,makedepend}: Use system-wide available imake and ↵Mike Gabriel2016-06-3028-8257/+12
|/ | | | makedepend tools.
* Merge branch 'sunweaver-pr/backport-xgetrequest-and-xeatdatawords' into 3.6.xMike Gabriel2016-06-302-29/+75
|\ | | | | | | Attributes GH PR #170: https://github.com/ArcticaProject/nx-libs/pull/170
| * Port _XEatDataWordsUlrich Sibiller2016-06-302-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required for successful linking of libXrender against libNX_X11. Port from libXfixes commit b031e3b60fa1af9e49449f23d4a84395868be3ab We need this here to enable linking of current libXrender against libNX_X11 instead of the system's libX11 The original implementation of this function (libX11 commit 9f5d83706543696fc944c1835a403938c06f2cc5) uses xcb stuff which we do not have in libNX_X11. So we take a workaround from another lib. This workaround had been added temporarily to a couple of X extension libs, see e.g. https://lists.x.org/archives/xorg-devel/2013-July/036763.html.
| * Backport of _XGetRequest()Ulrich Sibiller2016-06-302-29/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | To enable linking of a current libXrender libNX_X11 needs that symbol. This is a (manual) backport of the following upstream libX11 commit available at https://cgit.freedesktop.org/xorg/lib/libX11/commit/src/XlibInt.c?id=4a060f993bf676cf21ad9784e010f54134da7b40: Commit: 4a060f993bf676cf21ad9784e010f54134da7b40 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon, 17 Oct 2011 09:45:15 +1000 Subject: Add _XGetRequest as substitute for GetReq/GetReqExtra
* | Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.xMike Gabriel2016-06-2921-245/+46
|\| | | | | | | | | Attributes GH PR #145: https://github.com/ArcticaProject/nx-libs/pull/145 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Wed, 29 Jun 2016 11:22:30 +0200
| * Makefile,debian/*,nx-libs.spec,<misc>: Drop references to X2Go Project, esp. ↵Mike Gabriel2016-06-2921-245/+46
|/ | | | | | | | | | | | drop x2goagent. The x2goagent package is being replaced by an x2goserver bin:package named x2goserver-x2goagent. This x2goserver-x2goagent bin:package will be maintained in the X2Go Project's namespace and basically wraps around nxagent. Furthermore, declare Arctica Project as upstream source for nx-libs.
* Merge branch 'sunweaver-pr/libnx-xext-drop-unused-extensions' into 3.6.xMike Gabriel2016-06-2913-2965/+141
|\ | | | | | | | | Attributes GH PR #121: https://github.com/ArcticaProject/nx-libs/pull/121 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Wed, 29 Jun 2016 00:45:43 -0700
| * libNX_Xext: Drop unused extensions: DPMS, XTestExt1, XSync, XSecurity.Mike Gabriel2016-06-2810-2949/+99
| |
| * nx-X11/lib/Xext/Imakefile: Serialize parameters and make Imakefile changes ↵Mike Gabriel2016-06-281-10/+22
| | | | | | | | more trackable.
| * fix wrong bin:package for Xext proto headers: Move dpmsstr.h and securstr.h ↵Mike Gabriel2016-06-284-4/+5
| | | | | | | | from Xext devel package into proto header package.
| * Fix linking order hack in nxagent.Mike Gabriel2016-06-281-10/+23
|/ | | | | We have to make sure that all X.org libraries we link against use symbols provided by libNX_X11.
* test scripts: Add run-nxagent test script.Mike Gabriel2016-06-271-0/+140
|
* Merge branch ↵Mihai Moldovan2016-06-2562-26144/+1064
|\ | | | | | | | | | | 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
| * hw/nxagent: Drop code referring to the following removed Xserver extensions: ↵Mike Gabriel2016-06-254-93/+0
| | | | | | | | XAPPGROUP, LBX, XEVIE.
| * hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the ↵Mike Gabriel2016-06-252-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corresponding code section in files included from "somewhere" in nx-X11/programs/Xserver/. (1) In file included from NXrender.c:44:0: ../../mi/../render/render.c: In function ‘swapStops’: ../../mi/../render/render.c:2541:13: warning: variable ‘colors’ set but not used [-Wunused-but-set-variable] CARD16 *colors; ^ (2) In file included from NXevents.c:133:0: ../../dix/events.c: In function ‘ReinitializeRootWindow’: ../../dix/events.c:2046:15: warning: unused variable ‘pScreen’ [-Wunused-variable] ScreenPtr pScreen = win->drawable.pScreen; ^ ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’: ../../dix/events.c:2177:15: warning: variable ‘pScreen’ set but not used [-Wunused-but-set-variable] ScreenPtr pScreen = pWin->drawable.pScreen; ^ In file included from NXevents.c:133:0: ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’: ../../dix/events.c:2191:2: error: ‘pScreen’ undeclared (first use in this function) pScreen = pWin->drawable.pScreen; ^ (3) In file included from NXdixfonts.c:77:0: ../../dix/dixfonts.c: In function ‘GetFontPath’: ../../dix/dixfonts.c:1890:2: warning: return makes pointer from integer without a cast return BadAlloc; ^
| * hw/nxagent/NXdixfonts.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-1463/+29
| | | | | | | | identically be found in dix/dixfonts.c. Also remove NX'ish code from dix/dixfonts.c.
| * hw/nxagent/NXdispatch.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-3342/+38
| | | | | | | | identically be found in dix/dispatch.c.
| * hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-326/+8
| | | | | | | | identically be found in dix/property.c.
| * hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be ↵Mike Gabriel2016-06-253-964/+16
| | | | | | | | found in Xext/shm.c.
| * hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-2079/+10
| | | | | | | | be found in Xext/xvdisp.c.
| * hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-4549/+143
| | | | | | | | be found in dix/events.c.
| * hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-394/+10
| | | | | | | | be found in render/glyph.c.
| * hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-71/+5
| | | | | | | | identically be found in dix/glyphcurs.c.
| * hw/nxagent/NXrender.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-2191/+65
| | | | | | | | | | | | be found in render/render.c. Fixes ArcticaProject/nx-libs#37
| * hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files ↵Mike Gabriel2016-06-2513-837/+147
| | | | | | | | in nxagent's code base. Rather replace structures we need modified only.
| * NXrenderint.h: Move into subfolder X11/include/ and rename to ↵Mike Gabriel2016-06-252-2/+2
| | | | | | | | Xrender_nxagent.h. (Like we have done with all other non-public Xlib related header files that are required for building nxagent.
| * hw/nxagent/NXresource.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-644/+10
| | | | | | | | identically be found in dix/resource.c.
| * Xserver/dix/window.c: Don't reintroduce build warnings with previous commit ↵Mike Gabriel2016-06-251-14/+0
| | | | | | | | due to now-unnecessary assignements of pScreen pointers.
| * hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-3028/+60
| | | | | | | | be found in dix/window.c.
| * hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-382/+17
| | | | | | | | be found in GL/glx/glxext.c.
| * Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile changes ↵Mike Gabriel2016-06-251-23/+82
| | | | | | | | more trackable.
| * hw/nxagent/NXpicture.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-1692/+54
| | | | | | | | identically be found in render/picture.c.
| * hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-249/+19
| | | | | | | | identically be found in mi/miexpose.c.
| * hw/nxagent/Pixmaps.h: Make RESTYPE well-defined by adding resource.h to ↵Mike Gabriel2016-06-251-0/+1
| | | | | | | | includes.
| * Xserver/mi/Imakefile: Serialize parameters and make Imakefile changes more ↵Mike Gabriel2016-06-251-31/+98
| | | | | | | | trackable.
| * hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be identically found ↵Mike Gabriel2016-06-253-87/+5
| | | | | | | | in render/miglyph.c.
| * hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-122/+22
| | | | | | | | be found in render/mitrap.c.
| * hw/nxagent/NXmiwindow.c: Drop complete file.Mike Gabriel2016-06-254-1215/+19
| | | | | | | | | | | | | | | | | | | | Reasoning: (1) The diff between this file and mi/miwindow.c is so minimal, we simply apply the change to mi/miwindow.c. (2) In recent X.org, the fixed code has gone, so this patch won't exist after having rebased nx-libs against X.org.
| * hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-1894/+47
| | | | | | | | be found in miext/damage/damage.c.
| * NXcomposite.h: Move fake header file NXcomposite.h to ↵Mike Gabriel2016-06-253-74/+107
| | | | | | | | hw/nxagent/X11/include/ and drop all symbols that are not explicitly used by nxagent.
| * Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of ↵Mike Gabriel2016-06-252-64/+0
| | | | | | | | nx-X11/include/extensions/composite.h.
| * hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is ↵Mike Gabriel2016-06-253-327/+15
| | | | | | | | indentically found in dix/extension.c.
| * Xserver/dix/Imakefile: Serialize parameters and make Imakefile changes more ↵Mike Gabriel2016-06-251-16/+66
|/ | | | trackable.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 02:40:34 +0000