mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/mupdf: make X11 support optional

Browse Source 
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 <thomas.petazzoni@bootlin.com>
(cherry picked from commit 2c0d7b72c0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni
2024-07-13 18:32:52 +02:00
committed by Peter Korsgaard
parent cc63dd68dd
commit 83bfb10a71
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/mupdf/Config.in
View File

@@ -3,7 +3,6 @@ config BR2_PACKAGE_MUPDF
depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_INSTALL_LIBSTDCPP # harfbuzz
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_GUMBO_PARSER select BR2_PACKAGE_GUMBO_PARSER
select BR2_PACKAGE_HARFBUZZ select BR2_PACKAGE_HARFBUZZ
@@ -11,7 +10,6 @@ config BR2_PACKAGE_MUPDF
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LCMS2 select BR2_PACKAGE_LCMS2
select BR2_PACKAGE_OPENJPEG select BR2_PACKAGE_OPENJPEG
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
MuPDF is a lightweight PDF, XPS, and E-book viewer. MuPDF is a lightweight PDF, XPS, and E-book viewer.

8
package/mupdf/mupdf.mk
View File

@@ -19,7 +19,6 @@ MUPDF_DEPENDENCIES = \
host-pkgconf \ host-pkgconf \
jbig2dec jpeg \ jbig2dec jpeg \
lcms2 openjpeg \ lcms2 openjpeg \
xlib_libX11 \
zlib zlib
# mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead. # mupdf doesn't use CFLAGS and LIBS but XCFLAGS and XLIBS instead.
@@ -39,6 +38,13 @@ else
MUPDF_MAKE_OPTS += shared=yes MUPDF_MAKE_OPTS += shared=yes
endif 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) ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
MUPDF_DEPENDENCIES += libfreeglut MUPDF_DEPENDENCIES += libfreeglut
else else