jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/netsurf: add optional dependency on freetype

Browse Source 
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Francois Perrad 2018-12-12 08:14:52 +01:00 committed by Thomas Petazzoni
parent 31f5c8561f
commit 03bb034d89
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/netsurf/0002-fix-freetype-detection.patch Normal file
View File

@ -0,0 +1,32 @@
From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Wed, 28 Nov 2018 17:59:44 +0100
Subject: [PATCH] fix freetype detection
Using freetype-config doesn't work well, because it's going to use the
system freetype-config instead of the one installed in the
cross-compilation sysroot. So, let's use pkg-config instead.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
netsurf/frontends/framebuffer/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/netsurf/frontends/framebuffer/Makefile b/netsurf/frontends/framebuffer/Makefile
index bdedd90..249c7c4 100644
--- a/netsurf/frontends/framebuffer/Makefile
+++ b/netsurf/frontends/framebuffer/Makefile
@@ -35,8 +35,8 @@ LDFLAGS += -Wl,--no-whole-archive
# freetype is optional but does not use pkg-config
ifeq ($(NETSURF_FB_FONTLIB),freetype)
- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
- LDFLAGS += $(shell freetype-config --libs)
+ CFLAGS += -DFB_USE_FREETYPE $(shell $(PKG_CONFIG) --cflags freetype2)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs freetype2)
endif
--
2.17.1

7
package/netsurf/netsurf.mk
View File

@ -27,6 +27,12 @@ endif
ifeq ($(BR2_PACKAGE_NETSURF_SDL),y) ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
NETSURF_DEPENDENCIES += sdl host-libpng NETSURF_DEPENDENCIES += sdl host-libpng
NETSURF_FRONTEND = framebuffer NETSURF_FRONTEND = framebuffer
ifeq ($(BR2_PACKAGE_FREETYPE),y)
NETSURF_DEPENDENCIES += freetype
define NETSURF_FONTLIB_CONFIGURE_CMDS
echo "override NETSURF_FB_FONTLIB := freetype" >> $(@D)/netsurf/Makefile.config
endef
endif
endif endif
ifeq ($(BR2_PACKAGE_LIBICONV),y) ifeq ($(BR2_PACKAGE_LIBICONV),y)
@ -41,6 +47,7 @@ define NETSURF_CONFIGURE_CMDS
echo "override NETSURF_USE_DUKTAPE := NO" > $(@D)/netsurf/Makefile.config echo "override NETSURF_USE_DUKTAPE := NO" > $(@D)/netsurf/Makefile.config
$(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_ICONV_CONFIGURE_CMDS)
$(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS)
$(NETSURF_FONTLIB_CONFIGURE_CMDS)
endef endef
NETSURF_MAKE_OPTS = \ NETSURF_MAKE_OPTS = \