aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* roll-tarball.sh: Make sure symlinked files are included in tarballs.Mike Gabriel2015-07-141-3/+15
| | | | | | | | | | As the system a tarball gets extracted on may potentially be unable to handle symlinks, we ship symlinks as files in the rolled tarball. By transforming symlinks into real files, we also assure that all VERSION files/symlinks get shipped in the tarballs. Fixes ArcticaProject/nx-libs#27
* nx-libs.spec: Install nxcomp{,ext,shad}.pc into the corresponding ↵Mike Gabriel2015-07-141-0/+3
| | | | development packages.
* debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file ↵Mike Gabriel2015-07-143-0/+3
| | | | into the corresponding development packages.
* nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it.Mike Gabriel2015-07-143-0/+3
|
* nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean.Mike Gabriel2015-07-143-3/+3
|
* Makefile: Also remove nxversion.def on distclean.Mike Gabriel2015-07-141-1/+1
|
* Merge branch 'uli42-pr/add_pkgconfig' into 3.6.xMike Gabriel2015-07-149-27/+86
|\ | | | | | | Attributes GH PR #62: https://github.com/ArcticaProject/nx-libs/pull/62
| * Add pkg-config support to nxcomp, nxcompext and nxcompshadUlrich Sibiller2015-07-129-27/+86
|/
* debian/changelog: sync with master/3.5.0.x branch.Mihai Moldovan2015-07-041-2/+77
|
* Merge branch 'uli42-pr/backported_fixes' into arctica-3.6.xMihai Moldovan2015-07-0338-45/+164
|\ | | | | | | Attributes GH PR #50: https://github.com/ArcticaProject/nx-libs/pull/50
| * Backport: xserver: Avoid sending uninitialized padding data over the networkPeter Åstrand2015-07-0232-5/+131
| | | | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Backport: Make RANDR 'set' timestamps follow client specified time. Bug 21987.Keith Packard2015-06-072-13/+2
| | | | | | | | | | | | | | | | The lastSetTime value which indicates when the configuration within the server was last changed was not getting set in the appropriate RandR requests. Signed-off-by: Keith Packard <keithp@keithp.com>
| * Backport: randr: Clean up compiler warnings about unused and shadowing variablesKeith Packard2015-06-073-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | set but not used variables shadowing a previous local A hidden problem was that the VERIFY_RR_* macros define local 'rc' variables, any other local definitions for those would be shadowed and generate warnings from gcc. I've renamed the other locals 'ret' instead of 'rc'. Signed-off-by: Keith Packard <keithp@keithp.com>
| * Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatchAaron Plattner2015-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both requests have the same size, so this is not a functional change, just a cosmetic one. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Keith Packard <keithp@keithp.com>
| * Backport: ProcRRGetScreenInfo: swap configTimestamp as wellAlan Coopersmith2015-06-071-0/+1
| | | | | | | | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@fooishbar.org>
| * Backport: RRModeCreate: plug memory leak of newModes if AddResource failsAlan Coopersmith2015-06-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by parfait 1.0: Error: Memory leak (CWE 401) Memory leak of pointer 'newModes' allocated with realloc(((char*)modes), ((num_modes + 1) * 8)) at line 93 of randr/rrmode.c in function 'RRModeCreate'. pointer allocated at line 82 with realloc(((char*)modes), ((num_modes + 1) * 8)). Error: Memory leak (CWE 401) Memory leak of pointer 'newModes' allocated with malloc(8) at line 93 of randr/rrmode.c in function 'RRModeCreate'. pointer allocated at line 84 with malloc(8). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com>
| * Backport: randr: fix server crash in RRGetScreenInfoJulien Cristau2015-06-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | We don't return rates to randr < 1.1 clients, so don't allocate space for them. This fixes a FatalError due to not all allocated space being used. X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> Reported-by: Guillaume Quintin <coincoin169g@gmail.com> Signed-off-by: Julien Cristau <jcristau@debian.org>
| * Backport: randr: check for virtual size limits before set crtcTiago Vignatti2015-06-071-0/+12
| | | | | | | | | | | | | | | | | | Return a error if the screen is configured to an invalid size. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
| * Backport: Free randr crtc and output pointer arraysKeith Packard2015-06-071-0/+2
| | | | | | | | | | | | | | | | All of the crts and outputs were freed, but not the arrays full of pointers to them. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| * Backport: Drop a reference to user mode after createKeith Packard2015-06-071-1/+2
| | | | | | | | | | User mode has no customer when create until assigned to some output.
| * Backport: Bug 51375: Xorg doesn't set status for RRGetOutputInfoJaroslav Šmíd2015-06-071-0/+1
| | | | | | | | | | | | | | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=51375 https://bugs.freedesktop.org/attachment.cgi?id=63397 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Tested-by: Daniel Stone <daniel@fooishbar.org>
* | Merge branch 'sunweaver-pr/no-autotools-cruft' into arctica-3.6.xMihai Moldovan2015-06-2931-1091/+0
|\ \ | | | | | | | | | Attributes GH PR #57: https://github.com/ArcticaProject/nx-libs/pull/57
| * | library clean-up: No autotools cruft in nx-libs.Mike Gabriel2015-06-2631-1091/+0
| | |
* | | debian/changelog: sync with master/3.5.0.x branch.Mihai Moldovan2015-06-291-0/+31
| | |
* | | Correct nxproxy manpage also: --help -> -helpMike DePaulo2015-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xorg-server does not follow the convention of using 2 dashes, and apparently nx-libs doesn't either. Note that --help does produce the help output. However, it produces this additional output after it: Error: NX transport initialization failed. Therefore, we should instruct users to call -help instead.
* | | Correct manpages: --help -> -helpMike DePaulo2015-06-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xorg-server does not follow the convention of using 2 dashes. Note that --help does produce the help output. However, it produces this additional output after it: Error: Aborting session with 'Unrecognized option: --help'. Session: Aborting session at 'Sun Jun 28 01:35:35 2015'. Session: Session aborted at 'Sun Jun 28 01:35:35 2015'. It also causes a return code of 1 rather than 0. Therefore, we should instruct users to call -help instead.
* | | doc/examples/run-nxproxy2nxproxy-test: Create NX_COOKIE dynamically using ↵Mike Gabriel2015-06-251-3/+4
| | | | | | | | | | | | the mcookie tool.
* | | Merge branch 'sunweaver-pr/roll-tarball-fixes' into arctica-3.6.xMihai Moldovan2015-06-232-64/+356
|\| | | | | | | | | | | Attributes GH PR #44: https://github.com/ArcticaProject/nx-libs/pull/44
| * | COPYING: Replace content with GPL-2 license text, because that is the ↵Mike Gabriel2015-06-231-56/+339
| | | | | | | | | | | | overall (i.e., strictest) license we have to deal with in nx-libs.
| * | debian/roll-tarball.sh: Auto-generate ChangeLog from Git history.Mike Gabriel2015-06-231-0/+1
| | |
| * | debian/roll-tarball.sh: Rename README.md to README.NX-Development before ↵Mike Gabriel2015-06-231-0/+3
| | | | | | | | | | | | moving it into doc/ folder.
| * | debian/roll-tarball.sh: Prevent several files/folders from ending up in ↵Mike Gabriel2015-06-231-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-libs-lite tarball. * bin/{nxagent,nxauth,x2goagent} * etc/ * doc/nx-X11_vs_XOrg69_patches * README.keystrokes" * nx-libs.spec
| * | debian/roll-tarball.sh: Support tarring up the HEAD of the current branch.Mike Gabriel2015-06-231-2/+2
| | |
| * | debian/roll-tarball.sh: Allow patch files names having a dash next to the ↵Mike Gabriel2015-06-231-2/+2
|/ / | | | | | | four digits (i.e., 1234-<patchname>.<suffix>).
* | Merge branch 'pr/anti-aliasing-rgba-crash' into 3.6.xMike Gabriel2015-06-231-3/+3
|\ \
| * | Fix alpha premultiplication in XRenderParseColor.Emanuele Giaquinta2015-06-231-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | Due to C arithmetic conversion rules we must use an unsigned constant (or a cast) to perform the multiplication using unsigned arithmetic. Fixes ArcticaProject/nx-libs#55. Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* | Merge branch 'sunweaver-pr/libXx86FOO-cleanup' into arctica-3.6.xMihai Moldovan2015-06-2318-4987/+3
|\ \ | | | | | | | | | Attributes GH PR #43: https://github.com/ArcticaProject/nx-libs/pull/43
| * | library clean-up: Drop libXx86{misc,vm,dga} libraries. Not needed by nx-libs.Mike Gabriel2015-06-2218-4987/+3
|/ /
* | Merge branch 'sunweaver-pr/libxf86rush-cleanup' into arctica-3.6.xMihai Moldovan2015-06-2212-792/+0
|\ \ | | | | | | | | | Attributes GH PR #42: https://github.com/ArcticaProject/nx-libs/pull/42
| * | library clean-up: Drop nx-X11/lib/Xxf86rush and references to libglide{2,3}. ↵Mike Gabriel2015-06-2112-792/+0
|/ / | | | | | | Unused in nx-libs.
* | Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.xMihai Moldovan2015-06-2116-2932/+14
|\ \ | | | | | | | | | Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41
| * | nx-X11/config/cf: Drop build-logic for all hardware drivers.Mike Gabriel2015-06-214-434/+0
| | |
| * | nx-X11/config/cf: Drop unnecessary xf86site.def, xf86.tmpl, xfree86.cf.Mike Gabriel2015-06-2113-2409/+14
| | |
| * | nx-X11/config/cf/Imakefile: Don't list non-present-anymore imake ↵Mike Gabriel2015-06-201-89/+0
|/ / | | | | | | configuration files.
* | libgl clean-up, fix-up commitMike Gabriel2015-06-201-1/+1
| |
* | README.md: typo fixMike DePaulo2015-06-201-1/+1
| |
* | Merge pull request #52 from woglinde/3.6.xMike Gabriel2015-06-2010-1027/+0
|\ \ | | | | | | Library clean-up: Drop libxkbui, has been built previously but none of its symbols have been used in NX.
| * | remove libxkbui, looks like it is not used anywhereHenning Heinold2015-06-2010-1027/+0
|/ /
* | debian/control: Add Breaks:/Replaces: for qvd-libxcomp3 and qvd-nxproxy.Mike Gabriel2015-06-191-2/+6
| |
* | Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.xMihai Moldovan2015-06-1673-4168/+59
|\ \ | | | | | | | | | Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40