[ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update
@ 2018-09-18  9:36 Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1 Roland Hieber
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Roland Hieber @ 2018-09-18  9:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber, Michael Grzeschik

The initial poppler patch series by Michael broke cups-filters, which did not
build with the new poppler. Update cups-filters to fix this, and also update
qpdf, on which the newer cups-filters depends.

Changes v1 -> v2:
 - include qpdf and cups-filters version bumps
 - add my Tested-by tags to Michael's patches


Michael Grzeschik (2):
  poppler-data: version bump to v0.4.9
  poppler: version bump to v0.68.0

Roland Hieber (2):
  qpdf: version bump 7.0.0 -> 8.2.1
  cups-filters: version bump 1.17.9 -> 1.21.2

 ...e-libjpeg-dependency-from-pkg-config.patch | 40 -------------------
 patches/qpdf-7.0.0/series                     |  4 --
 patches/qpdf-8.2.1/autogen.sh                 |  1 +
 rules/cups-filters.in                         |  6 +++
 rules/cups-filters.make                       |  5 ++-
 rules/poppler-data.make                       |  4 +-
 rules/poppler.make                            |  6 +--
 rules/qpdf.make                               |  6 +--
 8 files changed, 18 insertions(+), 54 deletions(-)
 delete mode 100644 patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch
 delete mode 100644 patches/qpdf-7.0.0/series
 create mode 120000 patches/qpdf-8.2.1/autogen.sh

-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1
  2018-09-18  9:36 [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update Roland Hieber
@ 2018-09-18  9:36 ` Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 2/4] cups-filters: version bump 1.17.9 -> 1.21.2 Roland Hieber
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2018-09-18  9:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber, Michael Grzeschik

Development moved to GitHub.

Remove patch, qpdf now builds fine without it (see referenced Pull
Request). However, it needs to generate its own ./configure first, so
symlink autogen.sh.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 ...e-libjpeg-dependency-from-pkg-config.patch | 40 -------------------
 patches/qpdf-7.0.0/series                     |  4 --
 patches/qpdf-8.2.1/autogen.sh                 |  1 +
 rules/qpdf.make                               |  6 +--
 4 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch
 delete mode 100644 patches/qpdf-7.0.0/series
 create mode 120000 patches/qpdf-8.2.1/autogen.sh

diff --git a/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch b/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch
deleted file mode 100644
index 7255159a1..000000000
--- a/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Roland Hieber <r.hieber@pengutronix.de>
-Date: Mon, 25 Sep 2017 13:01:04 +0200
-Subject: [PATCH] Remove libjpeg dependency from pkg-config
-
-I'm linking QPDF with the original libjpeg-9a from http://ijg.org. This
-works well. But when I then compile cups-filters with QPDF support,
-cups-filters' configure is confused about it, because libjpeg does not
-ship pkg-config definitions:
-
-	[...]
-	checking for ZLIB... yes
-	checking for LIBQPDF... no
-	configure: error: Package requirements (libqpdf >= 3.0.2) were not met:
-
-	Package 'libjpeg', required by 'libqpdf', not found
-
-	Consider adjusting the PKG_CONFIG_PATH environment variable if you
-	installed software in a non-standard prefix.
-
-We cannot solve this problem in QPDF, so just remove the libjpeg
-dependency from the Requires.private variable.
-
-Forwarded: https://github.com/qpdf/qpdf/pull/157
-Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
----
- libqpdf.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libqpdf.pc.in b/libqpdf.pc.in
-index d45df49ed73b..8ece48734941 100644
---- a/libqpdf.pc.in
-+++ b/libqpdf.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libqpdf
- Description: PDF transformation library
- Version: @PACKAGE_VERSION@
--Requires.private: zlib, libjpeg
-+Requires.private: zlib
- Libs: -L${libdir} -lqpdf
- Cflags: -I${includedir}
diff --git a/patches/qpdf-7.0.0/series b/patches/qpdf-7.0.0/series
deleted file mode 100644
index 0de60c199..000000000
--- a/patches/qpdf-7.0.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Remove-libjpeg-dependency-from-pkg-config.patch
-# c373cfc66b49ecd3549c751d0c0febbe  - git-ptx-patches magic
diff --git a/patches/qpdf-8.2.1/autogen.sh b/patches/qpdf-8.2.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/qpdf-8.2.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/qpdf.make b/rules/qpdf.make
index 5995f22b2..b13945bac 100644
--- a/rules/qpdf.make
+++ b/rules/qpdf.make
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_QPDF) += qpdf
 #
 # Paths and names
 #
-QPDF_VERSION	:= 7.0.0
-QPDF_MD5	:= c3ff408f69b3a6b2b3b4c8b373b2600c
+QPDF_VERSION	:= 8.2.1
+QPDF_MD5	:= 36661781b5d57a85664dc15deda4df78
 QPDF		:= qpdf-$(QPDF_VERSION)
 QPDF_SUFFIX	:= tar.gz
-QPDF_URL	:= $(call ptx/mirror, SF, /qpdf/qpdf/$(QPDF_VERSION)/$(QPDF).$(QPDF_SUFFIX))
+QPDF_URL	:= https://github.com/qpdf/qpdf/archive/release-$(QPDF).$(QPDF_SUFFIX)
 QPDF_SOURCE	:= $(SRCDIR)/$(QPDF).$(QPDF_SUFFIX)
 QPDF_DIR	:= $(BUILDDIR)/$(QPDF)
 QPDF_LICENSE	:= Apache-2.0
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH v2 2/4] cups-filters: version bump 1.17.9 -> 1.21.2
  2018-09-18  9:36 [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1 Roland Hieber
@ 2018-09-18  9:36 ` Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 3/4] poppler-data: version bump to v0.4.9 Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0 Roland Hieber
  3 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2018-09-18  9:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Roland Hieber, Michael Grzeschik

One new config option to build additional filters, make it disablable to
save space.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/cups-filters.in   | 6 ++++++
 rules/cups-filters.make | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rules/cups-filters.in b/rules/cups-filters.in
index 70803c3e5..a2acf5d3f 100644
--- a/rules/cups-filters.in
+++ b/rules/cups-filters.in
@@ -45,6 +45,12 @@ config CUPS_FILTERS_POPPLER
 comment "poppler support will not build with POPPLER_SPLASH_FIXED!"
 	depends on (POPPLER_SPLASH_FIXED && CUPS_FILTERS_POPPLER)
 
+config CUPS_FILTERS_OPVP
+	bool "build OPVP filters"
+	select CUPS_FILTERS_POPPLER
+	help
+	  Enable OpenPrinting Vector filter. This includes pdftoopvp.
+
 config CUPS_FILTERS_IMAGEFILTERS
 	bool "build image filters"
 	help
diff --git a/rules/cups-filters.make b/rules/cups-filters.make
index a028bb5b7..9c2476a25 100644
--- a/rules/cups-filters.make
+++ b/rules/cups-filters.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CUPS_FILTERS) += cups-filters
 #
 # Paths and names
 #
