Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte
@ 2021-06-30 23:47 Raphaël Mélotte
  2021-06-30 23:47 ` [Buildroot] [PATCH 2/4] package/gumbo-parser: new package Raphaël Mélotte
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Raphaël Mélotte @ 2021-06-30 23:47 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
---
 DEVELOPERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPERS b/DEVELOPERS
index 2a69f88299..c1c32466be 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2261,7 +2261,7 @@ F:	package/nanomsg/
 N:	Ramon Fried <rfried.dev@gmail.com>
 F:	package/bitwise/
 
-N:	Rapha?l M?lotte <raphael.melotte@essensium.com>
+N:	Rapha?l M?lotte <raphael.melotte@mind.be>
 F:	package/jbig2dec/
 F:	package/mupdf/
 F:	package/python-boto3/
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 2/4] package/gumbo-parser: new package
  2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
@ 2021-06-30 23:47 ` Raphaël Mélotte
  2021-07-20 21:39   ` Thomas Petazzoni
  2021-06-30 23:47 ` [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0 Raphaël Mélotte
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Raphaël Mélotte @ 2021-06-30 23:47 UTC (permalink / raw)
  To: buildroot

Gumbo is an implementation of the HTML5 parsing algorithm implemented
as a pure C99 library with no outside dependencies.

Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
---
 DEVELOPERS                             |  1 +
 package/Config.in                      |  1 +
 package/gumbo-parser/Config.in         | 10 ++++++++++
 package/gumbo-parser/gumbo-parser.hash |  5 +++++
 package/gumbo-parser/gumbo-parser.mk   | 18 ++++++++++++++++++
 5 files changed, 35 insertions(+)
 create mode 100644 package/gumbo-parser/Config.in
 create mode 100644 package/gumbo-parser/gumbo-parser.hash
 create mode 100644 package/gumbo-parser/gumbo-parser.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index c1c32466be..89049bdbad 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2262,6 +2262,7 @@ N:	Ramon Fried <rfried.dev@gmail.com>
 F:	package/bitwise/
 
 N:	Rapha?l M?lotte <raphael.melotte@mind.be>
+F:	package/gumbo-parser/
 F:	package/jbig2dec/
 F:	package/mupdf/
 F:	package/python-boto3/
diff --git a/package/Config.in b/package/Config.in
index 22947edf2c..ab299bc2ae 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1901,6 +1901,7 @@ menu "Other"
 	source "package/gobject-introspection/Config.in"
 	source "package/gsl/Config.in"
 	source "package/gtest/Config.in"
+	source "package/gumbo-parser/Config.in"
 	source "package/jemalloc/Config.in"
 	source "package/lapack/Config.in"
 	source "package/libabseil-cpp/Config.in"
diff --git a/package/gumbo-parser/Config.in b/package/gumbo-parser/Config.in
new file mode 100644
index 0000000000..04bb2294bb
--- /dev/null
+++ b/package/gumbo-parser/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_GUMBO_PARSER
+	bool "gumbo-parser"
+	help
+	  Gumbo is an implementation of the HTML5 parsing algorithm
+	  implemented as a pure C99 library with no outside
+	  dependencies. It's designed to serve as a building block for
+	  other tools and libraries such as linters, validators,
+	  templating languages, and refactoring and analysis tools.
+
+	  https://github.com/google/gumbo-parser
diff --git a/package/gumbo-parser/gumbo-parser.hash b/package/gumbo-parser/gumbo-parser.hash
new file mode 100644
index 0000000000..c4af33072c
--- /dev/null
+++ b/package/gumbo-parser/gumbo-parser.hash
@@ -0,0 +1,5 @@
+# Locally computed:
+sha256  28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad  gumbo-parser-0.10.1.tar.gz
+
+# Hash for license files:
+sha256  c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4  COPYING
diff --git a/package/gumbo-parser/gumbo-parser.mk b/package/gumbo-parser/gumbo-parser.mk
new file mode 100644
index 0000000000..25d12033c6
--- /dev/null
+++ b/package/gumbo-parser/gumbo-parser.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# gumbo-parser
+#
+################################################################################
+
+GUMBO_PARSER_VERSION = 0.10.1
+GUMBO_PARSER_SITE = $(call github,google,gumbo-parser,v$(GUMBO_PARSER_VERSION))
+GUMBO_PARSER_LICENSE = Apache-2.0
+GUMBO_PARSER_LICENSE_FILES = COPYING
+GUMBO_PARSER_INSTALL_STAGING = YES
+
+define GUMBO_PARSER_RUN_AUTOGEN
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
+endef
+GUMBO_PARSER_PRE_CONFIGURE_HOOKS += GUMBO_PARSER_RUN_AUTOGEN
+
+$(eval $(autotools-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0
  2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
  2021-06-30 23:47 ` [Buildroot] [PATCH 2/4] package/gumbo-parser: new package Raphaël Mélotte
@ 2021-06-30 23:47 ` Raphaël Mélotte
  2021-07-20 21:40   ` Thomas Petazzoni
  2021-06-30 23:47 ` [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14 Raphaël Mélotte
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Raphaël Mélotte @ 2021-06-30 23:47 UTC (permalink / raw)
  To: buildroot

It turns out the patch version of python-pymupdf doesn't have to match
mupdf's version (i.e. python-pymupdf 1.18.14 is compatible with mupdf
1.18.*) so remove the word "exactly" from the comment.

mupdf now has a new dependency: gumbo-parser.

gumbo-parser is included when downloading the sources for mupdf, but
instead we use the version provided by Buildroot.

While at it, take the chance to (based on previous review comments):

- Fix indentation in the hash file (two spaces).
- Switch to using the ".xz" archive.
- Add a conditional on freeglut.

Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
---
 package/mupdf/Config.in  |  1 +
 package/mupdf/mupdf.hash |  6 +++---
 package/mupdf/mupdf.mk   | 17 ++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in
index dc296b3e8a..f796965751 100644
--- a/package/mupdf/Config.in
+++ b/package/mupdf/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_MUPDF
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LCMS2
 	select BR2_PACKAGE_OPENJPEG
+	select BR2_PACKAGE_GUMBO_PARSER
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_ZLIB
 	help
diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash
index ec4893046d..934836e76a 100644
--- a/package/mupdf/mupdf.hash
+++ b/package/mupdf/mupdf.hash
@@ -1,8 +1,8 @@
 # From https://mupdf.com/downloads/index.html:
-sha1 18f069b7cc125e53f541163ac305c588c94dea97 mupdf-1.16.0-source.tar.gz
+sha1  fc17bd01d5860e49b009f28a5ddb629e94af4510  mupdf-1.18.0-source.tar.xz
 
 # Locally computed:
-sha256 64d537895641b711737cc58fe762481b07ea71d1506e8bd8a13434e093b0068d  mupdf-1.16.0-source.tar.gz
+sha256 592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a  mupdf-1.18.0-source.tar.xz
 
 # Hash for license files:
-sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6  COPYING
+sha256  57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6  COPYING
diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk
index 78dacd214c..9884b510c3 100644
--- a/package/mupdf/mupdf.mk
+++ b/package/mupdf/mupdf.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-# python-pymupdf's version must match exactly mupdf's version
-MUPDF_VERSION = 1.16.0
-MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.gz
+# python-pymupdf's version must match mupdf's version
+MUPDF_VERSION = 1.18.0
+MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.xz
 MUPDF_SITE = https://mupdf.com/downloads/archive
 MUPDF_LICENSE = AGPL-3.0+
 MUPDF_LICENSE_FILES = COPYING
@@ -14,6 +14,7 @@ MUPDF_CPE_ID_VENDOR = artifex
 MUPDF_INSTALL_STAGING = YES
 MUPDF_DEPENDENCIES = \
 	freetype \
+	gumbo-parser \
 	harfbuzz \
 	host-pkgconf \
 	jbig2dec jpeg \
@@ -21,8 +22,10 @@ MUPDF_DEPENDENCIES = \
 	xlib_libX11 \
 	zlib
 
+# The pkg-config name for gumbo-parser is `gumbo`.
 MUPDF_PKG_CONFIG_PACKAGES = \
 	freetype2 \
+	gumbo \
 	harfbuzz \
 	libjpeg \
 	zlib
@@ -43,13 +46,17 @@ MUPDF_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 	XLIBS="$(MUPDF_LDFLAGS)" \
 	USE_SYSTEM_LIBS=yes
 
-# Modern versions of mupdf depend on OpenGL,
-# we disable it because it may not be available:
+ifneq ($(BR2_PACKAGE_FREEGLUT),y)
+# Modern versions of mupdf depend on OpenGL.
+# We disable it unless FREEGLUT is selected:
 define MUPDF_DISABLE_OPENGL
 	sed -i 's/HAVE_GLUT := yes/HAVE_GLUT := no/g' $(@D)/Makerules
 endef
 
 MUPDF_POST_PATCH_HOOKS = MUPDF_DISABLE_OPENGL
+else
+MUPDF_DEPENDENCIES += libfreeglut
+endif
 
 define MUPDF_BUILD_CMDS
 	$(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) all
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14
  2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
  2021-06-30 23:47 ` [Buildroot] [PATCH 2/4] package/gumbo-parser: new package Raphaël Mélotte
  2021-06-30 23:47 ` [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0 Raphaël Mélotte
@ 2021-06-30 23:47 ` Raphaël Mélotte
  2021-07-20 21:40   ` Thomas Petazzoni
  2021-07-20 21:38 ` [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Thomas Petazzoni
  2021-08-04 14:36 ` Peter Korsgaard
  4 siblings, 1 reply; 13+ messages in thread
From: Raphaël Mélotte @ 2021-06-30 23:47 UTC (permalink / raw)
  To: buildroot

Recent tarballs from PyPI use setuptools instead of distutils, so
change `PYTHON_PYMUPDF_SETUP_TYPE`.

They also include a license file, so include it and a hash for it.

This version also has a new dependency: freetype2.

PYTHON_PYMUPDF_REMOVE_PATHS is updated to take the new dependency into
account, but also the sed command are changed to delete include lines
instead of turning them into empty strings. Indeed, empty include
strings lead to using multiple `-I` flags which were not followed by
anything. Depending on the number of empty include strings (because
two successive `-I` "cancel" each other out), it would have failed to
compile.

Also, it turns out the patch version of python-pymupdf doesn't have to
match mupdf's version (e.g. python-pymupdf 1.18.14 is compatible with
mupdf 1.18.*) so while at it, remove the word "exactly" from the
comment.

Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
---
 package/python-pymupdf/Config.in           |  1 +
 package/python-pymupdf/python-pymupdf.hash |  6 ++++--
 package/python-pymupdf/python-pymupdf.mk   | 19 +++++++++++--------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in
index cd4c8cfcbb..54714eb3bf 100644
--- a/package/python-pymupdf/Config.in
+++ b/package/python-pymupdf/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # mupdf -> harfbuzz
 	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_MUPDF
 	select BR2_PACKAGE_ZLIB
 	help
diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash
index a5a53997cd..ee7a916519 100644
--- a/package/python-pymupdf/python-pymupdf.hash
+++ b/package/python-pymupdf/python-pymupdf.hash
@@ -1,3 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/pymupdf/json
-md5  0e924bbb7364ba63df65d33fee9656f0  PyMuPDF-1.16.0.tar.gz
-sha256  1a6cc5b8b0fb9aa16bfa453fdfed445398f00d2556e78d90ba54cdce8d900857  PyMuPDF-1.16.0.tar.gz
+md5  70d6c2232e531772bbe9a813044262f9  PyMuPDF-1.18.14.tar.gz
+sha256  efe85cb80f79cc3f3890aa2ab82b962b8a999ca078e33e9bacc5d0be5c4656dc  PyMuPDF-1.18.14.tar.gz
+# Locally computed:
+sha256  282751b8c98ee9e445346eb57a992c9ecbe25ed8dd554df046777313e19b10f9  COPYING
diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk
index 9f8d1744b1..ceeeb0a55b 100644
--- a/package/python-pymupdf/python-pymupdf.mk
+++ b/package/python-pymupdf/python-pymupdf.mk
@@ -4,21 +4,24 @@
 #
 ################################################################################
 
-# python-pymupdf's version must match exactly mupdf's version
-PYTHON_PYMUPDF_VERSION = 1.16.0
+# python-pymupdf's version must match mupdf's version
+PYTHON_PYMUPDF_VERSION = 1.18.14
 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz
-PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/d2/da/692102b6e6868a57d1dc7f98d07413116a02493b3b49a798dcd6f676d368
-PYTHON_PYMUPDF_SETUP_TYPE = distutils
+PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/41/f6/dbefe3d6949fa81fb7bcac9141e4345330d272724718ac5a6af78297498b
+PYTHON_PYMUPDF_SETUP_TYPE = setuptools
 PYTHON_PYMUPDF_LICENSE = GPL-3.0, AGPL-3.0+ (code generated from mupdf)
+PYTHON_PYMUPDF_LICENSE_FILES = COPYING
 # No license file included in pip, but it's present on github
-PYTHON_PYMUPDF_DEPENDENCIES = mupdf zlib
+PYTHON_PYMUPDF_DEPENDENCIES = freetype mupdf zlib
 
-PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf"
+PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2"
 
 # We need to remove the original paths as we provide them in the CFLAGS:
 define PYTHON_PYMUPDF_REMOVE_PATHS
-	sed -i "s:\/usr\/include\/mupdf::g" $(@D)/setup.py
-	sed -i "s:\/usr\/local\/include\/mupdf::g" $(@D)/setup.py
+	sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py
+	sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py
+	sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py
+	sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py
 endef
 
 PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [Buildroot]  [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte
  2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
                   ` (2 preceding siblings ...)
  2021-06-30 23:47 ` [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14 Raphaël Mélotte
@ 2021-07-20 21:38 ` Thomas Petazzoni
  2021-07-20 21:38   ` Thomas Petazzoni
  2021-08-04 14:36 ` Peter Korsgaard
  4 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:38 UTC (permalink / raw)
  To: buildroot

On Thu,  1 Jul 2021 01:47:13 +0200
Rapha?l M?lotte <raphael.melotte@mind.be> wrote:

> Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
> ---
>  DEVELOPERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Buildroot]  [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte
  2021-07-20 21:38 ` [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Thomas Petazzoni
@ 2021-07-20 21:38   ` Thomas Petazzoni
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:38 UTC (permalink / raw)
  To: Raphaël Mélotte; +Cc: buildroot

On Thu,  1 Jul 2021 01:47:13 +0200
Raphaël Mélotte <raphael.melotte@mind.be> wrote:

> Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
> ---
>  DEVELOPERS | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 2/4] package/gumbo-parser: new package
  2021-06-30 23:47 ` [Buildroot] [PATCH 2/4] package/gumbo-parser: new package Raphaël Mélotte
@ 2021-07-20 21:39   ` Thomas Petazzoni
  2021-07-20 21:39     ` Thomas Petazzoni
  0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:39 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  1 Jul 2021 01:47:14 +0200
Rapha?l M?lotte <raphael.melotte@mind.be> wrote:

> Gumbo is an implementation of the HTML5 parsing algorithm implemented
> as a pure C99 library with no outside dependencies.
> 
> Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>

I've applied, with one important change, see below.

> +GUMBO_PARSER_VERSION = 0.10.1
> +GUMBO_PARSER_SITE = $(call github,google,gumbo-parser,v$(GUMBO_PARSER_VERSION))
> +GUMBO_PARSER_LICENSE = Apache-2.0
> +GUMBO_PARSER_LICENSE_FILES = COPYING
> +GUMBO_PARSER_INSTALL_STAGING = YES
> +
> +define GUMBO_PARSER_RUN_AUTOGEN
> +	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
> +endef
> +GUMBO_PARSER_PRE_CONFIGURE_HOOKS += GUMBO_PARSER_RUN_AUTOGEN

This is not good, as it doesn't add autoconf/automake to the
dependencies of the package. So I've replaced with:

GUMBO_PARSER_AUTORECONF = YES

which does work.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Buildroot] [PATCH 2/4] package/gumbo-parser: new package
  2021-07-20 21:39   ` Thomas Petazzoni
@ 2021-07-20 21:39     ` Thomas Petazzoni
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:39 UTC (permalink / raw)
  To: Raphaël Mélotte; +Cc: buildroot

Hello,

On Thu,  1 Jul 2021 01:47:14 +0200
Raphaël Mélotte <raphael.melotte@mind.be> wrote:

> Gumbo is an implementation of the HTML5 parsing algorithm implemented
> as a pure C99 library with no outside dependencies.
> 
> Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>

I've applied, with one important change, see below.

> +GUMBO_PARSER_VERSION = 0.10.1
> +GUMBO_PARSER_SITE = $(call github,google,gumbo-parser,v$(GUMBO_PARSER_VERSION))
> +GUMBO_PARSER_LICENSE = Apache-2.0
> +GUMBO_PARSER_LICENSE_FILES = COPYING
> +GUMBO_PARSER_INSTALL_STAGING = YES
> +
> +define GUMBO_PARSER_RUN_AUTOGEN
> +	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
> +endef
> +GUMBO_PARSER_PRE_CONFIGURE_HOOKS += GUMBO_PARSER_RUN_AUTOGEN

This is not good, as it doesn't add autoconf/automake to the
dependencies of the package. So I've replaced with:

GUMBO_PARSER_AUTORECONF = YES

which does work.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0
  2021-06-30 23:47 ` [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0 Raphaël Mélotte
@ 2021-07-20 21:40   ` Thomas Petazzoni
  2021-07-20 21:40     ` Thomas Petazzoni
  0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:40 UTC (permalink / raw)
  To: buildroot

Hello Rapha?l,

On Thu,  1 Jul 2021 01:47:15 +0200
Rapha?l M?lotte <raphael.melotte@mind.be> wrote:

> diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in
> index dc296b3e8a..f796965751 100644
> --- a/package/mupdf/Config.in
> +++ b/package/mupdf/Config.in
> @@ -10,6 +10,7 @@ config BR2_PACKAGE_MUPDF
>  	select BR2_PACKAGE_JPEG
>  	select BR2_PACKAGE_LCMS2
>  	select BR2_PACKAGE_OPENJPEG
> +	select BR2_PACKAGE_GUMBO_PARSER

I fixed the alphabetic ordering here.

> -# Modern versions of mupdf depend on OpenGL,
> -# we disable it because it may not be available:
> +ifneq ($(BR2_PACKAGE_FREEGLUT),y)

And here fixed the option name (it's BR2_PACKAGE_LIBFREEGLUT) and
switched to positive logic, i.e:

ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
... do stuff if enabled
else
... do stuff if disabled
endif

Applied with those changes.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0
  2021-07-20 21:40   ` Thomas Petazzoni
@ 2021-07-20 21:40     ` Thomas Petazzoni
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:40 UTC (permalink / raw)
  To: Raphaël Mélotte; +Cc: buildroot

Hello Raphaël,

On Thu,  1 Jul 2021 01:47:15 +0200
Raphaël Mélotte <raphael.melotte@mind.be> wrote:

> diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in
> index dc296b3e8a..f796965751 100644
> --- a/package/mupdf/Config.in
> +++ b/package/mupdf/Config.in
> @@ -10,6 +10,7 @@ config BR2_PACKAGE_MUPDF
>  	select BR2_PACKAGE_JPEG
>  	select BR2_PACKAGE_LCMS2
>  	select BR2_PACKAGE_OPENJPEG
> +	select BR2_PACKAGE_GUMBO_PARSER

I fixed the alphabetic ordering here.

> -# Modern versions of mupdf depend on OpenGL,
> -# we disable it because it may not be available:
> +ifneq ($(BR2_PACKAGE_FREEGLUT),y)

And here fixed the option name (it's BR2_PACKAGE_LIBFREEGLUT) and
switched to positive logic, i.e:

ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
... do stuff if enabled
else
... do stuff if disabled
endif

Applied with those changes.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14
  2021-06-30 23:47 ` [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14 Raphaël Mélotte
@ 2021-07-20 21:40   ` Thomas Petazzoni
  2021-07-20 21:40     ` Thomas Petazzoni
  0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:40 UTC (permalink / raw)
  To: buildroot

On Thu,  1 Jul 2021 01:47:16 +0200
Rapha?l M?lotte <raphael.melotte@mind.be> wrote:

> Recent tarballs from PyPI use setuptools instead of distutils, so
> change `PYTHON_PYMUPDF_SETUP_TYPE`.
> 
> They also include a license file, so include it and a hash for it.
> 
> This version also has a new dependency: freetype2.
> 
> PYTHON_PYMUPDF_REMOVE_PATHS is updated to take the new dependency into
> account, but also the sed command are changed to delete include lines
> instead of turning them into empty strings. Indeed, empty include
> strings lead to using multiple `-I` flags which were not followed by
> anything. Depending on the number of empty include strings (because
> two successive `-I` "cancel" each other out), it would have failed to
> compile.
> 
> Also, it turns out the patch version of python-pymupdf doesn't have to
> match mupdf's version (e.g. python-pymupdf 1.18.14 is compatible with
> mupdf 1.18.*) so while at it, remove the word "exactly" from the
> comment.
> 
> Signed-off-by: Rapha?l M?lotte <raphael.melotte@mind.be>
> ---
>  package/python-pymupdf/Config.in           |  1 +
>  package/python-pymupdf/python-pymupdf.hash |  6 ++++--
>  package/python-pymupdf/python-pymupdf.mk   | 19 +++++++++++--------
>  3 files changed, 16 insertions(+), 10 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14
  2021-07-20 21:40   ` Thomas Petazzoni
@ 2021-07-20 21:40     ` Thomas Petazzoni
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2021-07-20 21:40 UTC (permalink / raw)
  To: Raphaël Mélotte; +Cc: Asaf Kahlon, buildroot

On Thu,  1 Jul 2021 01:47:16 +0200
Raphaël Mélotte <raphael.melotte@mind.be> wrote:

> Recent tarballs from PyPI use setuptools instead of distutils, so
> change `PYTHON_PYMUPDF_SETUP_TYPE`.
> 
> They also include a license file, so include it and a hash for it.
> 
> This version also has a new dependency: freetype2.
> 
> PYTHON_PYMUPDF_REMOVE_PATHS is updated to take the new dependency into
> account, but also the sed command are changed to delete include lines
> instead of turning them into empty strings. Indeed, empty include
> strings lead to using multiple `-I` flags which were not followed by
> anything. Depending on the number of empty include strings (because
> two successive `-I` "cancel" each other out), it would have failed to
> compile.
> 
> Also, it turns out the patch version of python-pymupdf doesn't have to
> match mupdf's version (e.g. python-pymupdf 1.18.14 is compatible with
> mupdf 1.18.*) so while at it, remove the word "exactly" from the
> comment.
> 
> Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
> ---
>  package/python-pymupdf/Config.in           |  1 +
>  package/python-pymupdf/python-pymupdf.hash |  6 ++++--
>  package/python-pymupdf/python-pymupdf.mk   | 19 +++++++++++--------
>  3 files changed, 16 insertions(+), 10 deletions(-)

Applied to master, 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Buildroot]  [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte
  2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
                   ` (3 preceding siblings ...)
  2021-07-20 21:38 ` [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Thomas Petazzoni
@ 2021-08-04 14:36 ` Peter Korsgaard
  4 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2021-08-04 14:36 UTC (permalink / raw)
  To: Raphaël Mélotte; +Cc: buildroot

>>>>> "Raphaël" == Raphaël Mélotte <raphael.melotte@mind.be> writes:

 > Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-08-04 14:36 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-30 23:47 [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Raphaël Mélotte
2021-06-30 23:47 ` [Buildroot] [PATCH 2/4] package/gumbo-parser: new package Raphaël Mélotte
2021-07-20 21:39   ` Thomas Petazzoni
2021-07-20 21:39     ` Thomas Petazzoni
2021-06-30 23:47 ` [Buildroot] [PATCH 3/4] package/mupdf: bump to version 1.18.0 Raphaël Mélotte
2021-07-20 21:40   ` Thomas Petazzoni
2021-07-20 21:40     ` Thomas Petazzoni
2021-06-30 23:47 ` [Buildroot] [PATCH 4/4] package/python-pymupdf: bump to version 1.18.14 Raphaël Mélotte
2021-07-20 21:40   ` Thomas Petazzoni
2021-07-20 21:40     ` Thomas Petazzoni
2021-07-20 21:38 ` [Buildroot] [PATCH 1/4] DEVELOPERS: update email address for Raphaël Mélotte Thomas Petazzoni
2021-07-20 21:38   ` Thomas Petazzoni
2021-08-04 14:36 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox