Skip to content

build: add no-x11 option to disable X11 surface support #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lazka merged 1 commit into from
Nov 9, 2025
Merged

build: add no-x11 option to disable X11 surface support #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cairo/cairomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ static Pycairo_CAPI_t CAPI = {
0,
0,
#endif
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
&PycairoXCBSurface_Type,
#else
0,
#endif
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
&PycairoXlibSurface_Type,
#else
0,
Expand Down Expand Up @@ -242,11 +242,11 @@ static int exec_cairo(PyObject *m)
if (PyType_Ready(&PycairoWin32PrintingSurface_Type) < 0)
return -1;
#endif
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyType_Ready(&PycairoXCBSurface_Type) < 0)
return -1;
#endif
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyType_Ready(&PycairoXlibSurface_Type) < 0)
return -1;
#endif
Expand Down Expand Up @@ -391,13 +391,13 @@ static int exec_cairo(PyObject *m)
return -1;
#endif

#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyModule_AddObjectRef(m, "XCBSurface",
(PyObject *)&PycairoXCBSurface_Type) < 0)
return -1;
#endif

#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyModule_AddObjectRef(m, "XlibSurface",
(PyObject *)&PycairoXlibSurface_Type) < 0)
return -1;
Expand Down Expand Up @@ -501,14 +501,14 @@ static int exec_cairo(PyObject *m)
if (PyModule_AddIntConstant(m, "HAS_WIN32_SURFACE", 0) < 0)
return -1;
#endif
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyModule_AddIntConstant(m, "HAS_XCB_SURFACE", 1) < 0)
return -1;
#else
if (PyModule_AddIntConstant(m, "HAS_XCB_SURFACE", 0) < 0)
return -1;
#endif
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
if (PyModule_AddIntConstant(m, "HAS_XLIB_SURFACE", 1) < 0)
return -1;
#else
Expand Down
4 changes: 2 additions & 2 deletions cairo/private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ extern PyTypeObject PycairoWin32Surface_Type;
extern PyTypeObject PycairoWin32PrintingSurface_Type;
#endif

#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
extern PyTypeObject PycairoXCBSurface_Type;
#endif

#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
extern PyTypeObject PycairoXlibSurface_Type;
#endif

Expand Down
12 changes: 6 additions & 6 deletions cairo/surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ PycairoSurface_FromSurface (cairo_surface_t *surface, PyObject *base) {
type = &PycairoWin32PrintingSurface_Type;
break;
#endif
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
case CAIRO_SURFACE_TYPE_XCB:
type = &PycairoXCBSurface_Type;
break;
#endif
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
case CAIRO_SURFACE_TYPE_XLIB:
type = &PycairoXlibSurface_Type;
break;
Expand Down Expand Up @@ -2314,7 +2314,7 @@ PyTypeObject PycairoWin32PrintingSurface_Type = {


/* Class XCBSurface(Surface) --------------------------------------------- */
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
#include <cairo-xcb.h>

static PyObject *
Expand Down Expand Up @@ -2382,11 +2382,11 @@ PyTypeObject PycairoXCBSurface_Type = {
0, /* tp_is_gc */
0, /* tp_bases */
};
#endif /* CAIRO_HAS_XCB_SURFACE */
#endif /* defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11) */


/* Class XlibSurface(Surface) --------------------------------------------- */
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
#include <cairo-xlib.h>

static PyObject *
Expand Down Expand Up @@ -2461,7 +2461,7 @@ PyTypeObject PycairoXlibSurface_Type = {
0, /* tp_is_gc */
0, /* tp_bases */
};
#endif /* CAIRO_HAS_XLIB_SURFACE */
#endif /* defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11) */

#ifdef CAIRO_HAS_TEE_SURFACE
#include <cairo-tee.h>
Expand Down
4 changes: 4 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ pyext_c_args = [
'-DPYCAIRO_VERSION_MICRO=@0@'.format(pycairo_version_micro),
]

if get_option('no-x11')
pyext_c_args += ['-DPYCAIRO_NO_X11']
endif

if not for_wheel
pkginfo_conf = configuration_data()
pkginfo_conf.set('VERSION', pycairo_version)
Expand Down
5 changes: 5 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
option('python', type : 'string', value : 'python3')
option('tests', type : 'boolean', value : true, description : 'build unit tests')
option('wheel', type : 'boolean', value : false, description : 'build for a Python wheel')
option('no-x11',
type: 'boolean',
value: false,
description: 'Disable X11 surface support (Xlib and XCB) even if cairo has it enabled'
)
4 changes: 2 additions & 2 deletions tests/cmodule/cmodulelib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,14 @@ test_capi (PyObject *self, PyObject *args)
#endif

// PycairoXCBSurface_Type
#ifdef CAIRO_HAS_XCB_SURFACE
#if defined(CAIRO_HAS_XCB_SURFACE) && !defined(PYCAIRO_NO_X11)
if(PyType_Ready(&PycairoXCBSurface_Type) != 0) {
return NULL;
}
#endif

// PycairoXlibSurface_Type
#ifdef CAIRO_HAS_XLIB_SURFACE
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined(PYCAIRO_NO_X11)
if(PyType_Ready(&PycairoXlibSurface_Type) != 0) {
return NULL;
}
Expand Down
Loading