From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-support/poppler/poppler-data_0.4.8.bb | 36 ------------- .../recipes-support/poppler/poppler-data_0.4.9.bb | 36 +++++++++++++ .../poppler/poppler/basename-include.patch | 20 ++++++++ .../recipes-support/poppler/poppler_0.64.0.bb | 58 --------------------- .../recipes-support/poppler/poppler_0.70.1.bb | 59 ++++++++++++++++++++++ 5 files changed, 115 insertions(+), 94 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.64.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.70.1.bb (limited to 'meta-openembedded/meta-oe/recipes-support/poppler') diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb deleted file mode 100644 index 343b6db81..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Encoding files for Poppler" -DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ - correctly render CJK and Cyrrilic." -LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ - file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ - file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ -" - -inherit allarch - -INHIBIT_DEFAULT_DEPS = "1" - -CMAP_RESOURCES_BASE = "https://github.com/adobe-type-tools/cmap-resources/raw/0561ebca035813ed04c3485bca636a0aa7abdc1d/cmapresources_identity-0/CMap" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ - ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ - ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" - -SRC_URI[md5sum] = "00f8989c804de84af0ba2ea629949980" -SRC_URI[sha256sum] = "1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872" -SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" -SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" -SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" -SRC_URI[idv.sha256sum] = "89a85daf7031e93c883e76b9168a226dfd585bf5506e9e1956772163f15cb082" - -do_compile() { -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} - install -d ${D}${datadir}/poppler/cMap - install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ -} - -FILES_${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb new file mode 100644 index 000000000..b2af09715 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb @@ -0,0 +1,36 @@ +SUMMARY = "Encoding files for Poppler" +DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ + correctly render CJK and Cyrrilic." +LICENSE = "BSD & GPLv2 & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ + file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ + file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ +" + +inherit allarch + +INHIBIT_DEFAULT_DEPS = "1" + +CMAP_RESOURCES_BASE = "https://github.com/adobe-type-tools/cmap-resources/raw/0561ebca035813ed04c3485bca636a0aa7abdc1d/cmapresources_identity-0/CMap" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ + ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ + ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" + +SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40" +SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012" +SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" +SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" +SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" +SRC_URI[idv.sha256sum] = "89a85daf7031e93c883e76b9168a226dfd585bf5506e9e1956772163f15cb082" + +do_compile() { +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} + install -d ${D}${datadir}/poppler/cMap + install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ +} + +FILES_${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch new file mode 100644 index 000000000..528528ae7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -0,0 +1,20 @@ +Minic GNU basename() API for non-glibc library e.g. musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: poppler-0.64.0/utils/pdfsig.cc +=================================================================== +--- poppler-0.64.0.orig/utils/pdfsig.cc ++++ poppler-0.64.0/utils/pdfsig.cc +@@ -35,6 +35,10 @@ + #include "Win32Console.h" + #include "numberofcharacters.h" + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + static const char * getReadableSigState(SignatureValidationStatus sig_vs) + { + switch(sig_vs) { diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.64.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.64.0.bb deleted file mode 100644 index 1e87ae6e6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.64.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ - file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ - " -SRC_URI[md5sum] = "f7f687ebb60004f8ad61994575018044" -SRC_URI[sha256sum] = "b21df92ca99f78067785cf2dc8e06deb04726b62389c0ee1f5d8b103c77f64b1" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_XPDF_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # git-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -def get_poppler_fpu_setting(bb, d): - if d.getVar('TARGET_FPU') in [ 'soft' ]: - return "-DUSE_FIXEDPOINT=ON" - return "" - -EXTRA_OECMAKE += "${@get_poppler_fpu_setting(bb, d)}" - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.70.1.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.70.1.bb new file mode 100644 index 000000000..b618f28c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.70.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch \ + file://0001-glib-CMakeLists.txt-Add-libpoppler-to-link-along-wit.patch \ + file://basename-include.patch \ + " +SRC_URI[md5sum] = "fdb0699e9aa20e81acd1a50701374c8b" +SRC_URI[sha256sum] = "66972047d9ef8162cc8c389d7e7698291dfc9f2b3e4ea9a9f08ae604107451bd" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_XPDF_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # git-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +def get_poppler_fpu_setting(bb, d): + if d.getVar('TARGET_FPU') in [ 'soft' ]: + return "-DUSE_FIXEDPOINT=ON" + return "" + +EXTRA_OECMAKE += "${@get_poppler_fpu_setting(bb, d)}" + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" -- cgit v1.2.3