hplip: version bump to 3.22.2

2022-03-12 00:27:24 +03:00
parent afd17f7ba5
commit 45070e18a4
3 changed files with 28 additions and 101 deletions
@@ -1,37 +1,25 @@
-From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Tue, 21 Aug 2018 18:18:10 +0200
-Subject: Remove all ImageProcessor functionality, which is closed-source
-
---
- Makefile.am                  | 14 ++------------
- prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
- 2 files changed, 2 insertions(+), 33 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1b097c4f9..8d5d78c9f 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
+--- hplip-3.21.10_old/Makefile.am	2021-11-12 18:11:58.692675460 +0100
+++ hplip-3.21.10/Makefile.am	2021-11-12 18:14:12.582672763 +0100
+@@ -167,7 +167,7 @@
 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
 endif #HPLIP_CLASS_DRIVER
- 
+
 -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
 +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
+
+ dist_noinst_DATA += prnt/ipp-usb/HPLIP.conf
 dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
- 
- if !HPLIP_CLASS_DRIVER
-@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
+@@ -597,7 +597,7 @@
 	prnt/hpcups/ImageProcessor.h
- 
+
 hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
 -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
 +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
 #else
 #hpcupsdir = $(cupsfilterdir)
 #hpcups_PROGRAMS = hpcups
-@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
- 
+@@ -687,16 +687,6 @@
+
 install-data-hook:
 if HPLIP_BUILD
 -	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
@@ -44,80 +32,6 @@ index 1b097c4f9..8d5d78c9f 100644
 -		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
 -		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
 -	fi
- if !HPLIP_CLASS_DRIVER
- #	   If scanner build, add hpaio entry to sane dll.conf.
- 	if [ "$(scan_build)" = "yes" ]; then \
--- 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 @@
- \*****************************************************************************/
- 
- #include "HPCupsFilter.h"
-#include "ImageProcessor.h"
- 
- #include <signal.h>
- #include <sys/wait.h>
-@@ -651,21 +650,9 @@
- 
-     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
-  
-    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))
-     {
-       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) {
-@@ -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
-@@ -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;
-@@ -824,10 +795,6 @@
-     }
- 
-  
-   if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
-   {
-    imageProcessorDestroy(imageProcessor);
-   }
-     unlink(hpPreProcessedRasterFile);
-     return ret_status;
- }
+ 	if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
+ 		echo "ipp-usb directory exists"; \
+ 		cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \