[rpms/libcupsfilters] f45: fix scaling, output order and booklet printing

[rpms/libcupsfilters] f45: fix scaling, output order and booklet printing

[Zdenek Dohnal]

A new commit has been pushed.

Repo   : rpms/libcupsfilters
Branch : f45
Commit : e588bcf5e377874969cfbc6d4b972f49757c5033
Author : Zdenek Dohnal <zdohnal@redhat.com>
Date   : 2026-09-08T12:35:21+02:00
Stats  : +80/-1 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/libcupsfilters/c/e588bcf5e377874969cfbc6d4b972f49757c5033?branch=f45

Log:
fix scaling, output order and booklet printing

---
diff --git a/0001-Fix-minor-errors-this-caused-issue-239.-240.patch b/0001-Fix-minor-errors-this-caused-issue-239.-240.patch
new file mode 100644
index 0000000..5408666
--- /dev/null
+++ b/0001-Fix-minor-errors-this-caused-issue-239.-240.patch
@@ -0,0 +1,39 @@
+From cb82339e748b6c1b0509060526dbd52e74968829 Mon Sep 17 00:00:00 2001
+From: szlt5 <117269245+szlt5@users.noreply.github.com>
+Date: Tue, 8 Sep 2026 17:16:39 +0800
+Subject: [PATCH] Fix minor errors; this caused issue #239. (#240)
+
+---
+ cupsfilters/ipp-options.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/cupsfilters/ipp-options.c b/cupsfilters/ipp-options.c
+index d3fed1ae..506056e4 100644
+--- a/cupsfilters/ipp-options.c
++++ b/cupsfilters/ipp-options.c
+@@ -404,7 +404,8 @@ cfFilterOptionsCreate(size_t num_options,   // I - Number of command-line option
+   ippo->separator_media       = ippo->media;
+ 
+   // Set the rest of the options...
+-  if ((value = get_option("output-order", num_options, options)) != NULL)
++  if ((value = get_option("outputorder", num_options, options)) != NULL ||
++      (value = cupsGetOption("output-order", num_options, options)) != NULL)
+   {
+     if (!strcasecmp(value, "reverse"))
+       ippo->reverse_order = true;
+@@ -492,9 +493,9 @@ cfFilterOptionsCreate(size_t num_options,   // I - Number of command-line option
+   if ((value = get_option("imposition-template", num_options, options)) != NULL ||
+       (value = get_option("booklet", num_options, options)) != NULL)
+   {
+-    if(strcasecmp(value, "yes") ||
+-       strcasecmp(value, "true") ||
+-       strcasecmp(value, "booklet")) 
++    if(!strcasecmp(value, "yes") ||
++       !strcasecmp(value, "true") ||
++       !strcasecmp(value, "booklet")) 
+     {
+       cupsCopyString(ippo->imposition_template, "booklet", sizeof(ippo->imposition_template));
+     }
+-- 
+2.55.0
+

diff --git a/0001-pdftopdf-assume-print-scaling-auto-by-default.-Fixes.patch b/0001-pdftopdf-assume-print-scaling-auto-by-default.-Fixes.patch
new file mode 100644
index 0000000..478ec05
--- /dev/null
+++ b/0001-pdftopdf-assume-print-scaling-auto-by-default.-Fixes.patch
@@ -0,0 +1,31 @@
+From 1973c4a959ad0041b07e2f2616bd153e0c218d4d Mon Sep 17 00:00:00 2001
+From: ValdikSS <iam@valdikss.org.ru>
+Date: Tue, 8 Sep 2026 12:13:51 +0300
+Subject: [PATCH] pdftopdf: assume print-scaling=auto by default. Fixes #237
+ (#238)
+
+cups-filters 1.x rotate already-landscape documents according to printer
+paper path, and libcupsfilters 2.1.x do the same at least since V2.0rc1,
+where print-scaling=auto was used as default.
+
+Use print-scaling=auto as default for PDFio pdftopdf as well.
+---
+ cupsfilters/ipp-options.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cupsfilters/ipp-options.c b/cupsfilters/ipp-options.c
+index 27f0a391..d3fed1ae 100644
+--- a/cupsfilters/ipp-options.c
++++ b/cupsfilters/ipp-options.c
+@@ -368,7 +368,7 @@ cfFilterOptionsCreate(size_t num_options,   // I - Number of command-line option
+   ippo->copies                     = 1;
+   ippo->image_orientation          = CF_FILTER_ORIENT_NONE;
+   ippo->multiple_document_handling = CF_FILTER_HANDLING_COLLATED_COPIES;
+-  ippo->print_scaling 		   = CF_FILTER_SCALING_NONE;
++  ippo->print_scaling 		   = CF_FILTER_SCALING_AUTO;
+   ippo->number_up                  = 1;
+   ippo->orientation_requested      = CF_FILTER_ORIENT_NONE;
+   ippo->page_set      		   = CF_FILTER_PAGESET_ALL;
+-- 
+2.55.0
+

diff --git a/libcupsfilters.spec b/libcupsfilters.spec
index aa62e9f..787834d 100644
--- a/libcupsfilters.spec
+++ b/libcupsfilters.spec
@@ -7,7 +7,7 @@
 Name: libcupsfilters
 Epoch: 1
 Version: 2.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Library for developing printing filters
 # the CUPS exception text is the same as LLVM exception, so using that name with
 # agreement from legal team
@@ -23,6 +23,12 @@ Patch002: 0001-pclmtoraster.c-Fix-processing-image-in-PCLm.patch
 Patch003: 0001-Fix-printing-error-pdfio-output-Missing-Root-object..patch
 # https://github.com/OpenPrinting/libcupsfilters/pull/228
 Patch004: 0001-Honor-data-copies-in-cfFilterPDFToPDF.patch
+# fix scaling
+# https://github.com/OpenPrinting/libcupsfilters/pull/238/
+Patch005: 0001-pdftopdf-assume-print-scaling-auto-by-default.-Fixes.patch
+# fix output order and booklet printing
+# https://github.com/OpenPrinting/libcupsfilters/commit/cb82339e748b6c1b0509060526dbd52e74968829
+Patch006: 0001-Fix-minor-errors-this-caused-issue-239.-240.patch
 
 
 # for generating configure and Makefile scripts in autogen.h
@@ -208,6 +214,9 @@ rm -f %{buildroot}%{_pkgdocdir}/{LICENSE,COPYING,NOTICE}
 
 
 %changelog
+* Tue Sep 08 2026 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.1-4
+- fix scaling, output order and booklet printing
+
 * Fri Sep 04 2026 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.1-3
 - fix multiple copies not working for raster drivers (rhbz#2517684)