Message ID | 20170522110356.29537-1-Vincent.Riera@imgtec.com |
---|---|
State | Accepted |
Headers | show |
Hello, On Mon, 22 May 2017 12:03:56 +0100, Vicente Olivert Riera wrote: > --enable-libjpeg option is now --enable-dctdecoder=libjpeg, and > --disable-libjpeg is now --enable-dctdecoder=none. See this upstream > commit: > https://cgit.freedesktop.org/poppler/poppler/commit/?id=b286a6b5b1a63563263072305da04604cb022488 > > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> > --- > package/poppler/poppler.hash | 2 +- > package/poppler/poppler.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to next, thanks. Thomas
diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index 4ef5799ad..699e7057b 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 poppler-0.54.0.tar.xz +sha256 537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 poppler-0.55.0.tar.xz diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 056193c59..5757100b5 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPPLER_VERSION = 0.54.0 +POPPLER_VERSION = 0.55.0 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org POPPLER_DEPENDENCIES = fontconfig host-pkgconf @@ -46,10 +46,10 @@ POPPLER_CONF_OPTS += --disable-libtiff endif ifeq ($(BR2_PACKAGE_JPEG),y) -POPPLER_CONF_OPTS += --enable-libjpeg +POPPLER_CONF_OPTS += --enable-dctdecoder=libjpeg POPPLER_DEPENDENCIES += jpeg else -POPPLER_CONF_OPTS += --disable-libjpeg +POPPLER_CONF_OPTS += --enable-dctdecoder=none endif ifeq ($(BR2_PACKAGE_LIBPNG),y)
--enable-libjpeg option is now --enable-dctdecoder=libjpeg, and --disable-libjpeg is now --enable-dctdecoder=none. See this upstream commit: https://cgit.freedesktop.org/poppler/poppler/commit/?id=b286a6b5b1a63563263072305da04604cb022488 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> --- package/poppler/poppler.hash | 2 +- package/poppler/poppler.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)