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 <r.hie...@pengutronix.de> > --- > > 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 000000000..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 000000000..0f19d6c11 > --- /dev/null > +++ b/rules/cups-filters.make > @@ -0,0 +1,94 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2017 by Roland Hieber <r.hie...@pengutronix.de> > +# > +# 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_TOOL := autoconf > +CUPS_FILTERS_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + --exec-prefix=/usr/ \ > + --libdir=/usr/lib/ \
see my comment for cups. > + --disable-silent-rules \ > + --disable-driverless \ > + --disable-auto-setup-driverless \ > + --$(call ptx/endis,PTXCONF_CUPS_FILTERS_IMAGEFILTERS)-imagefilters \ > + --disable-avahi \ > + --disable-ldap \ > + --$(call ptx/endis,PTXCONF_CUPS_FILTERS_POPPLER)-poppler \ > + --disable-dbus \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --disable-mutool \ > + --disable-ghostscript \ > + --disable-ijs \ > + --disable-gs-ps2write \ > + --disable-foomatic \ > + --disable-werror \ > + --disable-braille \ > + --with-gnu-ld \ > + --with-cups-config=$(PTXDIST_SYSROOT_CROSS)/bin/cups-config \ > + --with-apple-raster-filter=rastertopdf \ > + --with-cups-rundir=/run \ > + --with-cups-domainsocket=/run/cups.sock \ > + --$(call ptx/wwo,PTXCONF_CUPS_FILTERS_JPEG)-jpeg \ > + --$(call ptx/wwo,PTXCONF_CUPS_FILTERS_PNG)-png \ > + --without-tiff \ > + --with-browseremoteprotocols="dnssd cups" \ > + --with-pdftops=pdftops > + > +# > ---------------------------------------------------------------------------- > +# Target-Install > +# > ---------------------------------------------------------------------------- > + > +$(STATEDIR)/cups-filters.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, cups-filters) > + @$(call install_fixup, cups-filters,PRIORITY,optional) > + @$(call install_fixup, cups-filters,SECTION,base) > + @$(call install_fixup, cups-filters,AUTHOR,"Roland Hieber > <r.hie...@pengutronix.de>") > + @$(call install_fixup, cups-filters,DESCRIPTION,missing) > + > + @$(call install_lib, cups-filters, 0, 0, 0755, libcupsfilters) > + @$(call install_lib, cups-filters, 0, 0, 0755, libfontembed) 644 right? Michael > + @$(call install_tree, cups-filters, 0, 0, -, /usr/lib/cups/filter) > + @$(call install_tree, cups-filters, 0, 0, -, /usr/lib/cups/backend) > + @$(call install_tree, cups-filters, 0, 0, -, /usr/share/cups) > + @$(call install_tree, cups-filters, 0, 0, -, /usr/share/ppd) > + > + @$(call install_finish, cups-filters) > + > + @$(call touch) > + > +# vim: ft=make ts=8 tw=80 > -- > 2.11.0 > > > _______________________________________________ > 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-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
