aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nx-libs.spec: make sure pass additional configure flags through, not discard ↵Mihai Moldovan2017-12-191-1/+2
| | | | | | | | | them. Fixes RPM builds building libNX_X11 with poll() support, even though we explicitly disable it using --disable-poll in the main Makefile. Fixes: ArcticaProject/nx-libs#540
* nx-X11/extras/Mesa.patches_6.4.2/4002_no-special-glx-memfunctions.patch: ↵Mihai Moldovan2017-12-191-5/+6
| | | | | | | include stdlib.h and string.h for memset, malloc and free prototypes. Without that they are only implicitly defined - leading to build failures on *SUSE.
* mesa-quilt: drop debugging option erroneously committed.Mihai Moldovan2017-12-191-2/+0
|
* mesa-quilt: ignore user configuration file when applying MESA patches.Mihai Moldovan2017-12-191-1/+10
|
* nx-libs.spec: show compile calls during RPM-based builds.Mihai Moldovan2017-12-191-1/+2
|
* nx-libs.spec: re-add %{optflags} to CDEBUGFLAGS.Mihai Moldovan2017-12-191-1/+1
| | | | | | | | | I didn't mean to drop it in the first place in 07d308359995e07285b5c15d897c2617b52f0093 and 71bda0ed5c05e6bd75278ae7f88991f8ff35709e. Dropping the sed hack was fine - but we actually have to add these flags to CDEBUGFLAGS as well.
* nxcomp/src/Loop.cpp: log message fixups only.Mihai Moldovan2017-12-181-2/+2
|
* Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is ↵Mihai Moldovan2017-12-163-8/+2
| | | | actually header I was searching for.
* nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode ↵Mihai Moldovan2017-12-161-0/+7
| | | | via the _SHAPE_SERVER_ macro.
* nx-X11/programs/Xserver/Xext/shape.c: pull in shapestr.h for legacy Xext ↵Mihai Moldovan2017-12-161-1/+1
| | | | proto versions, since shape.h would pull in Xlib.
* Handle SHAPE proto splitup gracefully for legacy Xext proto versions.Mihai Moldovan2017-12-161-0/+4
|
* zlib compatibility: whenever we want -I flags only, assume that the headers ↵Mihai Moldovan2017-12-162-3/+3
| | | | | | are directly available. Especially don't add linking flags willy-nilly.
* nx-X11/programs/Xserver/include/misc.h: add compat define for SHMNAME.Mihai Moldovan2017-12-161-0/+6
|
* Support building with legacy zlib versions that do not ship a pkg-config file.Mihai Moldovan2017-12-165-5/+23
|
* Support building with legacy (pre-7.1.0) Xext proto versions.Mihai Moldovan2017-12-166-5/+36
| | | | | Legacy Xext proto versions are automatically detected by the main Makefile.
* Revert "nx-libs.spec: add xorg-x11-libXext-devel build dependency for older ↵Mihai Moldovan2017-12-161-1/+0
| | | | | | | | | | *SUSE versions." This reverts commit cc47066b3520b6b5ce5f5e3da3e0e869b3e2379d. This package is actually already depended upon. shmproto.h must be in some other package. Investigating.
* nx-libs.spec: add xorg-x11-libXext-devel build dependency for older *SUSE ↵Mihai Moldovan2017-12-161-0/+1
| | | | versions.
* nx{comp{,shad},proxy}: use dist-bzip2 instead of dist-xz.Mihai Moldovan2017-12-163-3/+3
| | | | | Automake older than version 1.11 does not support dist-xz. No workaround possible via a feature check, as far as I can tell.
* debian/control: add dependencies needed for debian/compat.sh.Mihai Moldovan2017-12-161-1/+4
|
* Makefile: correctly quote variables when passing them down to other programs.Mihai Moldovan2017-12-161-5/+5
| | | | | | | | | | Avoids errors like these (and of course also is a good idea in general): [ 36s] make -C nx-X11 BuildIncludes FONT_DEFINES= -DLEGACY_XFONT1 [ 36s] make: invalid option -- D [ 36s] make: invalid option -- E [ 36s] make: invalid option -- G [ 36s] make: invalid option -- A [ 36s] Usage: make [options] [target] ...
* nx-libs.spec: pixman is called libpixman-1-0 on older *SUSE versions.Mihai Moldovan2017-12-161-1/+1
|
* nx-libs.spec: imake is part of xorg-x11-util-devel on older *SUSE versions ↵Mihai Moldovan2017-12-161-1/+4
| | | | and the splitted imake package on later versions.
* nx-libs.spec: older *SUSE versions do not split up (all) libraries in a ↵Mihai Moldovan2017-12-161-5/+1
| | | | useful manner.
* Support building with legacy (pre-1.4.2) libXfont(1) versions.Mihai Moldovan2017-12-167-2/+30
| | | | | | | | Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile.
* debian/rules: execute new debian/compat.sh file before the actual build.Mihai Moldovan2017-12-161-1/+1
|
* debian/: add compat.sh file containing compatibility logic for older Debian ↵Mihai Moldovan2017-12-161-0/+46
| | | | and Ubuntu versions.
* nx-libs.spec: also own %{_datadir}/nx/X11, since %dir explicitly does not ↵Mihai Moldovan2017-12-161-0/+1
| | | | recurse down.
* nxcompshad/Makefile.am: also correctly call aclocal here.Mihai Moldovan2017-12-151-0/+2
|
* {nx-X11/lib,nxproxy}/Makefile.am: also use correct aclocal flags in the ↵Mihai Moldovan2017-12-152-1/+5
| | | | other locations.
* nxcomp/test/logging_test.cpp: return a value in non-void function.Mihai Moldovan2017-12-151-0/+2
| | | | Failed *SUSE checks.
* nx-X11/config/cf/linux.cf: recursive macros aren't a thing.Mihai Moldovan2017-12-151-1/+1
| | | | Just copy-paste the initial definition to avoid recursion.
* nxcomp/Makefile.am: call aclocal with the correct include dir argument.Mihai Moldovan2017-12-151-0/+2
|
* nx-libs.spec: only remove files in the BuildRoot.Mihai Moldovan2017-12-151-1/+1
| | | | We have no intention to remove system libraries.
* nx-X11/config/cf/linux.cf: don't override default CC options for ↵Mihai Moldovan2017-12-151-4/+1
| | | | | | {ARM,PPC}{32,64}. We need -std=c99 to be passed through to the build process.
* Merge branch '3.6.x'Mihai Moldovan2017-12-1511699-2883615/+873699
|\
| * release 3.5.99.123.5.99.12Mike Gabriel2017-12-156-9/+28
| |
| * Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in.Mike Gabriel2017-12-151-4/+4
| |
| * debian/changelog: post-release version bump to 3.5.99.11Mike Gabriel2017-12-151-0/+7
| |
| * release 3.5.99.113.5.99.11Mike Gabriel2017-12-155-23/+755
| |
| * Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.xMike Gabriel2017-12-155-124/+117
| |\ | | | | | | | | | | | | | | | Attributes GH PR #605: https://github.com/ArcticaProject/nx-libs/pull/605 Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Thu, 14 Dec 2017 13:15:12 +0000
| | * Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree).Mike Gabriel2017-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They have been flawed ever since nxagent came up, as they were Xfree (non-capital f) always, but should have been XFree (capital F, defined in Xlibint.h and part of libNX_X11). . Probably this all should be free() all over the code (bearing in mind, that XFree() returns int, not void. But still... Fixes ArcticaProject/nx-libs#553.
| | * Xserver/hw/nxagent/compext: Xfree -> free and Xmalloc -> malloc.Mike Gabriel2017-12-154-121/+114
| |/
| * nx-libs.spec: actually use a weak dependency for xkeyboard-config.Mihai Moldovan2017-12-151-0/+10
| | | | | | | | At least on platforms that support weak dependencies.
| * nx-libs.spec: add back erroneously dropped xkeyboard-config dependency.Mihai Moldovan2017-12-151-0/+4
| |
| * Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.xMihai Moldovan2017-12-148-28/+40
| |\ | | | | | | | | | Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333
| | * Xserver/GL/glx/glxcmds.c: Cast small-int values through intptr_t when passed ↵Mike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as pointers Picked from this X.org commit: commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b Author: Jamey Sharp <jamey@minilop.net> Date: Thu Oct 8 13:38:44 2009 +1100 Cast small-int values through intptr_t when passed as pointers On 64-bit systems, int and pointers don't have the same size, so GCC gives warnings about casts between int and pointer types. However, in the cases covered by this patch, it's always a value that fits in int being stored temporarily as a pointer and then converted back later, which is safe. Casting through the pointer-sized integer type intptr_t convinces the compiler that this is OK. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (Only appropriate location for backporting: Xserver/GL/glx/glxcmds.c).
| | * lib/X11/Xrm.c: Compiler warning fix: logical-not-parenthesesMike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Xrm.c: In function 'PutEntry': Xrm.c:900:15: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] !quarks[2] != table->leaf) ^~
| | * glx: warning fixesMike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 63ccaec2c39f4b5742383472c951ee2cd35c9e14 Author: Adam Jackson <ajax@redhat.com> Date: Tue Oct 19 11:59:23 2010 -0400 render2.c: In function ‘__glXDisp_Map2d’: render2.c:127: warning: ‘u1’ may be used uninitialized in this function render2.c: In function ‘__glXDisp_Map1d’: render2.c:90: warning: ‘u1’ may be used uninitialized in this function Remove unnecessary test, and change memcpy to memmove as all users were doing overlapping copies. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| | * Xserver/GL/glx/glxfb.c: Fix compiler warning: pointer-sign.Mike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | glxfb.c: In function '__glXFBMemSwapBuffers': glxfb.c:117:5: warning: pointer targets in passing argument 10 of 'pGC->ops->PutImage' differ in signedness [-Wpointer-sign] buf); ^~~ glxfb.c:117:5: note: expected 'char *' but argument is of type 'GLubyte * {aka unsigned char *}'
| | * hw/nxagent/Events.c: Fix compiler warnings (with NX_DEBUG_INPUT): format.Mike Gabriel2017-12-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events.c: In function 'nxagentDumpInputDevicesState': Events.c:4662:58: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:82: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4675:66: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]" ^ Events.c:4689:59: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4689:23: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4722:57: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:81: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4735:65: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]" ^ Events.c:4750:61: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4750:25: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:22:23 +0000