initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
From 1ae5ff981ae0484383c4733c56b72e56a3a37584 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 14 Aug 2021 10:43:13 +0200
|
||||
Subject: [PATCH] glib/poppler-private.h: fix build with gcc 11
|
||||
|
||||
Fix the following build failure with gcc 11:
|
||||
|
||||
In file included from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gthread.h:32,
|
||||
from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib/gasyncqueue.h:32,
|
||||
from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib.h:32,
|
||||
from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/gobject/gbinding.h:28,
|
||||
from /tmp/instance-0/output-1/host/arm-buildroot-linux-gnueabihf/sysroot/usr/include/glib-2.0/glib-object.h:22,
|
||||
from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler.h:22,
|
||||
from /tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:19:
|
||||
/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc: In function 'GType poppler_dest_get_type()':
|
||||
/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-private.h:155:13: error: argument 2 of '__atomic_load' must not be a pointer to a 'volatile' type
|
||||
155 | if (g_once_init_enter (&g_define_type_id__volatile)) { \
|
||||
| ^~~~~~~~~~~~~~~~~
|
||||
/tmp/instance-0/output-1/build/poppler-0.84.0/glib/poppler-action.cc:28:1: note: in expansion of macro 'POPPLER_DEFINE_BOXED_TYPE'
|
||||
28 | POPPLER_DEFINE_BOXED_TYPE (PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free)
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/dfcaac6487aaeb10412c3fe72a23135f8a70fefe
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not needed because of
|
||||
https://gitlab.freedesktop.org/poppler/poppler/-/commit/47de887d7658cfd68df44b3acf710971054f957b]
|
||||
---
|
||||
glib/poppler-private.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/glib/poppler-private.h b/glib/poppler-private.h
|
||||
index 86b587fd..ff15eab0 100644
|
||||
--- a/glib/poppler-private.h
|
||||
+++ b/glib/poppler-private.h
|
||||
@@ -152,7 +152,7 @@ gboolean _poppler_convert_pdf_date_to_gtime (const GooString *date,
|
||||
GType \
|
||||
type_name##_get_type (void) \
|
||||
{ \
|
||||
- static volatile gsize g_define_type_id__volatile = 0; \
|
||||
+ static gsize g_define_type_id__volatile = 0; \
|
||||
if (g_once_init_enter (&g_define_type_id__volatile)) { \
|
||||
GType g_define_type_id = \
|
||||
g_boxed_type_register_static (g_intern_static_string (#TypeName), \
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
config BR2_PACKAGE_POPPLER
|
||||
bool "poppler"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14, constexpr
|
||||
select BR2_PACKAGE_FONTCONFIG
|
||||
help
|
||||
Poppler is a PDF rendering library based on the xpdf-3.0
|
||||
code base.
|
||||
|
||||
http://poppler.freedesktop.org/
|
||||
|
||||
if BR2_PACKAGE_POPPLER
|
||||
|
||||
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
|
||||
|
||||
config BR2_PACKAGE_POPPLER_UTILS
|
||||
bool "command line utils"
|
||||
help
|
||||
Compile poppler command line utils.
|
||||
|
||||
endif
|
||||
|
||||
comment "poppler needs a toolchain w/ wchar, C++, threads, dynamic library, gcc >= 5"
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731 poppler-0.84.0.tar.xz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
@@ -0,0 +1,127 @@
|
||||
################################################################################
|
||||
#
|
||||
# poppler
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POPPLER_VERSION = 0.84.0
|
||||
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
|
||||
POPPLER_SITE = http://poppler.freedesktop.org
|
||||
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
|
||||
POPPLER_LICENSE = GPL-2.0+
|
||||
POPPLER_LICENSE_FILES = COPYING
|
||||
POPPLER_CPE_ID_VENDOR = freedesktop
|
||||
POPPLER_INSTALL_STAGING = YES
|
||||
|
||||
POPPLER_CONF_OPTS = \
|
||||
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
|
||||
-DBUILD_GTK_TESTS=OFF \
|
||||
-DBUILD_QT5_TESTS=OFF \
|
||||
-DBUILD_CPP_TESTS=OFF \
|
||||
-DENABLE_GTK_DOC=OFF
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
POPPLER_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BOOST),y)
|
||||
POPPLER_DEPENDENCIES += boost
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
POPPLER_DEPENDENCIES += jpeg
|
||||
POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=libjpeg -DWITH_JPEG=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_DCTDECODER=none -DWITH_JPEG=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
POPPLER_DEPENDENCIES += gobject-introspection
|
||||
POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
POPPLER_DEPENDENCIES += libpng
|
||||
POPPLER_CONF_OPTS += -DWITH_PNG=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DWITH_PNG=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LCMS2),y)
|
||||
POPPLER_DEPENDENCIES += lcms2
|
||||
POPPLER_CONF_OPTS += -DENABLE_CMS=lcms2
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_CMS=none
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
|
||||
POPPLER_DEPENDENCIES += openjpeg
|
||||
POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=openjpeg2
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_LIBOPENJPEG=none
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
POPPLER_DEPENDENCIES += libcurl
|
||||
POPPLER_CONF_OPTS += -DENABLE_LIBCURL=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_LIBCURL=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_POPPLER_QT5),y)
|
||||
POPPLER_DEPENDENCIES += qt5base
|
||||
POPPLER_CONF_OPTS += -DENABLE_QT5=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_QT5=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_POPPLER_UTILS),y)
|
||||
POPPLER_CONF_OPTS += -DENABLE_UTILS=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_UTILS=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
POPPLER_DEPENDENCIES += zlib
|
||||
POPPLER_CONF_OPTS += -DENABLE_ZLIB=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_ZLIB=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO),y)
|
||||
POPPLER_DEPENDENCIES += cairo
|
||||
POPPLER_CONF_OPTS += -DWITH_Cairo=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DWITH_Cairo=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
POPPLER_DEPENDENCIES += tiff
|
||||
POPPLER_CONF_OPTS += -DWITH_TIFF=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DWITH_TIFF=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
|
||||
POPPLER_DEPENDENCIES += libglib2
|
||||
POPPLER_CONF_OPTS += -DENABLE_GLIB=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DENABLE_GLIB=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
||||
POPPLER_DEPENDENCIES += libnss
|
||||
POPPLER_CONF_OPTS += -DWITH_NSS3=ON
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DWITH_NSS3=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||
POPPLER_CONF_OPTS += -DUSE_FLOAT=OFF
|
||||
else
|
||||
POPPLER_CONF_OPTS += -DUSE_FLOAT=ON
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user