vcxsrv/xorg-server/hw/xwin/glx/makefile, branch release/1.15.2.x VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=release%2F1.15.2.x 2013-12-22T12:16:58+00:00 Merge remote-tracking branch 'origin/released' 2013-12-22T12:16:58+00:00 marha marha@users.sourceforge.net 2013-12-22T12:12:15+00:00 urn:sha1:1d03b6f684ab1ea6772f00058605a9ebb2910628 * origin/released: libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013 Conflicts: mesalib/include/GL/glext.h mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c xorg-server/damageext/damageext.c xorg-server/dix/dispatch.c xorg-server/glx/glxdriswrast.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_program.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/glthunk.c xorg-server/hw/xwin/glx/indirect.c xorg-server/include/os.h xorg-server/present/present_request.c Solved compilation and link problems after last merge 2013-11-08T10:47:30+00:00 marha marha@users.sourceforge.net 2013-11-08T10:47:30+00:00 urn:sha1:c8483dc2831dc37d93a36804022f6b064f5962ea Synchronised files 2013-08-19T10:16:17+00:00 marha marha@users.sourceforge.net 2013-08-19T10:16:17+00:00 urn:sha1:7403278d95051a554e2cbec3fafdde8ce9c6d200 Updated to latest gl specs gen_gl_wrappers.py: now use the opengl xml files as input 2013-07-22T10:12:43+00:00 marha marha@users.sourceforge.net 2013-07-22T10:11:31+00:00 urn:sha1:b9356a3668e013820e4a2b2fb1e19da216fc63be Merge remote-tracking branch 'origin/released' 2011-07-14T14:15:03+00:00 marha marha@users.sourceforge.net 2011-07-14T14:15:03+00:00 urn:sha1:31ee9c57db79281e122d3c4acb0f8eae07f4449f Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c Solved needles rebuilds when switching between debug and release builds 2011-02-03T08:06:38+00:00 marha marha@users.sourceforge.net 2011-02-03T08:06:38+00:00 urn:sha1:97f3d3043a79d6031787c246a67d2a02ff0a8d08 Enabled ROOTLESS option in dix (currenlty not really used) 2011-01-28T15:43:29+00:00 marha marha@users.sourceforge.net 2011-01-28T15:43:29+00:00 urn:sha1:b3be16ace28c0a51052c3b76162efbab811abf84 Define _GLAPI_NO_EXPORTS in glx makefile to solve compilation problem due to latest change in glapi.h 2011-01-26T09:53:35+00:00 marha marha@users.sourceforge.net 2011-01-26T09:53:35+00:00 urn:sha1:8ed881d7e53a99d2f2bc136c6d3277eba4cd3d3b Added some more spec files to get 2010-09-16T14:29:00+00:00 marha marha@users.sourceforge.net 2010-09-16T14:29:00+00:00 urn:sha1:72fceaff9a16aab53bc0d1eb8ceaa602aba89b23 Native glx is compiling and running now (although no acceleration is happening... to be investigated further) 2009-11-20T13:01:45+00:00 marha marha@users.sourceforge.net 2009-11-20T13:01:45+00:00 urn:sha1:d2d9977f1153b5222b34859a2cb22b957bfe3221