[ptxdist] [ANNOUNCE] PTXdist 2017.10.0 released
Hi, I'm happy to announce that I've just released ptxdist-2017.10.0. For the most part, we have the usual mix of new packages version bumps and bug fixes. There are some fixes to prepare for gcc 7.x. Debug symbols for glibc where not available in the last two releases. This is fixed now. Thanks to all contributors and - as always - the shortlog below. Enjoy, Michael Olbrich Alexander Dahl (1): tcpdump: Upgrade from 4.9.1 to 4.9.2 Bastian Stender (5): avahi: set FILE_OFFSET_BITS to work with 64 bit inodes iptables: set FILE_OFFSET_BITS to work with 64 bit inodes avahi: version bump 0.6.31 -> 0.7 barebox: fix CONFIG_DEFAULT_ENVIRONMENT_PATH on (interrupted) oldconfig/nconfig/menuconfig beep: new package Bernhard Walle (1): host-localedef: Fix build with glibc 2.26 Clemens Gruber (1): libgpiod: version bump 0.3 -> 0.3.1 Denis OSTERLAND (8): sudo: version bump 1.8.9p5 -> 1.8.21p2 libwebsockets: version bump to 1.7.9 ntp: version bump 4.2.8p8 -> 4.2.8p10 screen: version bump 4.0.3 -> 4.5.0 lua: Add MIT license information. lua: version bump 5.1.4 -> 5.3.4 luaexpat: version bump 1.2.0 -> 1.3.0 screen: Fix ptxdist error message. Juergen Borleis (6): sudo: provide 'sudoers.d' for individual user files sudo: add missing run-time dependencies sudo: force the system zlib timezone: remove legacy '/etc/timezone' file iptables: bump version and fix large file support fontconfig: add missing dependency Ladislav Michl (2): networkmanager: version bump: 1.8.0 -> 1.8.2 quagga: fix configuration and install options Markus Niebel (5): wpa_supplicant: fix url netperf: fix url lm_sensors: fix url fbtest: version bump 20041102-1 -> 2014-08-11-g29ab066 fbtest: /usr merge Michael Olbrich (49): systemd: version bump 233 -> 234 libssh2: --with(out)-libgcrypt is broken, don't use it wget: don't use c-ares without selecting it ptxd_install_file_strip: fix debug file generation ptxdist: add documentation for -j to --help fontconfig: version bump 2.12.3 -> 2.12.5 configure_helper.py: handle _SUBDIR lz4: version bump r131 -> 1.8.0 host-lz4: add new package kernel: add option to depend on host-lz4 gnutls: version bump 3.3.27 -> 3.6.0 libtasn1: version bump 4.9 -> 4.12 libgpg-error: version bump 1.26 -> 1.27 opkg: version bump 0.3.0 -> 0.3.5 host-opkg-utils: version bump r4747 -> 0.3.5 python3: version bump 3.5.3 -> 3.5.4 quagga: install missing library quagga: add missing dependencies protobuf: add new md5sum opkg: add autogen.sh audiofile: version bump 0.3.4 -> 0.3.6 ncurses: don't build C++ bindings libelf: version bump 0.169 -> 0.170 systemd-bootchart: version bump 231 -> 233 iproute2: version bump 4.10.0 -> 4.13.0 gstreamer1: add linker search paths gst-plugins-base1: add linker search paths openocd: disable Werror gstreamer1: version bump 1.12.1 -> 1.12.3 gst-plugins-base1: version bump 1.12.1 -> 1.12.3 gst-plugins-good1: version bump 1.12.1 -> 1.12.3 gst-plugins-bad1: version bump 1.12.1 -> 1.12.3 gst-plugins-ugly1: version bump 1.12.1 -> 1.12.3 gst-libav1: version bump 1.12.1 -> 1.12.3 gst-python1: version bump 1.12.1 -> 1.12.3 gst-rtsp-server1: version bump 1.12.1 -> 1.12.3 gst-validate1: version bump 1.12.1 -> 1.12.3 gstreamer-vaapi1: version bump 1.12.1 -> 1.12.3 cryptsetup: cleanup configure options libtirpc: version bump 1.0.1 -> 1.0.2 radvd: fix building with newer kernel headers libelf: fix building with gcc-7.x and icecc kernel: fix building perf with gcc-7.x and icecc qt4: fix building with gcc-7.x optee-client: fix building with gcc-7.x and icecc luaexpat: cleanup and version fixes kernel: build perf without -Werror ptxdist: fix printing variables that are not valid shell variable names rauc: add keyring section to example system.conf Sascha Hauer (1): cryptsetup: new package Ulrich Ölmann (8): doc: pre-built packages: fix typos doc: pre-built packages: adjust capitalization in headings doc: pre-built packages: use consistent style in enumerations doc: pre-built packages: english genitive uses an apostrophe doc: pre-built packages: enhance phrasing doc: pre-built packages: some additions networkmanager: version bump: 1.8.2-> 1.8.4 polkit: automake: add missing conditional HAVE_INTROSPECTION -- 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- | s
[ptxdist] Building perf from ptxdist
Hi, Can anyone give me some guidelines as to how you could go about building perf (held with the kernel sources) under ptxdist. In particular, I need it to pick up libelf for enabling userspace tracing on target. Thanks, Jon. -- Jon Bird, CEng MBCS Software Engineer Electronic Systems General Dynamics United Kingdom Ltd. Castleham Road, St Leonards on Sea, East Sussex, TN38 9NJ Telephone: +441424798278 Email: jon.b...@gd-ms.uk Website: www.generaldynamics.uk.com -- This email and any files attached are intended for the addressee and may contain information of a confidential nature. If you are not the intended recipient, be aware that this email was sent to you in error and you should not disclose, distribute, print, copy or make other use of this email or its attachments. Such actions, in fact, may be unlawful. In compliance with the various Regulations and Acts, General Dynamics United Kingdom Limited reserves the right to monitor (and examine for viruses) all emails and email attachments, both inbound and outbound. Email communications and their attachments may not be secure or error- or virus-free and the company does not accept liability or responsibility for such matters or the consequences thereof. General Dynamics United Kingdom Limited, Registered Office: 21 Holborn Viaduct, London EC1A 2DY. Registered in England and Wales No: 1911653. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Building perf from ptxdist
Hello Jon, Am Mittwoch, 25. Oktober 2017, 09:16:29 CEST schrieb jon.b...@gd-ms.uk: > Can anyone give me some guidelines as to how you could go about building > perf (held with the kernel sources) under ptxdist. In particular, I need it > to pick up libelf for enabling userspace tracing on target. Go to menuconfig --> Core (libc, locales) --> kernel tools --> perf It should just work activating and using it on target, if you set the right kernel config options. (It doesn't work on my target though, I asked about it on IRC lately, but got no help. On a at91sam9g20 SoC with 32 MB of RAM leads to perf segfaulting on start, and strace leads me to the assumption there's not enough memory. :-/ ) Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Building perf from ptxdist
Hi Alexander, On 2017-10-25, Alexander Dahl wrote: > Hello Jon, > > Am Mittwoch, 25. Oktober 2017, 09:16:29 CEST schrieb jon.b...@gd-ms.uk: >> Can anyone give me some guidelines as to how you could go about >> building perf (held with the kernel sources) under ptxdist. In >> particular, I need it to pick up libelf for enabling userspace tracing on >> target. > > Go to menuconfig --> Core (libc, locales) --> kernel tools --> perf > > It should just work activating and using it on target, if you set the > right kernel config options. > I don't have that option in the version of ptxdist I'm using (2016-04) so I'm guessing this is a fairly new option then? Either way, that's helpful because I can probably just lift the necessary scripts etc. into my existing version or do an upgrade. > (It doesn't work on my target though, I asked about it on IRC lately, > but got no help. On a at91sam9g20 SoC with 32 MB of RAM leads to perf > segfaulting on start, and strace leads me to the assumption there's not > enough memory. > :-/ ) > I have a little more RAM on my target board than that so hopefully I won't run into that problem. Thanks, Jon. -- Jon Bird, CEng MBCS Software Engineer Electronic Systems General Dynamics United Kingdom Ltd. Castleham Road, St Leonards on Sea, East Sussex, TN38 9NJ Telephone: +441424798278 Email: jon.b...@gd-ms.uk Website: www.generaldynamics.uk.com -- This email and any files attached are intended for the addressee and may contain information of a confidential nature. If you are not the intended recipient, be aware that this email was sent to you in error and you should not disclose, distribute, print, copy or make other use of this email or its attachments. Such actions, in fact, may be unlawful. In compliance with the various Regulations and Acts, General Dynamics United Kingdom Limited reserves the right to monitor (and examine for viruses) all emails and email attachments, both inbound and outbound. Email communications and their attachments may not be secure or error- or virus-free and the company does not accept liability or responsibility for such matters or the consequences thereof. General Dynamics United Kingdom Limited, Registered Office: 21 Holborn Viaduct, London EC1A 2DY. Registered in England and Wales No: 1911653. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Building perf from ptxdist
Hei hei, Am Mittwoch, 25. Oktober 2017, 09:51:05 CEST schrieb jon.b...@gd-ms.uk: > > Go to menuconfig --> Core (libc, locales) --> kernel tools --> perf > > > > It should just work activating and using it on target, if you set the > > right kernel config options. > > > > I don't have that option in the version of ptxdist I'm using (2016-04) so > I'm guessing this is a fairly new option then? Either way, that's helpful > because I can probably just lift the necessary scripts etc. into my > existing version or do an upgrade. I just had a look in the ptxdist git repo and it seems this was in deed added after 2016.04.0, in fact it was added in 2016.05.0. The chances are quite good you could migrate to a slightly newer version or backport those changes to your BSP. ;-) Greets Alex ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] php5: version bump to 5.6.31
On Thu, Oct 12, 2017 at 01:33:15PM +, Thorsten LIEPERT wrote: > --- > .../0001-Fix-dl-cross-compiling-issue.patch| 80 > ++ > patches/php-5.6.31/autogen.sh | 12 > patches/php-5.6.31/series | 5 ++ > rules/php5.make| 13 ++-- > 4 files changed, 104 insertions(+), 6 deletions(-) > create mode 100644 patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch > create mode 100755 patches/php-5.6.31/autogen.sh > create mode 100755 patches/php-5.6.31/series This patch does not apply. All white-spaces seem to be broken somehow. > > diff --git a/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch > b/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch > new file mode 100644 > index 0..83cf48529 > --- /dev/null > +++ b/patches/php-5.6.31/0001-Fix-dl-cross-compiling-issue.patch > @@ -0,0 +1,80 @@ > +From 28826829da147d93918bb9a7e5c7a28429bf04eb Mon Sep 17 00:00:00 2001 > +From: Thorsten Liepert > mailto:thorsten.liep...@diehl.com>> > +Date: Mon, 25 Sep 2017 16:46:45 +0200 > +Subject: [PATCH] Fix dl cross compiling issue > + > +ATTN: After patching rerun autogen.sh to regenerate configure > +--- > + configure.in | 5 - > + ext/fileinfo/config.m4 | 4 > + ext/opcache/config.m4 | 16 ++-- > + 3 files changed, 22 insertions(+), 3 deletions(-) > + > +diff --git a/configure.in b/configure.in > +index 3f4a5d5c5517..06200cccd77b 100644 > +--- a/configure.in > b/configure.in > +@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl) > + PHP_CHECK_FUNC(gethostbyaddr, nsl) > + PHP_CHECK_FUNC(yp_get_default_domain, nsl) > + > +-PHP_CHECK_FUNC(dlopen, dl) > ++PHP_ADD_LIBRARY(dl) > ++PHP_DEF_HAVE(dlopen) > ++PHP_DEF_HAVE(libdl) > ++ac_cv_func_dlopen=yes > + if test "$ac_cv_func_dlopen" = "yes"; then > + AC_DEFINE(HAVE_LIBDL, 1, [ ]) > + fi > +diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 > +index 7e98d62d8b2e..c033e26b4c89 100644 > +--- a/ext/fileinfo/config.m4 > b/ext/fileinfo/config.m4 > +@@ -46,6 +46,10 @@ int main(void) > + AC_MSG_RESULT(no) > + AC_MSG_NOTICE(using libmagic strcasestr implementation) > + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" > ++ ],[ > ++dnl cross-compiling; assume not present > ++AC_MSG_NOTICE(using libmagic strcasestr implementation) > ++libmagic_sources="$libmagic_sources libmagic/strcasestr.c" > + ]) > + > + PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, > $ext_shared,,-I@ext_srcdir@/libmagic) > +diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 > +index 5a8b86c14884..a83330fdbdc1 100644 > +--- a/ext/opcache/config.m4 > b/ext/opcache/config.m4 > +@@ -341,7 +341,14 @@ AC_TRY_RUN([ > + flock_type=linux > + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) > + AC_MSG_RESULT("yes") > +-], AC_MSG_RESULT("no") ) > ++], [ > ++AC_MSG_RESULT("no") > ++], [ > ++dnl cross-compiling; assume Linux > ++ flock_type=linux > ++AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) > ++AC_MSG_RESULT("yes") > ++]) > + > + AC_MSG_CHECKING("whether flock struct is BSD ordered") > + AC_TRY_RUN([ > +@@ -357,7 +364,12 @@ AC_TRY_RUN([ > + flock_type=bsd > + AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) > + AC_MSG_RESULT("yes") > +-], AC_MSG_RESULT("no") ) > ++], [ > ++AC_MSG_RESULT("no") > ++], [ > ++dnl cross-compiling; assume Linux > ++AC_MSG_RESULT("no") > ++]) > + > + if test "$flock_type" = "unknown"; then > + AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set > --enable-opcache=no]) > +-- > +2.14.1 > + > diff --git a/patches/php-5.6.31/autogen.sh b/patches/php-5.6.31/autogen.sh > new file mode 100755 > index 0..f146de5ee > --- /dev/null > +++ b/patches/php-5.6.31/autogen.sh > @@ -0,0 +1,12 @@ > +#!/bin/bash > +aclocal $ACLOCAL_FLAGS > +libtoolize \ > +--force \ > +--copy > +autoreconf \ > +--force \ > +--install \ > +--warnings=cross \ > +--warnings=syntax \ > +--warnings=obsolete \ > +--warnings=unsupported This looks like a copy of the default autogen.sh. Just provide a symlink to that. Michael > diff --git a/patches/php-5.6.31/series b/patches/php-5.6.31/series > new file mode 100755 > index 0..6578e212b > --- /dev/null > +++ b/patches/php-5.6.31/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +#tag:debian --start-number 1 > +0001-Fix-dl-cross-compiling-issue.patch > +# 47bad7181a14104ba3ccd05bdf62ba7e - git-ptx-patches magic > diff --git a/rules/php5.make b/rules/php5.make > index cc9dc8e10..8525ec777 100644 > --- a/rules/php5.make > +++ b/rules/php5.make > @@ -18,12 +18,13 @@ PACKAGES-$(PTXCONF_PHP5) += php5 > # > # Paths and names > # > -PHP5_VERSION := 5.5.30 > -PHP5_MD5 := ef6d848756ea9d19b7a7e1a9d824d7c1 > -PHP5 := php-$(PHP5_VERSION) > -PHP5_SUFFIX := tar.xz > -P
Re: [ptxdist] [PATCH 3/6] libpng: version bump 1.6.32 -> 1.6.34
On Wed, Oct 18, 2017 at 04:11:43PM +0200, Clemens Gruber wrote: > Set check instead of api to automatically use NEON if runtime-checks > succeed, instead of having to enable it from library user code. > > Signed-off-by: Clemens Gruber > --- > rules/libpng.make | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/rules/libpng.make b/rules/libpng.make > index 2bfe30260..e110f0275 100644 > --- a/rules/libpng.make > +++ b/rules/libpng.make > @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng > # > # Paths and names > # > -LIBPNG_VERSION := 1.6.32 Hmmm, I'm seeing 1.6.29 as the current version. Michael > -LIBPNG_MD5 := e01be057a9369183c959b793a685ad15 > +LIBPNG_VERSION := 1.6.34 > +LIBPNG_MD5 := c05b6ca7190a5e387b78657dbe5536b2 > LIBPNG := libpng-$(LIBPNG_VERSION) > LIBPNG_SUFFIX:= tar.xz > LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) > @@ -37,7 +37,7 @@ LIBPNG_CONF_OPT := \ > --enable-unversioned-links \ > --enable-unversioned-libpng-pc \ > --enable-unversioned-libpng-config \ > - --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, api, no) \ > + --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, check, no) \ > --disable-mips-msa \ > --$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \ > --disable-powerpc-vsx \ > -- > 2.14.2 > > > ___ > 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- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 3/6] libpng: version bump 1.6.32 -> 1.6.34
On 25.10.2017 16:30, Michael Olbrich wrote: > On Wed, Oct 18, 2017 at 04:11:43PM +0200, Clemens Gruber wrote: >> -LIBPNG_VERSION := 1.6.32 > > Hmmm, I'm seeing 1.6.29 as the current version. To add to the confusion, [libpng] speaks of 1.6.32 as the current version, while [sfio] and the SF.net project page already knows 1.6.34! [libpng]: http://libpng.org/pub/png/libpng.html [sfio]: https://libpng.sourceforge.io/index.html - Roland ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2 7/7] cups-filters: new package: additional filters and backends for CUPS
On 30.09.2017 14:00, Michael Olbrich wrote: > On Wed, Sep 27, 2017 at 02:22:22PM +0200, Roland Hieber wrote: >> Upstream is very responsive, merged my patches and made a new release >> while I was still packaging the old one :) Release frequency is high, >> with 5 point releases in September alone, mostly small fixes. >> >> Signed-off-by: Roland Hieber >> --- >> >> Notes: >> changes in v1 -> v2: >> - kconfig changes due to poppler float/fixed simplification >> - version bump 1.16.6 -> 1.17.7 (they release fast!) >> - remove unneeded code >> >> rules/cups-filters.in | 67 +++ >> rules/cups-filters.make | 94 >> + >> 2 files changed, 161 insertions(+) >> create mode 100644 rules/cups-filters.in >> create mode 100644 rules/cups-filters.make >> >> diff --git a/rules/cups-filters.in b/rules/cups-filters.in >> new file mode 100644 >> index 0..09652443f >> --- /dev/null >> +++ b/rules/cups-filters.in >> @@ -0,0 +1,67 @@ >> +## SECTION=applications >> + >> +menuconfig CUPS_FILTERS >> +tristate >> +prompt "cups-filters " >> + >> +select LIBC_DL >> +select HOST_CUPS >> +select CUPS >> +select GLIB >> +select ZLIB >> +select LCMS >> +select FREETYPE >> +select FONTCONFIG >> +select QPDF >> + >> +# Note: configure does not check for these poppler options: >> +select POPPLER if CUPS_FILTERS_POPPLER >> +select POPPLER_BIN if CUPS_FILTERS_POPPLER # for pdftops >> +select POPPLER_CPP if CUPS_FILTERS_POPPLER >> +select POPPLER_CMS if CUPS_FILTERS_POPPLER >> +select POPPLER_SPLASH if CUPS_FILTERS_POPPLER >> +select POPPLER_XPDF if CUPS_FILTERS_POPPLER >> + >> +select LIBJPEG if CUPS_FILTERS_JPEG >> +select LIBPNG if CUPS_FILTERS_PNG >> + >> +help >> + cups-filters contains backends, filters, and other software that >> + was once part of the core CUPS distribution but is no longer >> + maintained by Apple Inc. In addition it contains additional filters >> + and software developed independently of Apple, especially filters for >> + the PDF-centric printing workflow introduced by OpenPrinting and a >> + daemon to browse Bonjour broadcasts of remote CUPS printers and makes >> + these printers available locally. >> + >> +if CUPS_FILTERS >> + >> +config CUPS_FILTERS_POPPLER >> +bool "build with poppler support" >> +help >> + Build with poppler support, needed for pdfto* filters and banners. >> + >> +comment "poppler support will not build with POPPLER_SPLASH_FIXED!" >> +depends on (POPPLER_SPLASH_FIXED && CUPS_FILTERS_POPPLER) >> + >> +config CUPS_FILTERS_IMAGEFILTERS >> +bool "build image filters" >> +help >> + Build imagetopdf and imagetoraster filters >> + >> +config CUPS_FILTERS_JPEG >> +bool "with JPEG support" >> +depends on CUPS_FILTERS_IMAGEFILTERS >> +default y >> +help >> + Enable JPEG support in image filters >> + >> +config CUPS_FILTERS_PNG >> +bool "with PNG support" >> +depends on CUPS_FILTERS_IMAGEFILTERS >> +default y >> +help >> + Enable PNG support in image filters >> + >> +endif >> +# vim: ft=kconfig ts=8 noet tw=80 >> diff --git a/rules/cups-filters.make b/rules/cups-filters.make >> new file mode 100644 >> index 0..0f19d6c11 >> --- /dev/null >> +++ b/rules/cups-filters.make >> @@ -0,0 +1,94 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2017 by Roland Hieber >> +# >> +# See CREDITS for details about who has contributed to this project. >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_CUPS_FILTERS) += cups-filters >> + >> +# >> +# Paths and names >> +# >> +CUPS_FILTERS_VERSION:= 1.17.7 >> +CUPS_FILTERS_MD5:= 015caac191e9520abb7cde2fb9ce5961 >> +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) >> +CUPS_FILTERS_SOURCE := $(SRCDIR)/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX) >> +CUPS_FILTERS_DIR:= $(BUILDDIR)/$(CUPS_FILTERS) >> +CUPS_FILTERS_LICENSE:= GPL-2.0 AND GPL-2.0+ AND GPL-3.0 AND >> GPL-3.0+ AND LGPL-2 AND LGPL-2.1+ AND MIT AND BSD-4-clause >> + >> +# >> >> +# Prepare >> +# >> >> + >> +# >> +# autoconf >> +# >> +# We have to set --exec-prefix and --libdir, otherwise the libs end up in >> +# ${prefix}/lib64 due to broken autoconf magic, which is not what we want. >> +# >> +CUPS_FILTERS_CONF_TOO
[ptxdist] [PATCH v3 1/7] libpaper: new package: system-wide papersize configuration
Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - libpaper.make: ifeq -> ifdef patches/libpaper-1.1.24+nmu5/autogen.sh | 2 + rules/libpaper.in | 38 ++ rules/libpaper.make | 69 + 3 files changed, 109 insertions(+) create mode 100755 patches/libpaper-1.1.24+nmu5/autogen.sh create mode 100644 rules/libpaper.in create mode 100644 rules/libpaper.make diff --git a/patches/libpaper-1.1.24+nmu5/autogen.sh b/patches/libpaper-1.1.24+nmu5/autogen.sh new file mode 100755 index 0..5d4c48990 --- /dev/null +++ b/patches/libpaper-1.1.24+nmu5/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec autoreconf --install diff --git a/rules/libpaper.in b/rules/libpaper.in new file mode 100644 index 0..b70c1000b --- /dev/null +++ b/rules/libpaper.in @@ -0,0 +1,38 @@ +## SECTION=multimedia_libs + +menuconfig LIBPAPER + tristate + prompt "libpaper " + select HOST_AUTOTOOLS_AUTOCONF + select HOST_AUTOTOOLS_LIBTOOL + help + System-wide paper size configuration + +if LIBPAPER + +config LIBPAPER_SIZE + string "default fallback paper size" + default "letter" + help + Paper size that is used if nothing else is specified in + /etc/papersize. Currently libpaper knows about the following formats: + + 10x14 11x17 Comm10 DL Monarch a0 a1 a10 a2 a3 a4 a5 a6 a7 a8 a9 archA + archB archC archD archE b0 b1 b10 b2 b3 b4 b5 b6 b7 b8 b9 c2 c3 c4 c5 + c6 c7 c8 csheet dsheet esheet executive flsa flse folio halfexecutive + halfletter ledger legal letter note quarto statement tabloid + +config LIBPAPER_PAPERCONFIG + bool "install paperconfig" + help + Install the paperconfig tool which sets the default paper size of the + system + +config LIBPAPER_PAPERCONF + bool "install paperconf" + help + Install the paperconf tool which prints information about a specific + paper size + +endif +# vim: ft=kconfig ts=8 noet tw=80 diff --git a/rules/libpaper.make b/rules/libpaper.make new file mode 100644 index 0..c3bf16b0a --- /dev/null +++ b/rules/libpaper.make @@ -0,0 +1,69 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBPAPER) += libpaper + +# +# Paths and names +# +# libpaper seems to be maintained only as a Debian package, therefore the +# unusual versioning. +# +LIBPAPER_VERSION := 1.1.24+nmu5 +LIBPAPER_MD5 := 38bc55688c0fc5544edaa5a951a45fbd +LIBPAPER := libpaper-$(LIBPAPER_VERSION) +LIBPAPER_SUFFIX:= tar.gz +LIBPAPER_URL := http://snapshot.debian.org/archive/debian-debug/20161113T151229Z/pool/main/libp/libpaper/libpaper_$(LIBPAPER_VERSION).$(LIBPAPER_SUFFIX) +LIBPAPER_SOURCE:= $(SRCDIR)/$(LIBPAPER).$(LIBPAPER_SUFFIX) +LIBPAPER_DIR := $(BUILDDIR)/$(LIBPAPER) +LIBPAPER_LICENSE := GPL-2.0 + +# +# Prepare +# + +LIBPAPER_CONF_ENV := \ + $(CROSS_ENV) \ + PAPERSIZE=$(PTXCONF_LIBPAPER_SIZE) +# +# autoconf +# +LIBPAPER_CONF_TOOL := autoconf +# +# +# Target-Install +# + +$(STATEDIR)/libpaper.targetinstall: + @$(call targetinfo) + + @$(call install_init, libpaper) + @$(call install_fixup, libpaper,PRIORITY,optional) + @$(call install_fixup, libpaper,SECTION,base) + @$(call install_fixup, libpaper,AUTHOR,"Roland Hieber ") + @$(call install_fixup, libpaper,DESCRIPTION,missing) + + @$(call install_lib, libpaper, 0, 0, 0755, libpaper) + +ifdef PTXCONF_LIBPAPER_PAPERCONFIG + @$(call install_copy, libpaper, 0, 0, 755, -, /usr/sbin/paperconfig) +endif +ifdef PTXCONF_LIBPAPER_PAPERCONF + @$(call install_copy, libpaper, 0, 0, 755, -, /usr/bin/paperconf) +endif + + @$(call install_finish, libpaper) + + @$(call touch) + +# vim: ft=make ts=8 noet tw=80 -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 2/7] qpdf: new package: PDF inspection library and tools
Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - remove unused clean stage template ...Remove-libjpeg-dependency-from-pkg-config.patch | 40 ++ patches/qpdf-7.0.0/series | 4 + rules/qpdf.in | 22 ++ rules/qpdf.make| 87 ++ 4 files changed, 153 insertions(+) create mode 100644 patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch create mode 100644 patches/qpdf-7.0.0/series create mode 100644 rules/qpdf.in create mode 100644 rules/qpdf.make 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 new file mode 100644 index 0..7255159a1 --- /dev/null +++ b/patches/qpdf-7.0.0/0001-Remove-libjpeg-dependency-from-pkg-config.patch @@ -0,0 +1,40 @@ +From: Roland Hieber +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 +--- + 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 new file mode 100644 index 0..0de60c199 --- /dev/null +++ b/patches/qpdf-7.0.0/series @@ -0,0 +1,4 @@ +# 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/rules/qpdf.in b/rules/qpdf.in new file mode 100644 index 0..387e49166 --- /dev/null +++ b/rules/qpdf.in @@ -0,0 +1,22 @@ +## SECTION=system_libraries + +menuconfig QPDF + tristate + prompt "qpdf " + + select LIBJPEG + select ZLIB + + help + QPDF is a library that can be used to linearize (web-optimize), + encrypt (password-protect), decrypt, and inspect PDF files. + +if QPDF + +config QPDF_TOOLS + bool "install tools" + help + Install the tools. Those include qpdf, zlib-flate, and fix-qdf. + +endif +# vim: ft=kconfig ts=8 noet tw=80 diff --git a/rules/qpdf.make b/rules/qpdf.make new file mode 100644 index 0..3d9b4511b --- /dev/null +++ b/rules/qpdf.make @@ -0,0 +1,87 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_QPDF) += qpdf + +# +# Paths and names +# +QPDF_VERSION := 7.0.0 +QPDF_MD5 := c3ff408f69b3a6b2b3b4c8b373b2600c +QPDF := qpdf-$(QPDF_VERSION) +QPDF_SUFFIX:= tar.gz +QPDF_URL := $(call ptx/mirror, SF, /qpdf/qpdf/$(QPDF_VERSION)/$(QPDF).$(QPDF_SUFFIX)) +QPDF_SOURCE:= $(SRCDIR)/$(QPDF).$(QPDF_SUFFIX) +QPDF_DIR := $(BUILDDIR)/$(QPDF) +QPDF_LICENSE := Artistic-2.0 + +# +# Prepare +# + +# We emulate --enable-external-libs as minimally as possible +QPDF_CONF_ENV := \ + $(CROSS_ENV) \ + LIBS="-lz -ljpeg" + +# +# autoconf +# +# Note: --with-random sets RANDOM_SOURCE, which is not used at all when +# --enable-insecure-random is given. Nevertheless, autoconf will try to +# autodetect whether /dev/urandom exists, which fails when cross-compiling. +QPDF_CONF_TOOL := autoconf +QPDF_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-static \ + --enable-libtool-lock \ + --disable-insecure-random \ + --enable-os-secure-random \ + --disable-external-libs \ + $(GLOBAL_LARGE_FILE_OPTION) \ +
[ptxdist] [PATCH v3 7/7] cups-filters: new package: additional filters and backends for CUPS
Filters for a PDF-based printing workflow, and more backends for widely available printing protocols. No PostScript and Foomatic support (yet) because we are missing the respective dependencies in PTXdist. Release frequency is high, with mostly small changes per release. Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - version bump 1.17.7 -> 1.17.9 - with CROSS_AUTOCONF_USR, setting --exec-prefix and --libdir is not needed - add new kconfig option for PCLm support (since 1.17.0) - improved commit message rules/cups-filters.in | 73 +++ rules/cups-filters.make | 90 + 2 files changed, 163 insertions(+) create mode 100644 rules/cups-filters.in create mode 100644 rules/cups-filters.make diff --git a/rules/cups-filters.in b/rules/cups-filters.in new file mode 100644 index 0..b385d60cf --- /dev/null +++ b/rules/cups-filters.in @@ -0,0 +1,73 @@ +## SECTION=applications + +menuconfig CUPS_FILTERS + tristate + prompt "cups-filters " + + select LIBC_DL + select HOST_CUPS + select CUPS + select GLIB + select ZLIB + select LCMS + select FREETYPE + select FONTCONFIG + select QPDF + + # Note: configure does not check for these poppler options: + select POPPLER if CUPS_FILTERS_POPPLER + select POPPLER_BIN if CUPS_FILTERS_POPPLER # for pdftops + select POPPLER_CPP if CUPS_FILTERS_POPPLER + select POPPLER_CMS if CUPS_FILTERS_POPPLER + select POPPLER_SPLASH if CUPS_FILTERS_POPPLER + select POPPLER_XPDF if CUPS_FILTERS_POPPLER + + select LIBJPEG if CUPS_FILTERS_JPEG + select LIBPNG if CUPS_FILTERS_PNG + + help + cups-filters contains backends, filters, and other software that + was once part of the core CUPS distribution but is no longer + maintained by Apple Inc. In addition it contains additional filters + and software developed independently of Apple, especially filters for + the PDF-centric printing workflow introduced by OpenPrinting and a + daemon to browse Bonjour broadcasts of remote CUPS printers and makes + these printers available locally. + +if CUPS_FILTERS + +config CUPS_FILTERS_POPPLER + bool "build with poppler support" + help + Build with poppler support, needed for pdfto* filters and banners. + +comment "poppler support will not build with POPPLER_SPLASH_FIXED!" + depends on (POPPLER_SPLASH_FIXED && CUPS_FILTERS_POPPLER) + +config CUPS_FILTERS_IMAGEFILTERS + bool "build image filters" + help + Build imagetopdf and imagetoraster filters + +config CUPS_FILTERS_PCLM + bool "with PCLm support" + help + Enable PCLm support for printing on Wi-Fi Direct printers via + rastertopclm filter + +config CUPS_FILTERS_JPEG + bool "with JPEG support" + depends on CUPS_FILTERS_IMAGEFILTERS + default y + help + Enable JPEG support in image filters + +config CUPS_FILTERS_PNG + bool "with PNG support" + depends on CUPS_FILTERS_IMAGEFILTERS + default y + help + Enable PNG support in image filters + +endif +# vim: ft=kconfig ts=8 noet tw=80 diff --git a/rules/cups-filters.make b/rules/cups-filters.make new file mode 100644 index 0..8de4a950d --- /dev/null +++ b/rules/cups-filters.make @@ -0,0 +1,90 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_CUPS_FILTERS) += cups-filters + +# +# Paths and names +# +CUPS_FILTERS_VERSION := 1.17.9 +CUPS_FILTERS_MD5 := 2ef5f2b902bcdcb963c5ef5858976bbc +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) +CUPS_FILTERS_SOURCE:= $(SRCDIR)/$(CUPS_FILTERS).$(CUPS_FILTERS_SUFFIX) +CUPS_FILTERS_DIR := $(BUILDDIR)/$(CUPS_FILTERS) +CUPS_FILTERS_LICENSE := GPL-2.0 AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2 AND LGPL-2.1+ AND MIT AND BSD-4-clause + +# +# Prepare +# + +# +# autoconf +# +CUPS_FILTERS_CONF_TOOL := autoconf +CUPS_FILTERS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-silent-rules \ + --disable-driverless \ + --disable-auto-setup-driverless \ + --$(call ptx/endis,PTXCONF_CUPS_FILTERS_IMA
[ptxdist] [PATCH v3 6/7] host-cups: new package: CUPS host tools
Most printer drivers compile model-specific PPDs from a generic schema during the build process, using ppdc, the PPD compiler. ppdc must be able to find CUPS' internal include files, which are architecture- independent and can be used from sysroot-host. Unfortunately, the CUPS build system is rather inflexible, so we have to build the whole core distribution to get a working ppdc. Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - version bump 2.2.4 -> 2.2.5 (no further config changes needed) - does no longer build without multithreading (see CUPS issue #5154) - configure: --libdir=/ is enough (but still needed), drop --exec-prefix - $(call install) seems to delete already installed files, instead use $(call compile) with additional argument "install" - make targetinstall stage more silent rules/host-cups.in | 7 rules/host-cups.make | 113 +++ 2 files changed, 120 insertions(+) create mode 100644 rules/host-cups.in create mode 100644 rules/host-cups.make diff --git a/rules/host-cups.in b/rules/host-cups.in new file mode 100644 index 0..45edccada --- /dev/null +++ b/rules/host-cups.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_CUPS + tristate + default ALLYES + +# vim: ft=kconfig ts=8 noet tw=80 diff --git a/rules/host-cups.make b/rules/host-cups.make new file mode 100644 index 0..894c47e41 --- /dev/null +++ b/rules/host-cups.make @@ -0,0 +1,113 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_CUPS) += host-cups + +# +# Prepare +# + +# +# autoconf +# +# The --with-* options are only used to specify strings, --without-* does +# nothing. So we're omitting them here. The only exception is +# --with-components=core, which we are setting to only builds libcups* (which is +# needed by ppdc). +# +# --libdir has to end with a /, otherwise due to broken autoconf magic, the libs +# end up in ${prefix}/lib64, which is not what we want. +# +HOST_CUPS_CONF_TOOL:= autoconf +HOST_CUPS_CONF_OPT := \ + $(HOST_AUTOCONF) \ + --libdir=/lib/ \ + --disable-mallinfo \ + --disable-libpaper \ + --disable-libusb \ + --disable-tcp-wrappers \ + --disable-acl \ + --disable-dbus \ + --disable-libtool-unsupported \ + --disable-debug \ + --disable-debug-guards \ + --disable-debug-printfs \ + --disable-unit-tests \ + --disable-relro \ + --disable-gssapi \ + --enable-threads \ + --disable-ssl \ + --disable-cdsassl \ + --disable-gnutls \ + --disable-pam \ + --disable-largefile \ + --disable-avahi \ + --disable-dnssd \ + --disable-launchd \ + --disable-systemd \ + --disable-upstart \ + --disable-page-logging \ + --disable-browsing \ + --disable-default-shared \ + --disable-raw-printing \ + --disable-webif \ + --with-components=core + +# +# Compile +# + +$(STATEDIR)/host-cups.compile: + @$(call targetinfo) + @$(call world/compile, HOST_CUPS) + @# ppdc isn't built by --with-components=core + @$(call compile, HOST_CUPS, -C ${HOST_CUPS_DIR}/ppdc) + @$(call touch) + +# +# Install +# + +HOST_CUPS_MAKE_ENV := \ + DSTROOT=$(HOST_CUPS_PKGDIR) + +$(STATEDIR)/host-cups.install: + @$(call targetinfo) + @$(call world/install, HOST_CUPS) + @# ppdc isn't included in --with-components=core + @$(call compile, HOST_CUPS, -C ${HOST_CUPS_DIR}/ppdc install) + @$(call touch) + +CROSS_PPDC = $(PTXDIST_SYSROOT_CROSS)/bin/ppdc +$(STATEDIR)/host-cups.install.post: + @$(call targetinfo) + @$(call world/install.post, HOST_CUPS) + + @( \ + echo '#!/bin/sh'; \ + echo 'CUPS_DATADIR=$(PTXDIST_SYSROOT_HOST)/share/cups $(PTXDIST_SYSROOT_HOST)/bin/ppdc "$$@"'; \ + ) > $(CROSS_PPDC) + @chmod +x $(CROSS_PPDC) + + @$(call touch) + +# +# Clean +# + +$(STATEDIR)/host-cups.clean: + @$(call targetinfo) + @$(call clean_pkg, HOST_
[ptxdist] [PATCH v3 4/7] poppler: version bump 0.18.0 -> 0.59.0
This is quite a version bump, spanning six years of poppler development. Upstream now provides data for rendering cyrillic languages in the package poppler-data, but this dependency is only detected at compile time, so we make sure the build order is right. Some applications require the old xpdf headers, the CPP wrapper or CMYK support, so make these configure options selectable. Same for the Splash backend, which can now also be built with single precision or fixed-point arithmetic. PNG and JPEG support is no longer broken, poppler now also includes an internal DCT decoder. The GTK dependency has been dropped (or was it even necessary in the first place?) Don't wonder about --disable-relocatable, it only applies to Windows. poppler allows using zlib to uncompress flate streams, but with the warning that this is "not totally safe", so I disabled it. Additionally, poppler could benefit from packaging libopenjpeg and libtiff in ptxdist for parsing JPEG2000 or TIFF embedded in PDFs. Likewise, libnss could be packaged for PDF signature support. Also there is the option to build a Qt5 wrapper, but this is currently only build-tested and needs to be tested in runtime. Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - POPPLER_GLIB also needs HOST_GLIB for sysroot-host/bin/glib-mkenums - add optional dependency for gobject-introspection - add POPPLER_OPENJPEG, POPPLER_TIFF, POPPLER_NSS with depends on BROKEN for future use - respect PTXCONF_TARGET_DEBUG_* instead of introducing an extra POPPLER_BUILD_DEBUG - enable qt5 wrapper (only build-tested) - order kconfig options by usage and add section headers for more structure rules/poppler.in | 138 - rules/poppler.make | 56 -- 2 files changed, 156 insertions(+), 38 deletions(-) diff --git a/rules/poppler.in b/rules/poppler.in index b107dc7a5..3a74ead41 100644 --- a/rules/poppler.in +++ b/rules/poppler.in @@ -4,23 +4,33 @@ menuconfig POPPLER tristate prompt "poppler " select FONTCONFIG + select FREETYPE select HOST_GETTEXT - select GLIB if POPPLER_GLIB - select LIBPNG if POPPLER_PNG - select LIBJPEG if POPPLER_JPEG - select CAIROif POPPLER_CAIRO - select GTK if POPPLER_SPLASH && POPPLER_GLIB - select ZLIB if POPPLER_ZLIB - select LIBCURL if POPPLER_CURL - select LCMS if POPPLER_CMS - select QT4 if POPPLER_QT4 - select QT4_BUILD_GUIif POPPLER_QT4 - select QT4_BUILD_XMLif POPPLER_QT4 + select POPPLER_DATA if POPPLER_WITH_DATA + select GLIB if POPPLER_GLIB + select HOST_GLIBif POPPLER_GLIB + select GOBJECT_INTROSPECTION_HELPER if POPPLER_GOI + select GOBJECT_INTROSPECTIONif POPPLER_GOI + select LIBPNG if POPPLER_PNG + select LIBJPEG if POPPLER_JPEG + select CAIROif POPPLER_CAIRO + select CAIRO_FREETYPE if POPPLER_CAIRO + select ZLIB if POPPLER_ZLIB + select LIBCURL if POPPLER_CURL + select LCMS if POPPLER_CMS + select QT4 if POPPLER_QT4 + select QT4_BUILD_GUIif POPPLER_QT4 + select QT4_BUILD_XMLif POPPLER_QT4 + select QT4_BUILD_QTESTLIB if POPPLER_QT4 + select QT5 if POPPLER_QT5 + select QT5_MODULE_QTBASEif POPPLER_QT5 help Poppler is a PDF rendering library based on the xpdf-3.0 code base. if POPPLER +comment "--- Install components ---" + config POPPLER_BIN bool prompt "install poppler utilities" @@ -29,6 +39,26 @@ config POPPLER_BIN pdffonts, pdfimages, pdfinfo, pdftoabw, pdftohtml, pdftoppm, pdftops, pdftotext. +config POPPLER_XPDF + bool + prompt "install unsupported xpdf headers" + help + Install XPDF headers for software that still depends on them. + Normally, this option should not be needed. + +config POPPLER_WITH_DATA + bool + prompt "install poppler-data" + help + poppler-data contains the encoding files which enable poppler to + correctly render CJK and Cyrillic. + +comment "--- Wrappers ---" + +config POPPLER_CPP + bool + prompt "enable poppler cpp wrapper" + config POPPLER_GLIB select POPPLER_CAIRO bool @@ -36,20 +66,37 @@ config POPPLER_GLIB help build poppler glib wrapper. +config POPPLER_GOI + sele
[ptxdist] [PATCH v3 3/7] poppler-data: new package: optional encoding data for poppler
Signed-off-by: Roland Hieber --- Notes: (no changes in v2 -> v3) rules/poppler-data.in | 10 + rules/poppler-data.make | 58 + 2 files changed, 68 insertions(+) create mode 100644 rules/poppler-data.in create mode 100644 rules/poppler-data.make diff --git a/rules/poppler-data.in b/rules/poppler-data.in new file mode 100644 index 0..61796949e --- /dev/null +++ b/rules/poppler-data.in @@ -0,0 +1,10 @@ +## SECTION=multimedia_gtk + +config POPPLER_DATA + tristate + prompt "poppler-data" + help + Encoding data which enables poppler to correctly render CJK and + Cyrillic languages. + +# vim: ft=kconfig ts=8 noet tw=80 diff --git a/rules/poppler-data.make b/rules/poppler-data.make new file mode 100644 index 0..93edb7cea --- /dev/null +++ b/rules/poppler-data.make @@ -0,0 +1,58 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Roland Hieber +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_POPPLER_DATA) += poppler-data + +# +# Paths and names +# +POPPLER_DATA_VERSION := 0.4.8 +POPPLER_DATA_MD5 := 00f8989c804de84af0ba2ea629949980 +POPPLER_DATA := poppler-data-$(POPPLER_DATA_VERSION) +POPPLER_DATA_SUFFIX:= tar.gz +POPPLER_DATA_URL := https://poppler.freedesktop.org/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX) +POPPLER_DATA_SOURCE:= $(SRCDIR)/$(POPPLER_DATA).$(POPPLER_DATA_SUFFIX) +POPPLER_DATA_DIR := $(BUILDDIR)/$(POPPLER_DATA) +POPPLER_DATA_LICENSE := GPL-2.0 AND MIT AND BSD-3-Clause + +# +# Prepare +# +POPPLER_DATA_CONF_TOOL := NO + +# +# Install +# + +POPPLER_DATA_INSTALL_OPT := prefix=/usr install + +# +# Target-Install +# + +$(STATEDIR)/poppler-data.targetinstall: + @$(call targetinfo) + + @$(call install_init, poppler-data) + @$(call install_fixup, poppler-data,PRIORITY,optional) + @$(call install_fixup, poppler-data,SECTION,base) + @$(call install_fixup, poppler-data,AUTHOR,"Roland Hieber ") + @$(call install_fixup, poppler-data,DESCRIPTION,missing) + + @$(call install_tree, poppler-data, 0, 0, -, /usr/share/poppler) + + @$(call install_finish, poppler-data) + + @$(call touch) + +# vim: ft=make ts=8 tw=80 -- 2.11.0 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v3 5/7] cups: new package: Common Unix Printing System
If using systemd, CUPS can be started via socket activation or directly, in any case it is run as user daemon, group lp. The default spool and cache locations were moved to /tmp/cups so we don't need to set up a tmpfs for /var/spool/cups and /var/cache/cups. sysvinit script is installed from upstream, but untested. Some config files are only created by cupsd on the first start and not at install time, so we supply reasonable defaults in projectroot/ in order to use $(call install_alternative...) on them. Signed-off-by: Roland Hieber --- Notes: changes in v2 -> v3: - version bump 2.2.4 -> 2.2.5 - fix SPDX license identifiers - $(PKGDIR)/$(CUPS) -> $(CUPS_PKGDIR) - with CROSS_AUTOCONF_USR, --exec-prefix and --libdir is not needed - always build multithreaded, remove kconfig option - remove debugging options, can easily be enabled by creating a local rules/cups-debug.make - fix install_copy for /etc/cups/ssl (missing permissions) ...llow-explicit-disabling-of-Java-PHP-Perl-.patch | 92 ...-remove-leftover-check-for-empty-CUPS_PHP.patch | 29 +++ ...e-make-interpreter-detection-more-verbose.patch | 88 patches/cups-2.2.4/autogen.sh | 7 + patches/cups-2.2.4/series | 6 + projectroot/etc/cups/classes.conf | 1 + projectroot/etc/cups/client.conf | 2 + projectroot/etc/cups/cups-files.conf | 22 ++ projectroot/etc/cups/mailto.conf | 1 + projectroot/etc/cups/ppd/.createdirectory | 0 projectroot/etc/cups/printers.conf | 1 + projectroot/etc/cups/ssl/.createdirectory | 0 projectroot/etc/printcap | 3 + projectroot/usr/lib/systemd/system/cups.service| 15 ++ projectroot/usr/lib/systemd/system/cups.socket | 14 ++ projectroot/usr/lib/tmpfiles.d/cups.conf | 6 + rules/cups-bbinit.in | 8 + rules/cups.in | 113 ++ rules/cups.make| 238 + 19 files changed, 646 insertions(+) create mode 100644 patches/cups-2.2.4/0001-configure-allow-explicit-disabling-of-Java-PHP-Perl-.patch create mode 100644 patches/cups-2.2.4/0002-configure-remove-leftover-check-for-empty-CUPS_PHP.patch create mode 100644 patches/cups-2.2.4/0003-configure-make-interpreter-detection-more-verbose.patch create mode 100755 patches/cups-2.2.4/autogen.sh create mode 100644 patches/cups-2.2.4/series create mode 100644 projectroot/etc/cups/classes.conf create mode 100644 projectroot/etc/cups/client.conf create mode 100644 projectroot/etc/cups/cups-files.conf create mode 100644 projectroot/etc/cups/mailto.conf create mode 100644 projectroot/etc/cups/ppd/.createdirectory create mode 100644 projectroot/etc/cups/printers.conf create mode 100644 projectroot/etc/cups/ssl/.createdirectory create mode 100644 projectroot/etc/printcap create mode 100644 projectroot/usr/lib/systemd/system/cups.service create mode 100644 projectroot/usr/lib/systemd/system/cups.socket create mode 100644 projectroot/usr/lib/tmpfiles.d/cups.conf create mode 100644 rules/cups-bbinit.in create mode 100644 rules/cups.in create mode 100644 rules/cups.make diff --git a/patches/cups-2.2.4/0001-configure-allow-explicit-disabling-of-Java-PHP-Perl-.patch b/patches/cups-2.2.4/0001-configure-allow-explicit-disabling-of-Java-PHP-Perl-.patch new file mode 100644 index 0..f110f5aaa --- /dev/null +++ b/patches/cups-2.2.4/0001-configure-allow-explicit-disabling-of-Java-PHP-Perl-.patch @@ -0,0 +1,92 @@ +From: Roland Hieber +Date: Mon, 25 Sep 2017 15:00:16 +0200 +Subject: [PATCH] configure: allow explicit disabling of Java/PHP/Perl/Python + support + +Currently, when configure is called with --with-java or --with-java=, +auto-detection is performed. When called with --without-java, HAVE_JAVA +is still being defined. This is unfortunate when cross-compiling for +embedded systems, we would end up with Java on the host being +auto-detected (which is not what we have on the target), or with a wrong +HAVE_JAVA define. We need a way to explicitely disable scripting support +for all supported languages. + +Forwarded: https://github.com/apple/cups/pull/5122 +Signed-off-by: Roland Hieber +--- + config-scripts/cups-scripting.m4 | 24 + 1 file changed, 16 insertions(+), 8 deletions(-) + +diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 +index bff3e9a0505c..137c3be72cb0 100644 +--- a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 +@@ -14,11 +14,13 @@ dnl + dnl Do we have Java? + AC_ARG_WITH(java, [ --with-java set Java interpreter for web interfaces ], + CUPS_JAVA="$withval", +- CUPS_JAVA="") ++ CUPS_JAVA="auto") + +-if test "x$CUPS_JAVA" = x; then ++if tes
Re: [ptxdist] [PATCH v3 4/7] poppler: version bump 0.18.0 -> 0.59.0
On 25.10.2017 22:57, Roland Hieber wrote: > -POPPLER_VERSION := 0.18.0 > -POPPLER_MD5 := 4cd3bf2a0a13fa8eaf00d31368915f77 > +POPPLER_VERSION := 0.59.0 > +POPPLER_MD5 := 6e44408a3b4f4a738f8a6770d0aea8a5 Oh, I forgot to check for a new version here. They released 0.60 two weeks ago, which changes the build system from autotools to CMake... I guess I'll get to work and send v4 then. - Roland ___ ptxdist mailing list ptxdist@pengutronix.de