Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -1,23 +0,0 @@
|
||||
Fix syntax issue in configure script
|
||||
|
||||
The change is not done in configure.ac, because the package doesn't
|
||||
autoreconf properly.
|
||||
|
||||
Patch on configure.ac submitted upstream at
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=90292.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/configure
|
||||
===================================================================
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -19738,7 +19738,7 @@
|
||||
CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
|
||||
LIBS="$LIBS $LIBTIFF_LIBS"
|
||||
if test x$enable_libtiff = xyes; then
|
||||
- if test x"$LIBTIFF_LIBS" != ; then
|
||||
+ if test x"$LIBTIFF_LIBS" != x; then
|
||||
ac_fn_cxx_check_func "$LINENO" "TIFFOpen" "ac_cv_func_TIFFOpen"
|
||||
if test "x$ac_cv_func_TIFFOpen" = xyes; then :
|
||||
|
||||
@@ -24,6 +24,15 @@ config BR2_PACKAGE_POPPLER_QT
|
||||
comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405"
|
||||
depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
|
||||
|
||||
config BR2_PACKAGE_POPPLER_QT5
|
||||
bool "Qt5 support"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
select BR2_PACKAGE_QT5BASE_XML
|
||||
help
|
||||
Build Qt support into the Poppler library
|
||||
|
||||
endif
|
||||
|
||||
comment "poppler needs a toolchain w/ C++, threads"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 poppler-0.32.0.tar.xz
|
||||
sha256 e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f poppler-0.51.0.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POPPLER_VERSION = 0.32.0
|
||||
POPPLER_VERSION = 0.51.0
|
||||
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
|
||||
POPPLER_SITE = http://poppler.freedesktop.org
|
||||
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
|
||||
@@ -14,6 +14,13 @@ POPPLER_INSTALL_STAGING = YES
|
||||
POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
|
||||
--enable-xpdf-headers
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO),y)
|
||||
POPPLER_CONF_OPTS += --enable-cairo-output
|
||||
POPPLER_DEPENDENCIES += cairo
|
||||
else
|
||||
POPPLER_CONF_OPTS += --disable-cairo-output
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LCMS2),y)
|
||||
POPPLER_CONF_OPTS += --enable-cms=lcms2
|
||||
POPPLER_DEPENDENCIES += lcms2
|
||||
@@ -21,6 +28,13 @@ else
|
||||
POPPLER_CONF_OPTS += --enable-cms=none
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy)
|
||||
POPPLER_CONF_OPTS += --enable-poppler-glib
|
||||
POPPLER_DEPENDENCIES += libglib2
|
||||
else
|
||||
POPPLER_CONF_OPTS += --disable-poppler-glib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
POPPLER_CONF_OPTS += --enable-libtiff
|
||||
# Help poppler to find libtiff in static linking scenarios
|
||||
@@ -73,6 +87,17 @@ else
|
||||
POPPLER_CONF_OPTS += --disable-poppler-qt4
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
|
||||
POPPLER_DEPENDENCIES += qt5base
|
||||
POPPLER_CONF_OPTS += --enable-poppler-qt5
|
||||
# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
|
||||
endif
|
||||
else
|
||||
POPPLER_CONF_OPTS += --disable-poppler-qt5
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
|
||||
POPPLER_DEPENDENCIES += openjpeg
|
||||
POPPLER_CONF_OPTS += --enable-libopenjpeg
|
||||
|
||||
Reference in New Issue
Block a user