Compile Poppler over Qt

PATCH New jeremie.scheer at armadeus.com 3 participants 6 messages Apr 1, 2014 – Dec 9, 2014

lore

Share & tools

lore

jeremie.scheer at armadeus.com

author

2014-04-01 09:43 UTC #0 lore raw

PATCH v2 1/1 Compile Poppler over Qt

From: Jeremie Scheer <[email protected]>

Signed-off-by Jeremie Scheer <[email protected]>

---
Changes since v1:
- Remove dependencies that doesn't depend on Qt from Qt package condition

 package/poppler/poppler.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

package/poppler/poppler.mk +9 -1

index 040327f..386e7b8 100644
@@ -7,10 +7,18 @@
 POPPLER_VERSION = 0.24.4
 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
 POPPLER_SITE = http://poppler.freedesktop.org
-POPPLER_DEPENDENCIES = fontconfig
 POPPLER_LICENSE = GPLv2+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_CONF_OPT = --with-font-configuration=fontconfig
+POPPLER_INSTALL_STAGING = YES
+
+POPPLER_DEPENDENCIES = fontconfig
+
+ifeq ($(BR2_PACKAGE_QT),y)
+	POPPLER_DEPENDENCIES += qt
+else
+	POPPLER_CONF_OPT += --disable-poppler-qt4
+endif
 
 ifeq ($(BR2_PACKAGE_LCMS2),y)
 	POPPLER_CONF_OPT += --enable-cms=lcms2

Signature · 1 line

1.7.9.5

Thomas Petazzoni

2014-04-06 10:02 UTC #1 lore raw

PATCH v2 1/1 Compile Poppler over Qt

Hello,

The title of your commit should be:

poppler: allow building Qt support

i.e we always want to have the commit titles to look like:

package/poppler/poppler.mk line 13

Quoted 13 lines · jeremie.scheer at armadeus.com

package/poppler/poppler.mk +1 -1

index 040327f..386e7b8 100644
@@ -7,10 +7,18 @@
 POPPLER_VERSION = 0.24.4
 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
 POPPLER_SITE = http://poppler.freedesktop.org
-POPPLER_DEPENDENCIES = fontconfig
 POPPLER_LICENSE = GPLv2+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_CONF_OPT = --with-font-configuration=fontconfig
+POPPLER_INSTALL_STAGING = YES

The commit log should indicate why this is added.

package/poppler/poppler.mk line 21

Quoted 8 lines

package/poppler/poppler.mk +8 -0

+
+POPPLER_DEPENDENCIES = fontconfig
+
+ifeq ($(BR2_PACKAGE_QT),y)
+	POPPLER_DEPENDENCIES += qt
+else
+	POPPLER_CONF_OPT += --disable-poppler-qt4
+endif

This doesn't really work: BR2_PACKAGE_QT is not sufficient, it also needs QtGui and QtXml. From the Poppler configure.ac:

PKG_CHECK_MODULES(POPPLER_QT4,

                    QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0)

So maybe I would suggest to instead add a Config.in option that looks like this:

config BR2_PACKAGE_POPPLER_QT
bool "qt support"
depends on BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI
select BR2_PACKAGE_QT_XML
help
Some help text

and then in poppler.mk, do:

ifeq ($(BR2_PACKAGE_POPPLER_QT),y)
POPPLER_DEPENDENCIES += qt
POPPLER_CONF_OPT += --enable-poppler-qt4
else
POPPLER_CONF_OPT += --disable-poppler-qt4
endif

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Alan Ott

2014-10-12 19:56 UTC #2 lore raw

cover Updates to Poppler

These changes were proposed by Jeremie Scheer <[email protected]> earlier this year.

Alan Ott (2):
poppler: Add option for Qt support
poppler: Install files into staging

 package/poppler/Config.in  | 9 +++++++++
 package/poppler/poppler.mk | 8 ++++++++
 2 files changed, 17 insertions(+)

Signature · 1 line

2.1.0

Alan Ott

2014-10-12 19:56 UTC #3 lore raw

PATCH 1/2 poppler: Add option for Qt support

Add an option to build the libpoppler-qt4 library.

Signed-off-by Alan Ott <[email protected]>

---
 package/poppler/Config.in  | 9 +++++++++
 package/poppler/poppler.mk | 7 +++++++
 2 files changed, 16 insertions(+)

package/poppler/Config.in +9 -0

index fce296d..08cceb0 100644
@@ -10,5 +10,14 @@ config BR2_PACKAGE_POPPLER
 
 	  http://poppler.freedesktop.org/
 
+config BR2_PACKAGE_POPPLER_QT
+	bool "Qt support for poppler"
+	depends on BR2_PACKAGE_POPPLER
+	depends on BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT_GUI
+	select BR2_PACKAGE_QT_XML
+	help
+	  Build Qt support into the Poppler library
+
 comment "poppler needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

package/poppler/poppler.mk +7 -0

index e4fee3f..a52b079 100644
@@ -61,4 +61,11 @@ else
 	POPPLER_CONF_OPTS += --without-x
 endif
 
+ifeq ($(BR2_PACKAGE_POPPLER_QT),y)
+	POPPLER_DEPENDENCIES += qt
+	POPPLER_CONF_OPTS += --enable-poppler-qt4
+else
+	POPPLER_CONF_OPTS += --disable-poppler-qt4
+endif
+
 $(eval $(autotools-package))

Signature · 1 line

2.1.0

Alan Ott

2014-10-12 19:56 UTC #4 lore raw

PATCH 2/2 poppler: Install files into staging

In reply to Alan Ott

Install poppler's header files into staging.

Signed-off-by Alan Ott <[email protected]>

---
 package/poppler/poppler.mk | 1 +
 1 file changed, 1 insertion(+)

package/poppler/poppler.mk +1 -0

index a52b079..a972325 100644
@@ -10,6 +10,7 @@ POPPLER_SITE = http://poppler.freedesktop.org
 POPPLER_DEPENDENCIES = fontconfig
 POPPLER_LICENSE = GPLv2+
 POPPLER_LICENSE_FILES = COPYING
+POPPLER_INSTALL_STAGING = YES
 POPPLER_CONF_OPTS = --with-font-configuration=fontconfig
 
 ifeq ($(BR2_PACKAGE_LCMS2),y)

Signature · 1 line

2.1.0

Thomas Petazzoni

2014-12-09 23:08 UTC #5 lore raw

cover Updates to Poppler

In reply to Alan Ott

Dear Alan Ott,

Quoted 10 lines · Alan Ott

These changes were proposed by Jeremie Scheer <[email protected]> earlier this year.
Alan Ott (2):
poppler: Add option for Qt support
poppler: Install files into staging
 package/poppler/Config.in  | 9 +++++++++
 package/poppler/poppler.mk | 8 ++++++++
 2 files changed, 17 insertions(+)

Thanks, both patches committed. I've done some minor changes on the first patch in the Config.in file, see:

http://git.buildroot.net/buildroot/commit/?id=fb79843453704ae68cf8d91e2a9cd5359d0b1027
http://git.buildroot.net/buildroot/commit/?id=ed592d6e02275c4402f477693195d941a481e67d

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com