diff mbox series

[1/4] netsurf: add optional dependency freetype

Message ID 20181212071455.29215-1-francois.perrad@gadz.org
State Accepted
Headers show
Series [1/4] netsurf: add optional dependency freetype | expand

Commit Message

Francois Perrad Dec. 12, 2018, 7:14 a.m. UTC 
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++
 package/netsurf/netsurf.mk                    |  7 +++++
 2 files changed, 35 insertions(+)
 create mode 100644 package/netsurf/0002-fix-freetype-detection.patch

Comments

Thomas Petazzoni Dec. 16, 2018, 8:49 p.m. UTC | #1 
Hello,

On Wed, 12 Dec 2018 08:14:52 +0100, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++
>  package/netsurf/netsurf.mk                    |  7 +++++
>  2 files changed, 35 insertions(+)
>  create mode 100644 package/netsurf/0002-fix-freetype-detection.patch

Series applied to master. Thanks!

Thomas
Thomas Petazzoni Dec. 16, 2018, 8:51 p.m. UTC | #2 
Hello François,

Even though I applied the series, I have a few comments.

On Wed, 12 Dec 2018 08:14:52 +0100, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++
>  package/netsurf/netsurf.mk                    |  7 +++++
>  2 files changed, 35 insertions(+)
>  create mode 100644 package/netsurf/0002-fix-freetype-detection.patch
> 
> diff --git a/package/netsurf/0002-fix-freetype-detection.patch b/package/netsurf/0002-fix-freetype-detection.patch
> new file mode 100644
> index 000000000..27c0440e1
> --- /dev/null
> +++ b/package/netsurf/0002-fix-freetype-detection.patch
> @@ -0,0 +1,28 @@
> +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 2/2] fix freetype detection

When generating patches, use the -N option of git format-patch to avoid
the numbering: it provides patches that use [PATCH] instead of [PATCH
X/Y]. We prefer just [PATCH] because the X/Y often get invalid. Your
series is a good example: this patch adds a PATCH 2/2 patch, and the
next patch adds a 3/3 patch, and then another patch adds a 4/4 patch.

Another comment: did you submit all those patches to the upstream
netsurf project ?

Thanks,

Thomas
Francois Perrad Dec. 17, 2018, 4:37 a.m. UTC | #3 
Le dim. 16 déc. 2018 à 21:51, Thomas Petazzoni <thomas.petazzoni@bootlin.com>
a écrit :

> Hello François,
>
> Even though I applied the series, I have a few comments.
>
> On Wed, 12 Dec 2018 08:14:52 +0100, Francois Perrad wrote:
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> > ---
> >  .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++
> >  package/netsurf/netsurf.mk                    |  7 +++++
> >  2 files changed, 35 insertions(+)
> >  create mode 100644 package/netsurf/0002-fix-freetype-detection.patch
> >
> > diff --git a/package/netsurf/0002-fix-freetype-detection.patch
> b/package/netsurf/0002-fix-freetype-detection.patch
> > new file mode 100644
> > index 000000000..27c0440e1
> > --- /dev/null
> > +++ b/package/netsurf/0002-fix-freetype-detection.patch
> > @@ -0,0 +1,28 @@
> > +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 2/2] fix freetype detection
>
> When generating patches, use the -N option of git format-patch to avoid
> the numbering: it provides patches that use [PATCH] instead of [PATCH
> X/Y]. We prefer just [PATCH] because the X/Y often get invalid. Your
> series is a good example: this patch adds a PATCH 2/2 patch, and the
> next patch adds a 3/3 patch, and then another patch adds a 4/4 patch.
>
> Another comment: did you submit all those patches to the upstream
> netsurf project ?
>

I will do.

note: this package still fail on autobuilders, see fix on
https://patchwork.ozlabs.org/patch/1013055/

François


>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
<div dir="ltr"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr">Le dim. 16 déc. 2018 à 21:51, Thomas Petazzoni &lt;<a href="mailto:thomas.petazzoni@bootlin.com">thomas.petazzoni@bootlin.com</a>&gt; a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello François,<br>
<br>
Even though I applied the series, I have a few comments.<br>
<br>
On Wed, 12 Dec 2018 08:14:52 +0100, Francois Perrad wrote:<br>
&gt; Signed-off-by: Francois Perrad &lt;<a href="mailto:francois.perrad@gadz.org" target="_blank">francois.perrad@gadz.org</a>&gt;<br>
&gt; ---<br>
&gt;  .../netsurf/0002-fix-freetype-detection.patch | 28 +++++++++++++++++++<br>
&gt;  package/netsurf/<a href="http://netsurf.mk" rel="noreferrer" target="_blank">netsurf.mk</a>                    |  7 +++++<br>
&gt;  2 files changed, 35 insertions(+)<br>
&gt;  create mode 100644 package/netsurf/0002-fix-freetype-detection.patch<br>
&gt; <br>
&gt; diff --git a/package/netsurf/0002-fix-freetype-detection.patch b/package/netsurf/0002-fix-freetype-detection.patch<br>
&gt; new file mode 100644<br>
&gt; index 000000000..27c0440e1<br>
&gt; --- /dev/null<br>
&gt; +++ b/package/netsurf/0002-fix-freetype-detection.patch<br>
&gt; @@ -0,0 +1,28 @@<br>
&gt; +From 85336f2404b9583267019650ea0112ebf1bb571a Mon Sep 17 00:00:00 2001<br>
&gt; +From: Francois Perrad &lt;<a href="mailto:francois.perrad@gadz.org" target="_blank">francois.perrad@gadz.org</a>&gt;<br>
&gt; +Date: Wed, 28 Nov 2018 17:59:44 +0100<br>
&gt; +Subject: [PATCH 2/2] fix freetype detection<br>
<br>
When generating patches, use the -N option of git format-patch to avoid<br>
the numbering: it provides patches that use [PATCH] instead of [PATCH<br>
X/Y]. We prefer just [PATCH] because the X/Y often get invalid. Your<br>
series is a good example: this patch adds a PATCH 2/2 patch, and the<br>
next patch adds a 3/3 patch, and then another patch adds a 4/4 patch.<br>
<br>
Another comment: did you submit all those patches to the upstream<br>
netsurf project ?<br></blockquote><div><br></div><div>I will do.</div><div><br></div><div>note: this package still fail on autobuilders, see fix on <a href="https://patchwork.ozlabs.org/patch/1013055/">https://patchwork.ozlabs.org/patch/1013055/</a><br></div><div><br></div><div>François<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Thanks,<br>
<br>
Thomas<br>
-- <br>
Thomas Petazzoni, CTO, Bootlin<br>
Embedded Linux and Kernel engineering<br>
<a href="https://bootlin.com" rel="noreferrer" target="_blank">https://bootlin.com</a><br>
_______________________________________________<br>
buildroot mailing list<br>
<a href="mailto:buildroot@busybox.net" target="_blank">buildroot@busybox.net</a><br>
<a href="http://lists.busybox.net/mailman/listinfo/buildroot" rel="noreferrer" target="_blank">http://lists.busybox.net/mailman/listinfo/buildroot</a><br>
</blockquote></div></div></div>
diff mbox series

Patch

diff --git a/package/netsurf/0002-fix-freetype-detection.patch b/package/netsurf/0002-fix-freetype-detection.patch
new file mode 100644
index 000000000..27c0440e1
--- /dev/null
+++ b/package/netsurf/0002-fix-freetype-detection.patch
@@ -0,0 +1,28 @@ 
+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 2/2] fix freetype detection
+
+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
+
diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk
index 3339b35c9..23e4de637 100644
--- a/package/netsurf/netsurf.mk
+++ b/package/netsurf/netsurf.mk
@@ -27,6 +27,12 @@  endif
 ifeq ($(BR2_PACKAGE_NETSURF_SDL),y)
 NETSURF_DEPENDENCIES += sdl host-libpng
 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
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
@@ -41,6 +47,7 @@  define NETSURF_CONFIGURE_CMDS
 	echo "override NETSURF_USE_DUKTAPE := NO"       >  $(@D)/netsurf/Makefile.config
 	$(NETSURF_ICONV_CONFIGURE_CMDS)
 	$(NETSURF_SVG_CONFIGURE_CMDS)
+	$(NETSURF_FONTLIB_CONFIGURE_CMDS)
 endef
 
 NETSURF_MAKE_OPTS = \