aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/enhance-displayfd-auto-detection' into 3.6.xMihai Moldovan2017-04-202-2/+37
|\ | | | | | | Attributes GH PR #419: https://github.com/ArcticaProject/nx-libs/pull/419
| * man/nxagent.1: Document the nxagent specific usage pattern of the displayfd ↵Mike Gabriel2017-04-201-2/+17
| | | | | | | | cmdline option.
| * Xserver/os/connection.c: If -displayfd and an explicit display port number ↵Mike Gabriel2017-04-201-0/+11
| | | | | | | | are given, use the explicit display number as a starting point for auto-detecting the next available display number.
| * Xserver/os/connection.c: Accompany display number with some human-readable ↵Mike Gabriel2017-04-201-0/+9
|/ | | | (machine-parseable) text when -displayfd is set to STDERR.
* Merge branch 'uli42-pr/extend_manpage' into 3.6.xMike Gabriel2017-04-201-31/+40
|\ | | | | | | Attributes GH PR #431: https://github.com/ArcticaProject/nx-libs/pull/431
| * nxagent.1: some more rephrasingUlrich Sibiller2017-04-201-6/+6
| |
| * nxagent.1: fix: "tolerancechecks" was documented as "reconnectchecks"Ulrich Sibiller2017-04-201-2/+2
| |
| * nxagent.1: highlight nxagentUlrich Sibiller2017-04-201-17/+17
| |
| * nxagent.1: use nxagent everywhereUlrich Sibiller2017-04-201-13/+13
| | | | | | | | "nx-X11 Agent" looks and sounds ugly.
| * nxagent.1: rephrase descriptionUlrich Sibiller2017-04-201-2/+3
| |
| * nxagent.1: add -options, previously undocumentedUlrich Sibiller2017-04-201-3/+15
| |
| * nxagent.1: fix typoUlrich Sibiller2017-04-201-1/+1
| |
| * nxagent.1: remove no longer existing -co option from manpageUlrich Sibiller2017-04-201-4/+0
|/
* Xserver/GL/glx/glxext.c: Fix for previous commit, re-adding a comment ↵Mike Gabriel2017-04-191-0/+1
| | | | starter '/*'.
* Clearing comments from $XFree86$ (et al.) header lines.Mike Gabriel2017-04-1962-103/+1
|
* Merge branch 'Ionic-add-xkbcomp-dep' into 3.6.xMike Gabriel2017-04-182-7/+22
|\ | | | | | | Attributes GH PR #434: https://github.com/ArcticaProject/nx-libs/pull/434
| * nx-libs.spec: sync up RPM builds after Xext proto change in ↵Mihai Moldovan2017-04-181-6/+5
| | | | | | | | a51cb94559e9228a55e01956f242dabccc5e6b14.
| * {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM ↵Mihai Moldovan2017-04-182-0/+16
| | | | | | | | and DEB packages.
| * nx-libs.spec: whitespace only.Mihai Moldovan2017-04-181-1/+1
|/
* debian/control: Add get-orig-source rule as in official Debian package.Mike Gabriel2017-04-141-0/+3
|
* debian/{rules,nx-x11proto-xext-dev}: More Xext header files belong int ↵Mike Gabriel2017-04-142-11/+11
| | | | nx-x11proto-xext-dev (instead of removing them in debian/rules).
* debian/control: Pre-D (nx-x11-common) on versioned dpkg not required anymore.Mike Gabriel2017-04-141-2/+0
|
* debian/control: Pull-over latest changes on these files from the official ↵Mike Gabriel2017-04-141-38/+31
| | | | Debian package. Various improvements several package descriptions.
* debian/copyright{,in}: Pull-over latest changes on these files from the ↵Mike Gabriel2017-04-142-134/+437
| | | | official Debian package.
* Merge branch 'sunweaver-pr/enable-mit-screen-saver-extension' into 3.6.xMihai Moldovan2017-04-134-1/+24
|\ | | | | | | Attributes GH PR #421: https://github.com/ArcticaProject/nx-libs/pull/421
| * Xserver: Build nxagent with MIT-SCREEN-SAVER extension enabled.Mike Gabriel2017-04-134-1/+24
|/ | | | Fixes ArcticaProject/nx-libs#80
* Merge branch 'sunweaver-pr/Mesa-define-USE_IEEE-macro-for-more-platforms' ↵Mihai Moldovan2017-04-132-0/+17
|\ | | | | | | | | | | into 3.6.x Attributes GH PR #428: https://github.com/ArcticaProject/nx-libs/pull/428
| * Mesa.patches: Define USE_IEEE for __aarch64__ and __mc68000__, as well.Mike Gabriel2017-04-132-0/+17
|/
* nx-X11/config/cf: Clean-up left-overs from having our own libNX_Xext shared ↵Mike Gabriel2017-04-132-3/+0
| | | | library.
* Makefile: Make sure that 'make all' only calls 'make build' and _not_ the ↵Mike Gabriel2017-04-131-1/+2
| | | | global '%:' ruleset afterwards.
* Makefile: Remove nx-X11/config/cf/date.def on clean.Mike Gabriel2017-04-131-0/+1
|
* Makefile: Fix comment above special clean rules.Mike Gabriel2017-04-131-1/+1
|
* Merge branch 'sunweaver-pr/fix-ftbfs-on-linux-sparc64' into 3.6.xMihai Moldovan2017-04-131-1/+2
|\ | | | | | | Attributes GH PR #426: https://github.com/ArcticaProject/nx-libs/pull/426
| * nx-X11/config/cf/linux.cf: Fix FTBFS on Linux SPARC64 due to missing ↵Mike Gabriel2017-04-131-1/+2
|/ | | | -D_XSERVER64 definition.
* Merge branch 'sunweaver-pr/fix-ftbfs-on-aarch64' into 3.6.xMihai Moldovan2017-04-131-1/+1
|\ | | | | | | Attributes GH PR #425: https://github.com/ArcticaProject/nx-libs/pull/425
| * nx-X11/config/cf/linux.cf: Fix FTBFS on arm64 (aarch64) due to missing ↵Mike Gabriel2017-04-121-1/+1
|/ | | | -D_XSERVER64 definition.
* release 3.5.99.53.5.99.5Mike Gabriel2017-04-117-2051/+3235
|
* debian/patches: Update 016_nx-X11_install-location.debian.patch (due to ↵Mike Gabriel2017-04-101-2/+2
| | | | fuzziness).
* Regression fix for added libXfont2 API support:Mike Gabriel2017-04-109-24/+14
| | | | | | | | | | - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to Imake.tmpl. - Add FONT_DEFINES to ALLDEFINES. - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles again, FONT_DEFINES is now set "globally". - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv to make gccmakedep happy.
* Merge branch 'sunweaver-pr/createpixmap-alloc-hints-abi-change' into 3.6.xMihai Moldovan2017-04-1034-61/+109
|\ | | | | | | Attributes GH PR #410: https://github.com/ArcticaProject/nx-libs/pull/410
| * hw/nxagent/Pixmap.c et al.: Propagate usage_hint through ↵Mike Gabriel2017-04-105-17/+24
| | | | | | | | nxagentCreatePixmap, as well.
| * Mesa.patches: Adapt Mesa to CreatePixmap allocation hint ABI bump.Mike Gabriel2017-04-102-0/+14
| |
| * Save pixmap allocation hints into the PixmapRec.Aaron Plattner2017-04-104-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit f797c96845a3fab37cda6839ebecf9ac5401fd6e Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Nov 15 12:12:02 2007 -0800 Save pixmap allocation hints into the PixmapRec. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Add CreatePixmap allocation hints.Aaron Plattner2017-04-1026-42/+65
|/ | | | | | | | | | | | | | | | Backported from X.org: commit f2e310132fbe1520c1b5f3da4faa2d2d47835e72 Author: Aaron Plattner <aplattner@nvidia.com> Date: Wed Oct 31 14:15:35 2007 -0700 Add CreatePixmap allocation hints. These hints allow an acceleration architecture to optimize allocation of certain types of pixmaps, such as pixmaps that will serve as backing pixmaps for redirected windows. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.xMihai Moldovan2017-04-1029-56/+821
|\ | | | | | | Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
| * nx-libs.spec: Prefer libXfont2-devel on RPM distro versions that have it.~Mike Gabriel2017-04-101-0/+8
| |
| * debian/control: Use B-D libxfont-dev only. Follow libXfont2 transition on ↵Mike Gabriel2017-04-101-1/+1
| | | | | | | | Debian (and alike).
| * Makefile: Tell Xserver build which Xfont API to use (v2 or v1) depending on ↵Mike Gabriel2017-04-101-1/+6
| | | | | | | | what's available in the build env.
| * Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API ↵Mike Gabriel2017-04-1023-20/+621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alike. Fixes ArcticaProject/nx-libs#296. Inspired by the following X.org commit. Other than X.org, we will continue support for building nx-libs against libXfont1 for a while. commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Author: Keith Packard <keithp@keithp.com> Date: Tue Sep 1 18:50:55 2015 -0700 dix: Switch to the libXfont2 API (v2) This new libXfont API eliminates exposing internal X server symbols to the font library, replacing those with a struct full of the entire API needed to use that library. v2: Use libXfont2 instead of libXfont_2 Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
| * SetFontPath: set client->errorValue on failure.Jamey Sharp2017-04-104-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 21ceae9002c6364deb3d074cf2da7d3864cf6879 Author: Jamey Sharp <jamey@minilop.net> Date: Tue May 11 10:24:00 2010 -0700 SetFontPath: set client->errorValue on failure. Previously the callers were only setting errorValue on Success, when it's ignored, and leaving it alone on failure, when it's sent to the client. Since SetFontPath takes the ClientPtr, let it set client->errorValue instead of letting the callers continue to get it wrong. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 05:31:26 +0000