-CUPS_FILTERS_VERSION	:= 1.17.9
-CUPS_FILTERS_MD5	:= 2ef5f2b902bcdcb963c5ef5858976bbc
+CUPS_FILTERS_VERSION	:= 1.21.2
+CUPS_FILTERS_MD5	:= 639657f20f495e9392061ea6712f868e
 CUPS_FILTERS		:= cups-filters-$(CUPS_FILTERS_VERSION)
 CUPS_FILTERS_SUFFIX	:= tar.xz
 CUPS_FILTERS_URL	:= http://openprinting.org/download/cups-filters/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX)
@@ -49,6 +49,7 @@ CUPS_FILTERS_CONF_OPT	:= \
 	--disable-mutool \
 	--disable-ghostscript \
 	--disable-ijs \
+	--$(call ptx/endis,PTXCONF_CUPS_FILTERS_OPVP)-opvp \
 	--disable-gs-ps2write \
 	--disable-foomatic \
 	--disable-werror \
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH v2 3/4] poppler-data: version bump to v0.4.9
  2018-09-18  9:36 [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1 Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 2/4] cups-filters: version bump 1.17.9 -> 1.21.2 Roland Hieber
@ 2018-09-18  9:36 ` Roland Hieber
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0 Roland Hieber
  3 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2018-09-18  9:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Michael Grzeschik

From: Michael Grzeschik <m.grzeschik@pengutronix.de>

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Tested-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/poppler-data.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/poppler-data.make b/rules/poppler-data.make
index 956747847..b3236d667 100644
--- a/rules/poppler-data.make
+++ b/rules/poppler-data.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_POPPLER_DATA) += poppler-data
 #
 # Paths and names
 #
-POPPLER_DATA_VERSION	:= 0.4.8
-POPPLER_DATA_MD5	:= 00f8989c804de84af0ba2ea629949980
+POPPLER_DATA_VERSION	:= 0.4.9
+POPPLER_DATA_MD5	:= 35cc7beba00aa174631466f06732be40
 POPPLER_DATA		:= poppler-data-$(POPPLER_DATA_VERSION)
 POPPLER_DATA_SUFFIX	:= tar.gz
 POPPLER_DATA_URL	:= https://poppler.freedesktop.org/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX)
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0
  2018-09-18  9:36 [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update Roland Hieber
                   ` (2 preceding siblings ...)
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 3/4] poppler-data: version bump to v0.4.9 Roland Hieber
@ 2018-09-18  9:36 ` Roland Hieber
  2018-09-19  9:08   ` Michael Olbrich
  3 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2018-09-18  9:36 UTC (permalink / raw)
  To: ptxdist; +Cc: Michael Grzeschik

