This is a step towards making libglamor_egl and Xwayland not link against libGL (which brings in client-side libraries, which is just icky).
Signed-off-by: Adam Jackson <[email protected]> --- glamor/Makefile.am | 13 +++++++++++-- glamor/glamor_glx_stubs.c | 37 +++++++++++++++++++++++++++++++++++++ hw/kdrive/ephyr/Makefile.am | 1 + hw/xwayland/Makefile.am | 3 ++- 4 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 glamor/glamor_glx_stubs.c diff --git a/glamor/Makefile.am b/glamor/Makefile.am index 8c79994..fd52e30 100644 --- a/glamor/Makefile.am +++ b/glamor/Makefile.am @@ -1,4 +1,8 @@ -noinst_LTLIBRARIES = libglamor.la libglamor_egl_stubs.la +noinst_LTLIBRARIES = \ + libglamor.la \ + libglamor_egl_stubs.la \ + libglamor_glx.la \ + libglamor_glx_stubs.la libglamor_la_LIBADD = $(GLAMOR_LIBS) @@ -13,7 +17,6 @@ libglamor_la_SOURCES = \ glamor_debug.h \ glamor_font.c \ glamor_font.h \ - glamor_glx.c \ glamor_composite_glyphs.c \ glamor_image.c \ glamor_lines.c \ @@ -58,4 +61,10 @@ libglamor_egl_stubs_la_SOURCES = \ glamor_egl_stubs.c \ glamor_egl.h +libglamor_glx_la_SOURCES = \ + glamor_glx.c + +libglamor_glx_stubs_la_SOURCES = \ + glamor_glx_stubs.c + sdk_HEADERS = glamor.h diff --git a/glamor/glamor_glx_stubs.c b/glamor/glamor_glx_stubs.c new file mode 100644 index 0000000..7f29386 --- /dev/null +++ b/glamor/glamor_glx_stubs.c @@ -0,0 +1,37 @@ +/* + * Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include <epoxy/glx.h> +#include "glamor_context.h" + +static void +glamor_glx_make_current(struct glamor_context *glamor_ctx) +{ +} + + +Bool +glamor_glx_screen_init(struct glamor_context *glamor_ctx) +{ + return False; +} diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 6ce0d6f..f988271 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -66,6 +66,7 @@ if GLAMOR AM_CPPFLAGS += $(XLIB_CFLAGS) XEPHYR_GLAMOR_LIB = \ $(top_builddir)/glamor/libglamor.la \ + $(top_builddir)/glamor/libglamor_glx.la \ $(top_builddir)/glamor/libglamor_egl_stubs.la \ $() endif diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am index a3c9fce..fdb825a 100644 --- a/hw/xwayland/Makefile.am +++ b/hw/xwayland/Makefile.am @@ -46,7 +46,8 @@ glamor_built_sources = \ Xwayland_built_sources += $(glamor_built_sources) -glamor_lib = $(top_builddir)/glamor/libglamor.la +glamor_lib = $(top_builddir)/glamor/libglamor.la \ + $(top_builddir)/glamor/libglamor_glx_stubs.la Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS) -- 2.9.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
