| Message ID | 1442492616-12626-6-git-send-email-olivier.schonken@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi Olivier, On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken <olivier.schonken@gmail.com> wrote: > Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com> > --- > Config.in.legacy | 1 + > package/Config.in | 1 + > package/cups-filters/Config.in | 57 ++++++++++++++++++++++++++++++++++ > package/cups-filters/cups-filters.hash | 2 ++ > package/cups-filters/cups-filters.mk | 57 ++++++++++++++++++++++++++++++++++ > 5 files changed, 118 insertions(+) > create mode 100644 package/cups-filters/Config.in > create mode 100644 package/cups-filters/cups-filters.hash > create mode 100644 package/cups-filters/cups-filters.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index fafae00..b0d6421 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -109,6 +109,7 @@ comment "Legacy options removed in 2015.11" > > config BR2_PACKAGE_CUPS_PDFTOPS > bool "Pdftops support has been removed from Cups" > + select BR2_PACKAGE_CUPS_FILTERS_PDFTOPS > select BR2_LEGACY > help > Pdftops support has been removed from the cups package > diff --git a/package/Config.in b/package/Config.in > index e2f669a..988a205 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1221,6 +1221,7 @@ menu "Networking applications" > source "package/crda/Config.in" > source "package/ctorrent/Config.in" > source "package/cups/Config.in" > + source "package/cups-filters/Config.in" > if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > source "package/dhcp/Config.in" > endif > diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in > new file mode 100644 > index 0000000..20e4eaa > --- /dev/null > +++ b/package/cups-filters/Config.in > @@ -0,0 +1,57 @@ > +config BR2_PACKAGE_CUPS_FILTERS > + bool "cups-filters" > + depends on BR2_PACKAGE_CUPS Use "select BR2_PACKAGE_CUPS" instead. Also, when you'll remove the "depends on", the rendering in menuconfig will be a slightly different (better IMOH ;-]). > + select BR2_PACKAGE_LIBGLIB2 > + select BR2_PACKAGE_IJS > + select BR2_PACKAGE_LCMS2 > + select BR2_PACKAGE_POPPLER > + select BR2_PACKAGE_QPDF > + # needs fork() > + depends on BR2_USE_MMU Move this line up please, (we usually place the "depends on" statement right after the "bool" one). > + depends on BR2_PACKAGE_LIBGLIB2 > + depends on BR2_PACKAGE_IJS > + depends on BR2_PACKAGE_LCMS2 > + depends on BR2_PACKAGE_POPPLER > + depends on BR2_PACKAGE_QPDF Do not depends on something and select it at the same time, this is causing recursive dependencies at the kconfig level. In Buildroot, we usually use "select" on package symbols. > + help > + This project provides 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 to make these > + printers available locally and to provide backward compatibility to > + the old CUPS broadcasting and browsing of CUPS 1.5.x and older. > + From CUPS 1.6.0 on, this package is required for using printer drivers > + with CUPS under Linux. With CUPS 1.5.x and earlier this package can be > + used optionally to switch over to PDF-based printing. > + > + http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters > + > +comment "cups-filters depends on libglib2" > + depends on !BR2_PACKAGE_LIBGLIB2 > + > +comment "cups-filters depends on ijs" > + depends on !BR2_PACKAGE_IJS > + > +comment "cups-filters depends on lcms2" > + depends on !BR2_PACKAGE_LCMS2 > + > +comment "cups-filters depends on poppler" > + depends on !BR2_PACKAGE_POPPLER > + > +comment "cups-filters depends on qpdf" > + depends on !BR2_PACKAGE_QPDF These 5 comments are not needed. > + > +if BR2_PACKAGE_CUPS_FILTERS > + > +config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS > + bool "pdftops support" > + depends on BR2_INSTALL_LIBSTDCPP > + help > + Enable pdftops support > + > +comment "pdftops support needs a toolchain w/ C++" > + depends on !BR2_INSTALL_LIBSTDCPP > + > +endif > diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash > new file mode 100644 > index 0000000..cb300d4 > --- /dev/null > +++ b/package/cups-filters/cups-filters.hash > @@ -0,0 +1,2 @@ > +# Locally computed: > +sha256 c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5 cups-filters-1.0.74.tar.gz > diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk > new file mode 100644 > index 0000000..5d46e60 > --- /dev/null > +++ b/package/cups-filters/cups-filters.mk > @@ -0,0 +1,57 @@ > +################################################################################ > +# > +# cups-filters > +# > +################################################################################ > + > +CUPS_FILTERS_VERSION = 1.0.74 > +CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters/ Remove the trailing slash please. > +CUPS_FILTERS_LICENSE = GPLv2+ hmm, that's not so simple :-/. Have careful look at the README file. Some are under GPLv2, some under MIT... Also, many source files refer to a non-existing LICENSE.txt file. > +CUPS_FILTERS_LICENSE_FILES = COPYING > + > +CUPS_FILTERS_DEPENDENCIES = cups libglib2 ijs lcms2 poppler qpdf > + > +CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ > + --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ > + --with-sysroot=$(STAGING_DIR) > + > +ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y) > +CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops > +endif > + > +ifeq ($(BR2_PACKAGE_JPEG),y) > +CUPS_FILTERS_CONF_OPTS += --with-jpeg > +CUPS_FILTERS_DEPENDENCIES += jpeg > +else > +CUPS_FILTERS_CONF_OPTS += --without-jpeg > +endif > + > +ifeq ($(BR2_PACKAGE_LIBPNG),y) > +CUPS_FILTERS_CONF_OPTS += --with-png > +CUPS_FILTERS_DEPENDENCIES += libpng > +else > +CUPS_FILTERS_CONF_OPTS += --without-png > +endif > + > +ifeq ($(BR2_PACKAGE_TIFF),y) > +CUPS_FILTERS_CONF_OPTS += --with-tiff > +CUPS_FILTERS_DEPENDENCIES += tiff > +else > +CUPS_FILTERS_CONF_OPTS += --without-tiff > +endif > + > +ifeq ($(BR2_PACKAGE_DBUS),y) > +CUPS_FILTERS_CONF_OPTS += --enable-dbus > +CUPS_FILTERS_DEPENDENCIES += dbus > +else > +CUPS_FILTERS_CONF_OPTS += --disable-dbus > +endif > + > +ifeq ($(BR2_PACKAGE_AVAHI),y) > +CUPS_FILTERS_DEPENDENCIES += avahi > +CUPS_FILTERS_CONF_OPTS += --enable-avahi > +else > +CUPS_FILTERS_CONF_OPTS += --disable-avahi > +endif > + > +$(eval $(autotools-package)) > -- > 1.9.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot Regards,
diff --git a/Config.in.legacy b/Config.in.legacy index fafae00..b0d6421 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -109,6 +109,7 @@ comment "Legacy options removed in 2015.11" config BR2_PACKAGE_CUPS_PDFTOPS bool "Pdftops support has been removed from Cups" + select BR2_PACKAGE_CUPS_FILTERS_PDFTOPS select BR2_LEGACY help Pdftops support has been removed from the cups package diff --git a/package/Config.in b/package/Config.in index e2f669a..988a205 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1221,6 +1221,7 @@ menu "Networking applications" source "package/crda/Config.in" source "package/ctorrent/Config.in" source "package/cups/Config.in" + source "package/cups-filters/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/dhcp/Config.in" endif diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in new file mode 100644 index 0000000..20e4eaa --- /dev/null +++ b/package/cups-filters/Config.in @@ -0,0 +1,57 @@ +config BR2_PACKAGE_CUPS_FILTERS + bool "cups-filters" + depends on BR2_PACKAGE_CUPS + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_IJS + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_POPPLER + select BR2_PACKAGE_QPDF + # needs fork() + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBGLIB2 + depends on BR2_PACKAGE_IJS + depends on BR2_PACKAGE_LCMS2 + depends on BR2_PACKAGE_POPPLER + depends on BR2_PACKAGE_QPDF + help + This project provides 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 to make these + printers available locally and to provide backward compatibility to + the old CUPS broadcasting and browsing of CUPS 1.5.x and older. + From CUPS 1.6.0 on, this package is required for using printer drivers + with CUPS under Linux. With CUPS 1.5.x and earlier this package can be + used optionally to switch over to PDF-based printing. + + http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters + +comment "cups-filters depends on libglib2" + depends on !BR2_PACKAGE_LIBGLIB2 + +comment "cups-filters depends on ijs" + depends on !BR2_PACKAGE_IJS + +comment "cups-filters depends on lcms2" + depends on !BR2_PACKAGE_LCMS2 + +comment "cups-filters depends on poppler" + depends on !BR2_PACKAGE_POPPLER + +comment "cups-filters depends on qpdf" + depends on !BR2_PACKAGE_QPDF + +if BR2_PACKAGE_CUPS_FILTERS + +config BR2_PACKAGE_CUPS_FILTERS_PDFTOPS + bool "pdftops support" + depends on BR2_INSTALL_LIBSTDCPP + help + Enable pdftops support + +comment "pdftops support needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +endif diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash new file mode 100644 index 0000000..cb300d4 --- /dev/null +++ b/package/cups-filters/cups-filters.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 c091938a7c25a600138c501075b222611ef333157e2554376bb60189032591c5 cups-filters-1.0.74.tar.gz diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk new file mode 100644 index 0000000..5d46e60 --- /dev/null +++ b/package/cups-filters/cups-filters.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# cups-filters +# +################################################################################ + +CUPS_FILTERS_VERSION = 1.0.74 +CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters/ +CUPS_FILTERS_LICENSE = GPLv2+ +CUPS_FILTERS_LICENSE_FILES = COPYING + +CUPS_FILTERS_DEPENDENCIES = cups libglib2 ijs lcms2 poppler qpdf + +CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ + --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ + --with-sysroot=$(STAGING_DIR) + +ifeq ($(BR2_PACKAGE_CUPS_FILTERS_PDFTOPS),y) +CUPS_FILTERS_CONF_OPTS += --with-pdftops=pdftops +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +CUPS_FILTERS_CONF_OPTS += --with-jpeg +CUPS_FILTERS_DEPENDENCIES += jpeg +else +CUPS_FILTERS_CONF_OPTS += --without-jpeg +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +CUPS_FILTERS_CONF_OPTS += --with-png +CUPS_FILTERS_DEPENDENCIES += libpng +else +CUPS_FILTERS_CONF_OPTS += --without-png +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +CUPS_FILTERS_CONF_OPTS += --with-tiff +CUPS_FILTERS_DEPENDENCIES += tiff +else +CUPS_FILTERS_CONF_OPTS += --without-tiff +endif + +ifeq ($(BR2_PACKAGE_DBUS),y) +CUPS_FILTERS_CONF_OPTS += --enable-dbus +CUPS_FILTERS_DEPENDENCIES += dbus +else +CUPS_FILTERS_CONF_OPTS += --disable-dbus +endif + +ifeq ($(BR2_PACKAGE_AVAHI),y) +CUPS_FILTERS_DEPENDENCIES += avahi +CUPS_FILTERS_CONF_OPTS += --enable-avahi +else +CUPS_FILTERS_CONF_OPTS += --disable-avahi +endif + +$(eval $(autotools-package))
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com> --- Config.in.legacy | 1 + package/Config.in | 1 + package/cups-filters/Config.in | 57 ++++++++++++++++++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 ++ package/cups-filters/cups-filters.mk | 57 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 package/cups-filters/Config.in create mode 100644 package/cups-filters/cups-filters.hash create mode 100644 package/cups-filters/cups-filters.mk