From: Michael Grzeschik <m.grzeschik@pengutronix.de>

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Tested-by: Roland Hieber <r.hieber@pengutronix.de>
---
 rules/poppler.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/poppler.make b/rules/poppler.make
index 229d85fe2..270a8a6a0 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -22,8 +22,8 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler
 #
 # Paths and names
 #
-POPPLER_VERSION	:= 0.61.1
-POPPLER_MD5	:= 2d3dcea88d6a814317fac74d2a16c3cd
+POPPLER_VERSION	:= 0.68.0
+POPPLER_MD5	:= 722ea5837cdfaae4c98607987000de30
 POPPLER		:= poppler-$(POPPLER_VERSION)
 POPPLER_SUFFIX	:= tar.xz
 POPPLER_URL	:= http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
@@ -85,7 +85,7 @@ POPPLER_CONF_OPT	:= \
 	-DENABLE_ZLIB=$(call ptx/onoff,PTXCONF_POPPLER_ZLIB) \
 	-DENABLE_ZLIB_UNCOMPRESS=NO \
 	-DENABLE_LIBCURL=$(call ptx/onoff,PTXCONF_POPPLER_CURL) \
-	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,)
+	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,none)
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

* Re: [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0
  2018-09-18  9:36 ` [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0 Roland Hieber
@ 2018-09-19  9:08   ` Michael Olbrich
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2018-09-19  9:08 UTC (permalink / raw)
  To: Roland Hieber; +Cc: Michael Grzeschik, ptxdist

On Tue, Sep 18, 2018 at 11:36:39AM +0200, Roland Hieber wrote:
> From: Michael Grzeschik <m.grzeschik@pengutronix.de>
> 
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> Tested-by: Roland Hieber <r.hieber@pengutronix.de>
> ---
>  rules/poppler.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/poppler.make b/rules/poppler.make
> index 229d85fe2..270a8a6a0 100644
> --- a/rules/poppler.make
> +++ b/rules/poppler.make
> @@ -22,8 +22,8 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler
>  #
>  # Paths and names
>  #
> -POPPLER_VERSION	:= 0.61.1
> -POPPLER_MD5	:= 2d3dcea88d6a814317fac74d2a16c3cd
> +POPPLER_VERSION	:= 0.68.0
> +POPPLER_MD5	:= 722ea5837cdfaae4c98607987000de30
>  POPPLER		:= poppler-$(POPPLER_VERSION)
>  POPPLER_SUFFIX	:= tar.xz
>  POPPLER_URL	:= http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
> @@ -85,7 +85,7 @@ POPPLER_CONF_OPT	:= \
>  	-DENABLE_ZLIB=$(call ptx/onoff,PTXCONF_POPPLER_ZLIB) \
>  	-DENABLE_ZLIB_UNCOMPRESS=NO \
>  	-DENABLE_LIBCURL=$(call ptx/onoff,PTXCONF_POPPLER_CURL) \
> -	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,)
> +	-DENABLE_CMS=$(call ptx/ifdef,PTXCONF_POPPLER_CMS,lcms2,none)

I think the cmake options need some more review. The Qt4 Backend is gone. I
don't know what else may have changed.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.19.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

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

end of thread, other threads:[~2018-09-19  9:08 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-18  9:36 [ptxdist] [PATCH v2 0/4] cups-filters/poppler/qpdf update Roland Hieber
2018-09-18  9:36 ` [ptxdist] [PATCH v2 1/4] qpdf: version bump 7.0.0 -> 8.2.1 Roland Hieber
2018-09-18  9:36 ` [ptxdist] [PATCH v2 2/4] cups-filters: version bump 1.17.9 -> 1.21.2 Roland Hieber
2018-09-18  9:36 ` [ptxdist] [PATCH v2 3/4] poppler-data: version bump to v0.4.9 Roland Hieber
2018-09-18  9:36 ` [ptxdist] [PATCH v2 4/4] poppler: version bump to v0.68.0 Roland Hieber
2018-09-19  9:08   ` Michael Olbrich

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