[arch-commits] Commit in hplip/trunk (2 files)

[Andreas Radke]

    Date: Monday, February 22, 2021 @ 09:43:55
  Author: andyrtr
Revision: 408585

upgpkg: hplip 1:3.21.2-1: upstream update 3.21.2

Modified:
  hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
  hplip/trunk/PKGBUILD

-----------------------------------------------------------------+
 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch |   46 ++++++----
 PKGBUILD                                                        |    8 -
 2 files changed, 32 insertions(+), 22 deletions(-)

Modified: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
===================================================================
--- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch	2021-02-22 08:03:03 UTC (rev 408584)
+++ 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch	2021-02-22 09:43:55 UTC (rev 408585)
@@ -47,10 +47,8 @@
  if !HPLIP_CLASS_DRIVER
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	if [ "$(scan_build)" = "yes" ]; then \
-diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
-index 5b282d83f..0bacfafac 100644
---- a/prnt/hpcups/HPCupsFilter.cpp
-+++ b/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.21.2/prnt/hpcups/HPCupsFilter.cpp	2021-02-15 00:55:21.000000000 +0100
++++ hplip-3.21.2/prnt/hpcups/HPCupsFilter.cpp.new	2021-02-22 08:34:47.515932980 +0100
 @@ -31,7 +31,6 @@
  \*****************************************************************************/
  
@@ -59,55 +57,67 @@
  
  #include <signal.h>
  #include <sys/wait.h>
-@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+@@ -651,21 +650,9 @@
  
- 
      sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
--    image_processor_t* imageProcessor = imageProcessorCreate();
- 
+  
+-    image_processor_t* imageProcessor=NULL;
+-    IMAGE_PROCESSOR_ERROR result;
+-    //added if condition to check if pinter language is "ljzjstream"
+-    //If so, then bypass imageprocessing functions while running HPCUPS filter.
+-    if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
+-        imageProcessor = imageProcessorCreate();
+-    }
      while (cupsRasterReadHeader2(cups_raster, &cups_header))
      {
- 
--        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
+-       if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
+-        result = imageProcessorStartPage(imageProcessor, &cups_header);
 -        if (result != IPE_SUCCESS){
 -            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
 -        }
--
+-     }
++
          current_page_number++;
  
          if (current_page_number == 1) {
-@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+@@ -764,14 +751,6 @@
              color_raster = rgbRaster;
              black_raster = kRaster;
  
+-	if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+-	{
 -            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
 -            if (result != IPE_SUCCESS){
 -                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
 -            }
+-	}
 -
--
              if ((y == 0) && !is_ljmono) {
                  //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
                  //may not skip blank lines before actual data
-@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+@@ -801,14 +780,6 @@
              }
          }  // for() loop end
  
+-	if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+-	{
 -        result = imageProcessorEndPage(imageProcessor);
 -        if (result != IPE_SUCCESS){
 -                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
 -        }
+-	}
 -
--
          m_Job.NewPage();
          if (err != NO_ERROR) {
              break;
-@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
-         rgbRaster = NULL;
+@@ -824,10 +795,6 @@
      }
  
+  
+-   if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+-   {
 -    imageProcessorDestroy(imageProcessor);
--
+-   }
      unlink(hpPreProcessedRasterFile);
      return ret_status;
  }

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-22 08:03:03 UTC (rev 408584)
+++ PKGBUILD	2021-02-22 09:43:55 UTC (rev 408585)
@@ -4,8 +4,8 @@
 # Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.20.11
-pkgrel=2
+pkgver=3.21.2
+pkgrel=1
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
@@ -35,12 +35,12 @@
         python3.diff
         hplip-thread-isalive-removed.patch
         reproducible-gzip.patch)
-sha512sums=('f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d'
+sha512sums=('73ba37275cfe34a58b81c9656514e15da67c1a69af5471ad132a1538d324efe640879cb7e60c359915607e41b63e653e7ae757661e553235f6e83e378ab46474'
             'SKIP'
             'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
             '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
             '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
-            '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
+            '25b701fdac63a8a85989616b66b8760fbf8e0ae9418c8cd0d39cf932f65b9534da6ddd0374b205c78f77153733a871086a70ac7922d9a969dbfae6eabba74253'
             '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'
             '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'
             '6cf68bbc5c2b1a03ca8528e834e9867d33b982a9fa073d28c9faa514d5057d9b71de6fb494597d3b496ee56b68a179b2e11ba14cec4d01c4fc7dec72a4a2ff0b'