aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nxcomp: remove unused Utils.cppUlrich Sibiller2016-11-021-43/+0
|
* Imake: drop DoLoadableServer, MakeDllModules and IHaveModulesUlrich Sibiller2016-11-0242-2109/+2
| | | | | | We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds.
* Remove extmod from nx-X11/programs/Xserver/Xext/.Mike Gabriel2016-11-0217-365/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Jul 10 02:03:13 2012 +0100 Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:06 2012 +0100 Move Xv and XvMC from extmod to built-in Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:05 2012 +0100 Move XRes from extmod to built-in Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:04 2012 +0100 Move DPMS from extmod to built-in Always build DPMS support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:03 2012 +0100 Move MIT-SCREEN-SAVER from extmod to built-in If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile
* Merge branch 'uli42-pr/add_libX11_links' into 3.6.xMike Gabriel2016-11-021-0/+30
|\ | | | | | | Attributes GH PR #248: https://github.com/ArcticaProject/nx-libs/pull/248
| * libX11/Imakefile: handle libX11 linksUlrich Sibiller2016-11-021-0/+27
| | | | | | | | | | | | | | | | | | | | Create libX11* link in exports/lib. This simplifies running nxagent from the build directory. This also adds a clean rule to remove the libX11 links as well as the libNX_X11 links which was not done before. Fixes ArcticaProject/nx-libs#234
| * libX11/Imakefile: add missing dependencies on ks_tables.hUlrich Sibiller2016-11-021-0/+3
|/
* Merge branch 'sunweaver-pr/clean-up-old-vcs-comments' into 3.6.xMike Gabriel2016-10-3170-227/+2
|\ | | | | | | Attributes GH PR #254: https://github.com/ArcticaProject/nx-libs/pull/254
| * Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times ↵Mike Gabriel2016-10-3170-227/+2
|/ | | | | | of X.org and XFree86. Fixes ArcticaProject/nx-libs#250.
* Merge branch 'sunweaver-pr/drop-mfb-maskbits-h' into 3.6.xMike Gabriel2016-10-305-946/+33
|\ | | | | | | Attributes GH PR #266: https://github.com/ArcticaProject/nx-libs/pull/266
| * Xserver/Imakefile: Drop references to already removed afb code.Mike Gabriel2016-10-301-2/+1
| |
| * Xserver/Imakefile: Drop all references to building already removed cfb* ↵Mike Gabriel2016-10-301-71/+3
| | | | | | | | implementations.
| * Death to mfb (removing last remnants from NX code).Adam Jackson2016-10-304-874/+15
| | | | | | | | | | | | | | | | | | | | | | | | commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c Author: Adam Jackson <ajax@redhat.com> Date: Fri Jun 13 10:35:07 2008 -0400 Death to mfb. Anyone still interested in 1 or 4 bpp framebuffers, talk to fb. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Disinfect mi/ of mfb.Adam Jackson2016-10-301-2/+17
|/ | | | | | | | | | commit 748cfbc820f8cdeb544c54a6db495fecf2e2457b Author: Adam Jackson <ajax@aspartame.nwnk.net> Date: Sat Nov 17 21:23:05 2007 -0500 Disinfect mi/ of mfb. Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/drop-nxlibint-h' into 3.6.xMike Gabriel2016-10-305-45/+2
|\ | | | | | | Attributes GH PR #258: https://github.com/ArcticaProject/nx-libs/pull/258
| * nxcompext: Drop (nowadays) no-op file NXlibint.h.Mike Gabriel2016-10-305-45/+2
|/ | | | Fixes ArcticaProject/nx-libs#255.
* Merge branch 'uli42-misc_fixes' into 3.6.xMike Gabriel2016-10-303-19/+2
|\ | | | | | | Attributes GH PR #260: https://github.com/ArcticaProject/nx-libs/pull/260
| * nxagent.keyboard: add quotesUlrich Sibiller2016-10-301-1/+1
| |
| * Imakefile: remove references to non-existing subdirsUlrich Sibiller2016-10-301-11/+1
| |
| * saver.c: fix unused variable warningsUlrich Sibiller2016-10-301-7/+0
|/
* Merge branch 'sunweaver-pr/build-includes-robustness' into 3.6.xMike Gabriel2016-10-291-2/+2
|\ | | | | | | | | Attributes GH PR #247: https://github.com/ArcticaProject/nx-libs/pull/247 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri, 28 Oct 2016 15:29:43 -0700
| * Imake.rules: Make BuildIncludes{,Top}() more robust in case people attempt ↵Mike Gabriel2016-10-291-2/+2
|/ | | | | | | providing path names instead of file names via srclist. Fixes ArcticaProject/nx-libs#223. Fixes ArcticaProject/nx-libs#244.
* Merge branch 'uli42-pr/remove_xf86' into 3.6.xMike Gabriel2016-10-2911-3041/+3
|\ | | | | | | Attirbutes GH PR #249: https://github.com/ArcticaProject/nx-libs/pull/249
| * remove hw/xfree86 altogetherUlrich Sibiller2016-10-294-2942/+0
| | | | | | | | This is part one of ArcticaProject/nx-libs#246
| * remove xf86Version.h and xf86Date.hUlrich Sibiller2016-10-298-99/+3
|/ | | | version.def and date.def also will be no longer created
* debian/patches: Rebase 102_xserver-xext_set-securitypolicy-path.debian.patch.Mike Gabriel2016-10-281-1/+1
|
* Merge branch 'theqvd-slave-channel' into 3.6.xMike Gabriel2016-10-285-34/+170
|\ | | | | | | Attributes GH PR #232: https://github.com/ArcticaProject/nx-libs/pull/232
| * Add description of NX_SLAVE_CMD to man and helpVadim Troshchinskiy2016-10-282-0/+14
| |
| * Slave channel implementationVadim Troshchinskiy2016-10-283-34/+156
|/ | | | | | | | When enabled and a connection is made to the port, launches the process specified in NX_SLAVE_CMD on the other side, and connects stdin and stdout to the socket. This is used for VM/client and client/VM communication.
* Merge branch 'uli42-pr/backup_memleak' into arctica-3.6.xMihai Moldovan2016-10-281-0/+2
|\ | | | | | | Attributes GH PR #242: https://github.com/ArcticaProject/nx-libs/pull/242
| * Plug a memory leakEmilio Pozuelo Monfort2016-10-271-0/+2
|/ | | | | | | | This was introduced in 8ea762f. Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Emilio Pozuelo Monfort <pochu@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* debian/rules: Re-enable (+pie) hardening flags again when building .deb ↵Mike Gabriel2016-10-201-1/+1
| | | | packages.
* Merge branch 'uli42-pr/fix_compile_warnings' into 3.6.xMike Gabriel2016-10-2038-101/+95
|\ | | | | | | Attributes GH PR #230: https://github.com/ArcticaProject/nx-libs/pull/230
| * sendexev.c: Fix return of unitialized variableUlrich Sibiller2016-10-201-3/+7
| | | | | | | | | | Well, kinda fix. Upstream handles that differently here, we need a thorough check! Add another FIXME comment because of this.
| * xfixes: Remove unused variable.Cyril Brulebois2016-10-201-2/+0
| | | | | | | | | | | | | | | | | | The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Cyril Brulebois <kibi@debian.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Remove useless line of code that contained a bug and triggered a gcc ↵Benjamin Herrenschmidt2016-10-201-2/+0
| | | | | | | | warning. This variable will be overriden before being used anyway. (Bugzilla #5595)
| * dix: fix cast from pointer to integerJulien Cristau2016-10-201-1/+1
| |
| * dbe: Call to DDX SwapBuffers requires address of int, not unsigned int ↵Keith Packard2016-10-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CVE-2014-8097 pt. 2] When the local types used to walk the DBE request were changed, this changed the type of the parameter passed to the DDX SwapBuffers API, but there wasn't a matching change in the API definition. At this point, with the API frozen, I just stuck a new variable in with the correct type. Because we've already bounds-checked nStuff to be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will fit in a signed int without overflow. Signed-off-by: Keith Packard <keithp@keithp.com Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * LRGB.c: Fix label defined but not usedUlrich Sibiller2016-10-201-3/+0
| | | | | | | | | | | | | | LRGB.c: In function ‘LINEAR_RGB_InitSCCData’: LRGB.c:798:1: warning: label ‘FreeBlueTblElements’ defined but not used [-Wunused-label] FreeBlueTblElements: ^
| * Fixes: warning: variable 'req' set but not,usedwalter harms2016-10-2017-18/+18
| | | | | | | | | | | | | | | | | | | | Fixes: warning: variable 'req' set but not used [-Wunused-but-set-variable] by marking req _X_UNUSED Solution was discussed on xorg-devel ML Peter Hutter, Alan Coopersmith Re: [PATCH libX11 3/5] fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign] Signed-off-by: harms wharms@bfs.de
| * fix: warning: pointer targets in passing argument 2 of '_XSend' differ in ↵walter harms2016-10-201-2/+2
| | | | | | | | | | | | | | signedness [-Wpointer-sign] fix signess warning by casting Signed-off-by: walter harms <wharms@bfs.de>
| * no need to check args for Xfree()walter harms2016-10-201-41/+33
| | | | | | | | | | | | simplify code Signed-off-by: walter harms <wharms@bfs.de>
| * remove stray externwalter harms2016-10-201-1/+1
| | | | | | | | | | | | remove stray extern Signed-off-by: walter harms <wharms@bfs.de>
| * Fix warnings in XlibInt.cUlrich Sibiller2016-10-202-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: ‘noreturn’ function does return [enabled by default] } After fixing the above a new warning came up, which is also fixed now: XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: control reaches end of non-void function [-Wreturn-type] }
| * xkb.c: fix 'assignment makes integer from pointer without a cast'Ulrich Sibiller2016-10-201-1/+1
| | | | | | | | | | | | xkb.c: In function ‘_GetCountedString’: xkb.c:4405:8: warning: assignment makes integer from pointer without a cast [enabled by default] len= (CARD16 *)wire;
| * xkmread.c: use _X_UNUSED to avoid compiler warning when result is not neededUlrich Sibiller2016-10-201-4/+7
| |
| * xcmisc.c: remove HAVE_STDINTUlrich Sibiller2016-10-201-4/+0
| | | | | | | | | | This eliminates a warning since we do not have this define in our build environment.
| * security.c: fix compiler warningsUlrich Sibiller2016-10-201-2/+1
| |
| * Loop.cpp: Fix output of SetCore()Ulrich Sibiller2016-10-201-3/+3
| |
| * Window.c: Fix function assignment warningUlrich Sibiller2016-10-201-1/+1
| | | | | | | | | | | | Window.c: In function ‘nxagentFrameBufferPaintWindow’: Window.c:1968:31: warning: ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic] PaintWindowBackgroundBackup = pWin->drawable.pScreen -> PaintWindowBackground;
| * Display.c: remove unused variableUlrich Sibiller2016-10-201-2/+0
| | | | | | | | | | | | | | Display.c: In function ‘nxagentCheckForPixmapFormatsCompatibility’: Display.c:2471:8: warning: variable ‘one_match’ set but not used [-Wunused-but-set-variable] bool one_match = false; ^