commit cups-filters for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-06-18 07:47:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups-filters (Old)
and /work/SRC/openSUSE:Factory/.cups-filters.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-filters"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-04-29 17:33:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-06-18 07:47:48.000000000 +0200
@@ -1,0 +2,50 @@
+Thu Jun 12 17:27:56 CEST 2014 - jsmeix@suse.de
+
+- Have different header texts for the PDF-BANNER printouts
+ (same headers as on the CUPS <= 1.5.4 banner pages):
+ Provide PDF template files classified.pdf confidential.pdf
+ secret.pdf standard.pdf topsecret.pdf unclassified.pdf and
+ modify the matching /usr/share/cups/banners/ template files
+ accordingly to use those PDF templates
+ (see https://bugs.linuxfoundation.org/show_bug.cgi?id=1209).
+
+-------------------------------------------------------------------
+Wed Jun 11 10:18:21 CEST 2014 - jsmeix@suse.de
+
+- Version upgrade to 1.0.54
+ Changes in 1.0.54 (excerpt):
+ * pdftoraster: Support for output in the color spaces 18
+ (CUPS_CSPACE_SW, sGray), 19 (CUPS_CSPACE_SRGB, sRGB), and 20
+ (CUPS_CSPACE_ADOBERGB, Adobe RGB). No color management
+ appropriate to these color spaces is added yet.
+ * rastertopdf: Added new filter to convert PWG Raster input
+ into a PDF file (using QPDF). This filter makes CUPS
+ supporting the PWG Raster input format which is required to
+ be supported by IPP Everywhere printers, making a shared
+ CUPS queue emulating an IPP Everywhere printer. This is a
+ first implementation which supports the black, RGB, CMYK,
+ sGray, sRGB, and Adobe RGB color spaces (all mapped to
+ DeviceGray, DeviceRGB, and DeviceCMYK resp. in the PDF
+ output) with 1, 8, and 16 bits per component color
+ depth. sGray, sRGB, and Adobe RGB are currently also mapped
+ to DeviceGray and DeviceRGB and do not have the correct
+ color management yet, so color output is not absolutely
+ correct. Note that mime.types of CUPS up to 1.7.2 has a bug
+ which prevents PWG Raster to be recognized, the
+ "priority(100)" of the rule needs to be changed to
+ "priority(150)".
+ * cups-browsed: Create local queues also to access classes on
+ remote CUPS servers (Ubuntu bug #1313741).
+ * cups-browsed: Let a newly discovered printer not only
+ overtaking an existing printer entry if it is from the same
+ host (usually IPP -> IPPS) or without host entry
+ (unconfirmed local queue from previous cups-browsed session)
+ but also if it is marked disappeared. So printer entries get
+ correctly migrated when things like a host name change of
+ the remote server happen.
+ * cups-browsed: Always do case-insensitive comparing of
+ strings, as CUPS queue names and URIs are case-insensitive
+ (CUPS STR #4411).
+ For details see the NEWS file.
+
+-------------------------------------------------------------------
Old:
----
cups-filters-1.0.53.tar.gz
New:
----
classified.pdf
confidential.pdf
cups-filters-1.0.54.tar.gz
secret.pdf
standard.pdf
topsecret.pdf
unclassified.pdf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-filters.spec ++++++
--- /var/tmp/diff_new_pack.WamFKh/_old 2014-06-18 07:47:49.000000000 +0200
+++ /var/tmp/diff_new_pack.WamFKh/_new 2014-06-18 07:47:49.000000000 +0200
@@ -36,7 +36,7 @@
# and also run: zypper vcmp 'next version' 'current version'
# e.g. zypper vcmp '1.0.49' '1.0.49.20140326' -> 1.0.49 is older than 1.0.49.20140326
# and zypper vcmp '1.0.50' '1.0.49.20140326' -> 1.0.50 is newer than 1.0.49.20140326
-Version: 1.0.53
+Version: 1.0.54
Release: 0
# tarball_version is used below to specify the directory via "setup -n":
# Special tarball_version needed for current cups-filters e.g. "define tarball_version 9.10rc1".
@@ -44,6 +44,14 @@
# Special tarball_version needed for current cups-filters e.g. "define tarball_version 9.10rc1".
%define tarball_version %{version}
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{tarball_version}.tar.gz
+# PDF template files for PDF-BANNER printouts
+# see https://bugs.linuxfoundation.org/show_bug.cgi?id=1209
+Source10: classified.pdf
+Source11: confidential.pdf
+Source12: secret.pdf
+Source13: standard.pdf
+Source14: topsecret.pdf
+Source15: unclassified.pdf
# Since cups-filters version 1.0.42 foomatic-rip is also provided by cups-filters.
# The foomatic-rip version that is provided by cups-filters is not specified in the cups-filters sources
# but on http://www.openprinting.org/download/foomatic/ the foomatic-filters-4.0-current.tar.gz
@@ -323,6 +331,23 @@
rm -f %{buildroot}%{_libdir}/lib*.la
# Not sure what is this good for
rm -f %{buildroot}%{_bindir}/ttfread
+# Install the PDF template files for PDF-BANNER printouts and
+# modify the banner template files accordingly to use those PDF template files
+# see https://bugs.linuxfoundation.org/show_bug.cgi?id=1209
+install -m 644 %{SOURCE10} %{buildroot}%{_datadir}/cups/data/classified.pdf
+install -m 644 %{SOURCE11} %{buildroot}%{_datadir}/cups/data/confidential.pdf
+install -m 644 %{SOURCE12} %{buildroot}%{_datadir}/cups/data/secret.pdf
+install -m 644 %{SOURCE13} %{buildroot}%{_datadir}/cups/data/standard.pdf
+install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/cups/data/topsecret.pdf
+install -m 644 %{SOURCE15} %{buildroot}%{_datadir}/cups/data/unclassified.pdf
+for T in classified confidential secret standard topsecret unclassified
+do F="%{buildroot}%{_datadir}/cups/banners/$T"
+ if grep -q 'Template default.pdf' $F
+ then sed -i -e "s/Template default.pdf/Template $T.pdf/" $F
+ else echo "No longer 'Template default.pdf' in banner template file $T - clean up cups-filters.spec"
+ exit 9
+ fi
+done
%post
/sbin/ldconfig
@@ -422,6 +447,7 @@
%attr(0755,root,root) /usr/lib/cups/filter/pstopdf
%attr(0755,root,root) /usr/lib/cups/filter/rastertoescpx
%attr(0755,root,root) /usr/lib/cups/filter/rastertopclx
+%attr(0755,root,root) /usr/lib/cups/filter/rastertopdf
%attr(0755,root,root) /usr/lib/cups/filter/textonly
%attr(0755,root,root) /usr/lib/cups/filter/texttopdf
%attr(0755,root,root) /usr/lib/cups/filter/texttops
@@ -438,7 +464,7 @@
%{_datadir}/cups/mime/cupsfilters.convs
%dir %{_datadir}/ppd
%{_datadir}/ppd/cupsfilters
-%attr(0755,root,root) %{_libdir}/libfontembed.so.*
+%{_libdir}/libfontembed.so.*
%files ghostscript
# "ldd /usr/lib/cups/filter/gstoraster | grep cups" shows that
@@ -454,7 +480,7 @@
%dir /usr/lib/cups/filter
%attr(0755,root,root) /usr/lib/cups/filter/gstoraster
%attr(0755,root,root) /usr/lib/cups/filter/gstopxl
-%attr(0755,root,root) %{_libdir}/libcupsfilters.so.*
+%{_libdir}/libcupsfilters.so.*
%files foomatic-rip
%defattr(-,root,root)
++++++ cups-filters-1.0.53.tar.gz -> cups-filters-1.0.54.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/INSTALL new/cups-filters-1.0.54/INSTALL
--- old/cups-filters-1.0.53/INSTALL 2014-04-25 15:30:24.000000000 +0200
+++ new/cups-filters-1.0.54/INSTALL 2014-06-06 16:26:11.000000000 +0200
@@ -1,4 +1,4 @@
-INSTALL - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25
+INSTALL - OpenPrinting CUPS Filters v1.0.54 - 2014-06-06
--------------------------------------------------------
This file describes how to compile and install OpenPrinting CUPS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/Makefile.am new/cups-filters-1.0.54/Makefile.am
--- old/cups-filters-1.0.53/Makefile.am 2014-02-27 16:33:39.000000000 +0100
+++ new/cups-filters-1.0.54/Makefile.am 2014-05-15 15:02:49.000000000 +0200
@@ -422,7 +422,8 @@
rastertoescpx \
rastertopclx \
texttopdf \
- urftopdf
+ urftopdf \
+ rastertopdf
if ENABLE_IMAGEFILTERS
pkgfilter_PROGRAMS += \
imagetopdf \
@@ -561,6 +562,15 @@
urftopdf_LDADD = \
$(LIBQPDF_LIBS)
+rastertopdf_SOURCES = \
+ filter/rastertopdf.cpp
+rastertopdf_CXXFLAGS = \
+ $(CUPS_CFLAGS) \
+ $(LIBQPDF_CFLAGS)
+rastertopdf_LDADD = \
+ $(CUPS_LIBS) \
+ $(LIBQPDF_LIBS)
+
pdftoijs_SOURCES = \
filter/pdftoijs.cxx \
filter/PDFError.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/Makefile.in new/cups-filters-1.0.54/Makefile.in
--- old/cups-filters-1.0.53/Makefile.in 2014-04-25 16:13:35.000000000 +0200
+++ new/cups-filters-1.0.54/Makefile.in 2014-06-06 16:28:21.000000000 +0200
@@ -97,7 +97,7 @@
gstoraster$(EXEEXT) pdftoijs$(EXEEXT) pdftoippprinter$(EXEEXT) \
pdftops$(EXEEXT) pdftoraster$(EXEEXT) rastertoescpx$(EXEEXT) \
rastertopclx$(EXEEXT) texttopdf$(EXEEXT) urftopdf$(EXEEXT) \
- $(am__EXEEXT_1)
+ rastertopdf$(EXEEXT) $(am__EXEEXT_1)
@ENABLE_IMAGEFILTERS_TRUE@am__append_3 = \
@ENABLE_IMAGEFILTERS_TRUE@ imagetopdf \
@ENABLE_IMAGEFILTERS_TRUE@ imagetoraster
@@ -363,6 +363,12 @@
rastertopclx_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(rastertopclx_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_rastertopdf_OBJECTS = rastertopdf-rastertopdf.$(OBJEXT)
+rastertopdf_OBJECTS = $(am_rastertopdf_OBJECTS)
+rastertopdf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+rastertopdf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(rastertopdf_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
am_serial_OBJECTS = serial-serial.$(OBJEXT)
serial_OBJECTS = $(am_serial_OBJECTS)
serial_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -497,11 +503,12 @@
$(pdftoopvp_SOURCES) $(pdftopdf_SOURCES) $(pdftops_SOURCES) \
$(EXTRA_pdftops_SOURCES) $(pdftoraster_SOURCES) \
$(rastertoescpx_SOURCES) $(rastertopclx_SOURCES) \
- $(serial_SOURCES) $(test1284_SOURCES) $(test_analyze_SOURCES) \
- $(test_pdf_SOURCES) $(test_pdf1_SOURCES) $(test_pdf2_SOURCES) \
- $(test_ps_SOURCES) $(testcmyk_SOURCES) $(testdither_SOURCES) \
- $(testimage_SOURCES) $(testrgb_SOURCES) $(texttopdf_SOURCES) \
- $(ttfread_SOURCES) $(urftopdf_SOURCES)
+ $(rastertopdf_SOURCES) $(serial_SOURCES) $(test1284_SOURCES) \
+ $(test_analyze_SOURCES) $(test_pdf_SOURCES) \
+ $(test_pdf1_SOURCES) $(test_pdf2_SOURCES) $(test_ps_SOURCES) \
+ $(testcmyk_SOURCES) $(testdither_SOURCES) $(testimage_SOURCES) \
+ $(testrgb_SOURCES) $(texttopdf_SOURCES) $(ttfread_SOURCES) \
+ $(urftopdf_SOURCES)
DIST_SOURCES = $(libcupsfilters_la_SOURCES) $(libfontembed_la_SOURCES) \
$(am__libphpcups_la_SOURCES_DIST) $(bannertopdf_SOURCES) \
$(EXTRA_bannertopdf_SOURCES) $(commandtoescpx_SOURCES) \
@@ -513,11 +520,12 @@
$(pdftoopvp_SOURCES) $(pdftopdf_SOURCES) $(pdftops_SOURCES) \
$(EXTRA_pdftops_SOURCES) $(pdftoraster_SOURCES) \
$(rastertoescpx_SOURCES) $(rastertopclx_SOURCES) \
- $(serial_SOURCES) $(test1284_SOURCES) $(test_analyze_SOURCES) \
- $(test_pdf_SOURCES) $(test_pdf1_SOURCES) $(test_pdf2_SOURCES) \
- $(test_ps_SOURCES) $(testcmyk_SOURCES) $(testdither_SOURCES) \
- $(testimage_SOURCES) $(testrgb_SOURCES) $(texttopdf_SOURCES) \
- $(ttfread_SOURCES) $(urftopdf_SOURCES)
+ $(rastertopdf_SOURCES) $(serial_SOURCES) $(test1284_SOURCES) \
+ $(test_analyze_SOURCES) $(test_pdf_SOURCES) \
+ $(test_pdf1_SOURCES) $(test_pdf2_SOURCES) $(test_ps_SOURCES) \
+ $(testcmyk_SOURCES) $(testdither_SOURCES) $(testimage_SOURCES) \
+ $(testrgb_SOURCES) $(texttopdf_SOURCES) $(ttfread_SOURCES) \
+ $(urftopdf_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -1427,6 +1435,17 @@
urftopdf_LDADD = \
$(LIBQPDF_LIBS)
+rastertopdf_SOURCES = \
+ filter/rastertopdf.cpp
+
+rastertopdf_CXXFLAGS = \
+ $(CUPS_CFLAGS) \
+ $(LIBQPDF_CFLAGS)
+
+rastertopdf_LDADD = \
+ $(CUPS_LIBS) \
+ $(LIBQPDF_LIBS)
+
pdftoijs_SOURCES = \
filter/pdftoijs.cxx \
filter/PDFError.h
@@ -2024,6 +2043,10 @@
@rm -f rastertopclx$(EXEEXT)
$(AM_V_CCLD)$(rastertopclx_LINK) $(rastertopclx_OBJECTS) $(rastertopclx_LDADD) $(LIBS)
+rastertopdf$(EXEEXT): $(rastertopdf_OBJECTS) $(rastertopdf_DEPENDENCIES) $(EXTRA_rastertopdf_DEPENDENCIES)
+ @rm -f rastertopdf$(EXEEXT)
+ $(AM_V_CXXLD)$(rastertopdf_LINK) $(rastertopdf_OBJECTS) $(rastertopdf_LDADD) $(LIBS)
+
serial$(EXEEXT): $(serial_OBJECTS) $(serial_DEPENDENCIES) $(EXTRA_serial_DEPENDENCIES)
@rm -f serial$(EXEEXT)
$(AM_V_CCLD)$(serial_LINK) $(serial_OBJECTS) $(serial_LDADD) $(LIBS)
@@ -2243,6 +2266,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoescpx-rastertoescpx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertopclx-pcl-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertopclx-rastertopclx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertopdf-rastertopdf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serial-serial.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfnt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sfnt_subset.Plo@am__quote@
@@ -3567,6 +3591,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pdftoraster_CXXFLAGS) $(CXXFLAGS) -c -o pdftoraster-pdftoraster.obj `if test -f 'filter/pdftoraster.cxx'; then $(CYGPATH_W) 'filter/pdftoraster.cxx'; else $(CYGPATH_W) '$(srcdir)/filter/pdftoraster.cxx'; fi`
+rastertopdf-rastertopdf.o: filter/rastertopdf.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rastertopdf_CXXFLAGS) $(CXXFLAGS) -MT rastertopdf-rastertopdf.o -MD -MP -MF $(DEPDIR)/rastertopdf-rastertopdf.Tpo -c -o rastertopdf-rastertopdf.o `test -f 'filter/rastertopdf.cpp' || echo '$(srcdir)/'`filter/rastertopdf.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rastertopdf-rastertopdf.Tpo $(DEPDIR)/rastertopdf-rastertopdf.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='filter/rastertopdf.cpp' object='rastertopdf-rastertopdf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rastertopdf_CXXFLAGS) $(CXXFLAGS) -c -o rastertopdf-rastertopdf.o `test -f 'filter/rastertopdf.cpp' || echo '$(srcdir)/'`filter/rastertopdf.cpp
+
+rastertopdf-rastertopdf.obj: filter/rastertopdf.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rastertopdf_CXXFLAGS) $(CXXFLAGS) -MT rastertopdf-rastertopdf.obj -MD -MP -MF $(DEPDIR)/rastertopdf-rastertopdf.Tpo -c -o rastertopdf-rastertopdf.obj `if test -f 'filter/rastertopdf.cpp'; then $(CYGPATH_W) 'filter/rastertopdf.cpp'; else $(CYGPATH_W) '$(srcdir)/filter/rastertopdf.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/rastertopdf-rastertopdf.Tpo $(DEPDIR)/rastertopdf-rastertopdf.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='filter/rastertopdf.cpp' object='rastertopdf-rastertopdf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rastertopdf_CXXFLAGS) $(CXXFLAGS) -c -o rastertopdf-rastertopdf.obj `if test -f 'filter/rastertopdf.cpp'; then $(CYGPATH_W) 'filter/rastertopdf.cpp'; else $(CYGPATH_W) '$(srcdir)/filter/rastertopdf.cpp'; fi`
+
urftopdf-urftopdf.o: filter/urftopdf.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(urftopdf_CXXFLAGS) $(CXXFLAGS) -MT urftopdf-urftopdf.o -MD -MP -MF $(DEPDIR)/urftopdf-urftopdf.Tpo -c -o urftopdf-urftopdf.o `test -f 'filter/urftopdf.cpp' || echo '$(srcdir)/'`filter/urftopdf.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/urftopdf-urftopdf.Tpo $(DEPDIR)/urftopdf-urftopdf.Po
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/NEWS new/cups-filters-1.0.54/NEWS
--- old/cups-filters-1.0.53/NEWS 2014-04-25 16:00:57.000000000 +0200
+++ new/cups-filters-1.0.54/NEWS 2014-06-06 16:25:32.000000000 +0200
@@ -1,6 +1,55 @@
-NEWS - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25
+NEWS - OpenPrinting CUPS Filters v1.0.54 - 2014-06-06
-----------------------------------------------------
+CHANGES IN V1.0.54
+
+ - pdftoraster: Support for output in the color spaces 18
+ (CUPS_CSPACE_SW, sGray), 19 (CUPS_CSPACE_SRGB, sRGB), and 20
+ (CUPS_CSPACE_ADOBERGB, Adobe RGB). No color management
+ appropriate to these color spaces is added yet.
+ - foomatic-rip, gstoraster, imagetoraster, pdftoraster,
+ rastertopclx: added boolean option "no-color-management" to
+ suppress all forms of color correction when
+ color-calibrating the printer.
+ - pdftops: Default to "hybrid" setting for the PDF->PostScript
+ renderer.
+ - pdftoraster: Produce correct (compressed) PWG Raster output
+ when requested by using the correct mode in
+ cupsRasterOpen().
+ - rastertopdf: Added new filter to convert PWG Raster input
+ into a PDF file (using QPDF). This filter makes CUPS
+ supporting the PWG Raster input format which is required to
+ be supported by IPP Everywhere printers, making a shared
+ CUPS queue emulating an IPP Everywhere printer. This is a
+ first implementation which supports the black, RGB, CMYK,
+ sGray, sRGB, and Adobe RGB color spaces (all mapped to
+ DeviceGray, DeviceRGB, and DeviceCMYK resp. in the PDF
+ output) with 1, 8, and 16 bits per component color
+ depth. sGray, sRGB, and Adobe RGB are currently also mapped
+ to DeviceGray and DeviceRGB and do not have the correct
+ color management yet, so color output is not absolutely
+ correct. Note that mime.types of CUPS up to 1.7.2 has a bug
+ which prevents PWG Raster to be recognized, the
+ "priority(100)" of the rule needs to be changed to
+ "priority(150)".
+ - foomatic-rip: Corrected declaration of print_pdf() function in
+ pdf.h file (Debian bug #748028).
+ - foomatic-rip: Let it also build with uclibc which does not
+ provide the mkstemps() function. Thanks to Andreas K.
+ Huettel for the patch (Gentoo bug #509884).
+ - cups-browsed: Create local queues also to access classes on
+ remote CUPS servers (Ubuntu bug #1313741).
+ - cups-browsed: Let a newly discovered printer not only
+ overtaking an existing printer entry if it is from the same
+ host (usually IPP -> IPPS) or without host entry
+ (unconfirmed local queue from previous cups-browsed session)
+ but also if it is marked disappeared. So printer entries get
+ correctly migrated when things like a host name change of
+ the remote server happen.
+ - cups-browsed: Always do case-insensitive comparing of
+ strings, as CUPS queue names and URIs are case-insensitive
+ (CUPS STR #4411).
+
CHANGES IN V1.0.53
- foomatic-rip: Fixed segfault when creating log file (Bug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/README new/cups-filters-1.0.54/README
--- old/cups-filters-1.0.53/README 2014-04-25 15:29:21.000000000 +0200
+++ new/cups-filters-1.0.54/README 2014-06-06 16:25:51.000000000 +0200
@@ -1,4 +1,4 @@
-README - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25
+README - OpenPrinting CUPS Filters v1.0.54 - 2014-06-06
-------------------------------------------------------
Looking for compile instructions? Read the file "INSTALL.txt"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/configure new/cups-filters-1.0.54/configure
--- old/cups-filters-1.0.53/configure 2014-04-25 16:13:36.000000000 +0200
+++ new/cups-filters-1.0.54/configure 2014-06-06 16:28:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cups-filters 1.0.53.
+# Generated by GNU Autoconf 2.69 for cups-filters 1.0.54.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='cups-filters'
PACKAGE_TARNAME='cups-filters'
-PACKAGE_VERSION='1.0.53'
-PACKAGE_STRING='cups-filters 1.0.53'
+PACKAGE_VERSION='1.0.54'
+PACKAGE_STRING='cups-filters 1.0.54'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1438,7 +1438,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cups-filters 1.0.53 to adapt to many kinds of systems.
+\`configure' configures cups-filters 1.0.54 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1508,7 +1508,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cups-filters 1.0.53:";;
+ short | recursive ) echo "Configuration of cups-filters 1.0.54:";;
esac
cat <<\_ACEOF
@@ -1698,7 +1698,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cups-filters configure 1.0.53
+cups-filters configure 1.0.54
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2305,7 +2305,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cups-filters $as_me 1.0.53, which was
+It was created by cups-filters $as_me 1.0.54, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3256,7 +3256,7 @@
# Define the identity of the package.
PACKAGE='cups-filters'
- VERSION='1.0.53'
+ VERSION='1.0.54'
cat >>confdefs.h <<_ACEOF
@@ -18114,7 +18114,7 @@
if test "${with_pdftops+set}" = set; then :
withval=$with_pdftops; with_pdftops="$withval"
else
- with_pdftops=gs
+ with_pdftops=hybrid
fi
@@ -19312,7 +19312,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cups-filters $as_me 1.0.53, which was
+This file was extended by cups-filters $as_me 1.0.54, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19378,7 +19378,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cups-filters config.status 1.0.53
+cups-filters config.status 1.0.54
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/configure.ac new/cups-filters-1.0.54/configure.ac
--- old/cups-filters-1.0.53/configure.ac 2014-04-25 15:30:43.000000000 +0200
+++ new/cups-filters-1.0.54/configure.ac 2014-06-06 16:26:23.000000000 +0200
@@ -7,7 +7,7 @@
# ====================
m4_define([cups_filters_version_major],[1])
m4_define([cups_filters_version_minor],[0])
-m4_define([cups_filters_version_micro],[53])
+m4_define([cups_filters_version_micro],[54])
m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro])
# =============
@@ -424,7 +424,7 @@
AC_ARG_WITH([pdftops],
[AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
[with_pdftops="$withval"],
- [with_pdftops=gs]
+ [with_pdftops=hybrid]
)
AS_CASE([x$with_pdftops],
[xgs|xpdftops|xpdftocairo|xacroread|xhybrid], [],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c new/cups-filters-1.0.54/filter/foomatic-rip/foomaticrip.c
--- old/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c 2014-04-25 15:57:42.000000000 +0200
+++ new/cups-filters-1.0.54/filter/foomatic-rip/foomaticrip.c 2014-06-06 10:49:59.000000000 +0200
@@ -142,6 +142,10 @@
int pdfconvertedtops;
+/* no-color-management flag */
+int cm_off = 0;
+
+
/* These variables were in 'dat' before */
char colorprofile [128];
char cupsfilter[256];
@@ -316,7 +320,7 @@
_log("Pondering option '%s'\n", key);
/* "profile" option to supply a color correction profile to a CUPS raster driver */
- if (!strcmp(key, "profile")) {
+ if (!strcmp(key, "profile") && !cm_off) {
strlcpy(colorprofile, value, 128);
continue;
}
@@ -736,8 +740,13 @@
debug = 1;
if (debug) {
+#ifdef __UCLIBC__
+ sprintf(tmp, "%s-log-XXXXXX", LOG_FILE);
+ int fd = mkstemp (tmp);
+#else
sprintf(tmp, "%s-XXXXXX.log", LOG_FILE);
int fd = mkstemps (tmp, 4);
+#endif
if (fd != -1)
logh = fdopen(fd, "w");
else
@@ -797,6 +806,9 @@
while ((str = arglist_get_value(arglist, "-o"))) {
strncpy_omit(tmp, str, 1024, omit_shellescapes);
dstrcatf(job->optstr, "%s ", tmp);
+ /* if "-o no-color-management" was passed, we raise a flag */
+ if (!strcmp(tmp, "no-color-management"))
+ cm_off = 1;
arglist_remove(arglist, "-o");
/* We print without spooler */
spooler = SPOOLER_DIRECT;
@@ -949,7 +961,9 @@
icc_profile = get_icc_profile_for_qualifier(qualifier);
}
- if (icc_profile != NULL)
+ /* ICC profile is specified for Ghostscript unless
+ "no-color-management" option was passed in foomatic-rip */
+ if (icc_profile != NULL && !cm_off)
snprintf(cmd, sizeof(cmd),
"-sOutputICCProfile='%s'", icc_profile);
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/foomatic-rip/pdf.h new/cups-filters-1.0.54/filter/foomatic-rip/pdf.h
--- old/cups-filters-1.0.53/filter/foomatic-rip/pdf.h 2013-12-10 22:20:15.000000000 +0100
+++ new/cups-filters-1.0.54/filter/foomatic-rip/pdf.h 2014-05-13 17:33:24.000000000 +0200
@@ -24,7 +24,7 @@
#ifndef pdf_h
#define pdf_h
-int print_pdf(FILE *s, const char *alreadyread, size_t len, const char *filename, int startpos);
+int print_pdf(FILE *s, const char *alreadyread, size_t len, const char *filename, size_t startpos);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/gstopxl new/cups-filters-1.0.54/filter/gstopxl
--- old/cups-filters-1.0.53/filter/gstopxl 2014-04-25 16:13:46.000000000 +0200
+++ new/cups-filters-1.0.54/filter/gstopxl 2014-06-06 16:28:31.000000000 +0200
@@ -208,11 +208,11 @@
cat >"$ifile"
-echo INFO: Starting GPL Ghostscript `/usr/bin/gs --version`... 1>&2
-echo DEBUG: Running /usr/bin/gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile" 1>&2
+echo INFO: Starting GPL Ghostscript `gs --version`... 1>&2
+echo DEBUG: Running gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile" 1>&2
# Now run Ghostscript...
-/usr/bin/gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile"
+gs $gsopts $ppd_opts -sOUTPUTFILE="%stdout" -c "$ps_code" -f "$ifile"
#
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/gstoraster.c new/cups-filters-1.0.54/filter/gstoraster.c
--- old/cups-filters-1.0.53/filter/gstoraster.c 2014-02-18 15:57:36.000000000 +0100
+++ new/cups-filters-1.0.54/filter/gstoraster.c 2014-06-06 10:49:59.000000000 +0200
@@ -621,11 +621,11 @@
goto out;
}
- /* support colord and the "color-management=off" option */
+ /* support colord and the "no-color-management" option */
snprintf (tmpstr, sizeof(tmpstr), "cups-%s", getenv("PRINTER"));
device_inhibited = colord_get_inhibit_for_device_id (tmpstr);
- t = cupsGetOption("color-management", num_options, options);
- if (t != NULL && strcmp(t, "off") == 0)
+ t = cupsGetOption("no-color-management", num_options, options);
+ if (t != NULL)
device_inhibited = 1;
if (device_inhibited)
fprintf(stderr, "DEBUG: Device is inhibited, no CM performed\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/imagetoraster.c new/cups-filters-1.0.54/filter/imagetoraster.c
--- old/cups-filters-1.0.53/filter/imagetoraster.c 2013-12-10 22:20:15.000000000 +0100
+++ new/cups-filters-1.0.54/filter/imagetoraster.c 2014-06-06 10:49:59.000000000 +0200
@@ -191,6 +191,7 @@
int plane, /* Current color plane */
num_planes; /* Number of color planes */
char filename[1024]; /* Name of file to print */
+ int cm_off; /* Is color management off? */
/*
@@ -492,6 +493,12 @@
else
resolution = "";
+ /* support the "no-color-management" option */
+ if ((cupsGetOption("no-color-management", num_options, options)) == NULL)
+ cm_off = 1;
+ else
+ cm_off = 0;
+
/*
* Choose the appropriate colorspace...
*/
@@ -603,8 +610,9 @@
/*
* Find a color profile matching the current options...
*/
-
- if ((val = cupsGetOption("profile", num_options, options)) != NULL)
+
+ if ((val = cupsGetOption("profile", num_options, options)) != NULL &&
+ !cm_off)
{
profile = &userprofile;
sscanf(val, "%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f",
@@ -628,7 +636,8 @@
userprofile.matrix[2][1] *= 0.001f;
userprofile.matrix[2][2] *= 0.001f;
}
- else if (ppd != NULL)
+ else if (ppd != NULL &&
+ !cm_off)
{
fprintf(stderr, "DEBUG: Searching for profile \"%s/%s\"...\n",
resolution, media_type);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.53/filter/pdftoraster.cxx new/cups-filters-1.0.54/filter/pdftoraster.cxx
--- old/cups-filters-1.0.53/filter/pdftoraster.cxx 2013-12-10 22:20:15.000000000 +0100
+++ new/cups-filters-1.0.54/filter/pdftoraster.cxx 2014-06-06 12:40:02.000000000 +0200
@@ -105,6 +105,7 @@
unsigned int plane, unsigned int pixeli, unsigned char *pixelBuf);
int exitCode = 0;
+ int pwgraster = 0;
int deviceCopies = 1;
bool deviceCollate = false;
cups_page_header2_t header;
@@ -187,6 +188,7 @@
cmsHTRANSFORM colorTransform = NULL;
cmsCIEXYZ D65WhitePoint;
int renderingIntent = INTENT_PERCEPTUAL;
+ bool cm_off = false;
}
#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
@@ -441,13 +443,18 @@
}
}
}
- if (getColorProfilePath(ppd,&profilePath)) {
- /* ICCProfile is specified */
- colorProfile = cmsOpenProfileFromFile(profilePath.getCString(),"r");
+ /* support the "no-color-management" option */
+ if (cupsGetOption("no-color-management", num_options, options) == NULL)
+ cm_off = true;
+ if (!cm_off) {
+ if (getColorProfilePath(ppd,&profilePath)) {
+ /* ICCProfile is specified */
+ colorProfile = cmsOpenProfileFromFile(profilePath.getCString(),"r");
+ }
}
} else {
#ifdef HAVE_CUPS_1_7
- int pwgraster = 1;
+ pwgraster = 1;
const char *t = cupsGetOption("media-class", num_options, options);
if (t == NULL)
t = cupsGetOption("MediaClass", num_options, options);
@@ -731,8 +738,12 @@
{CUPS_CSPACE_KCMY,32,8,rgbToKCMYLine,true,rgbToKCMYLineSwap,true},
{CUPS_CSPACE_CMY,24,8,rgbToCMYLine,true,rgbToCMYLineSwap,true},
{CUPS_CSPACE_RGB,24,8,lineNoop,false,lineSwap24,true},
+ {CUPS_CSPACE_SRGB,24,8,lineNoop,false,lineSwap24,true},
+ {CUPS_CSPACE_ADOBERGB,24,8,lineNoop,false,lineSwap24,true},
{CUPS_CSPACE_W,8,8,lineNoop,false,lineSwapByte,true},
{CUPS_CSPACE_W,1,1,lineNoop,false,lineSwapBit,true},
+ {CUPS_CSPACE_SW,8,8,lineNoop,false,lineSwapByte,true},
+ {CUPS_CSPACE_SW,1,1,lineNoop,false,lineSwapBit,true},
{CUPS_CSPACE_WHITE,8,8,lineNoop,false,lineSwapByte,true},
{CUPS_CSPACE_WHITE,1,1,lineNoop,false,lineSwapBit,true},
{CUPS_CSPACE_RGB,0,0,NULL,false,NULL,false} /* end mark */
@@ -1414,9 +1425,12 @@
convertCSpace = RGB8toRGBA;
break;
case CUPS_CSPACE_RGB:
+ case CUPS_CSPACE_SRGB:
+ case CUPS_CSPACE_ADOBERGB:
convertCSpace = convertCSpaceNone;
break;
case CUPS_CSPACE_W:
+ case CUPS_CSPACE_SW:
case CUPS_CSPACE_WHITE:
convertCSpace = convertCSpaceNone;
break;
@@ -1525,11 +1539,7 @@
for (unsigned int band = 0;band < nbands;band++) {
dp = convertLine(bp,lineBuf,h,plane+band,header.cupsWidth,
bytesPerLine);
- if (cupsRasterWritePixels(raster,dp,bytesPerLine)
- != bytesPerLine) {
- pdfError(-1,const_cast
participants (1)
-
root@hilbert.suse.de