From 83bfb10a71005bbf941822af42d37695b9569179 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 13 Jul 2024 18:32:52 +0200 Subject: [PATCH] package/mupdf: make X11 support optional The X11 support in mupdf is actually optional, and it does require libXext in addition to libX11, so adjust the packaging accordingly. Signed-off-by: Thomas Petazzoni (cherry picked from commit 2c0d7b72c0993a55c8dcb7b38d85792e1bf6e8bc) Signed-off-by: Peter Korsgaard --- package/mupdf/Config.in | 2 -- package/mupdf/mupdf.mk | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index cf97711160..34c5e7d538 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_MUPDF depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz - depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GUMBO_PARSER select BR2_PACKAGE_HARFBUZZ @@ -11,7 +10,6 @@ config BR2_PACKAGE_MUPDF select BR2_PACKAGE_JPEG select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_OPENJPEG - select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_ZLIB help MuPDF is a lightweight PDF, XPS, and E-book viewer. diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 5f73b680a6..d813d9b7de 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -19,7 +19,6 @@ MUPDF_DEPENDENCIES = \ host-pkgconf \ jbig2dec jpeg \ lcms2 openjpeg \ - xlib_libX11 \ zlib # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. @@ -39,6 +38,13 @@ else MUPDF_MAKE_OPTS += shared=yes endif +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXEXT),yy) +MUPDF_MAKE_OPTS += HAVE_X11=yes +MUPDF_DEPENDENCIES += xlib_libX11 xlib_libXext +else +MUPDF_MAKE_OPTS += HAVE_X11=no +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MUPDF_DEPENDENCIES += libfreeglut else