Merge pull request #9278 from suvari/master

hplip: version bump to 3.21.2

hardware/printer/hplip/actions.py

@@ -56,7 +56,7 @@ def setup():
                          --disable-policykit \
                          --disable-doc-build \
                          --disable-foomatic-ppd-install \
-                         --disable-foomatic-rip-hplip-install")
+                         ")
 
     # Remove hardcoded rpaths
     pisitools.dosed("libtool", "^hardcode_libdir_flag_spec=.*", "hardcode_libdir_flag_spec=\"\"")
@@ -71,6 +71,9 @@ def install():
     # Create a compatibility symlink for foomatic-rip-hplip
     pisitools.dosym("/usr/lib/cups/filter/foomatic-rip", "/usr/lib/cups/filter/foomatic-rip-hplip")
     
+    # Install documents
+    pisitools.dodoc("COPYING")
+    
     # Remove the hal preprobe rules as they were causing breakage (bug #479648).
     # Remove hal directory as well.
     pisitools.removeDir("/usr/share/hal/")
@@ -94,3 +97,4 @@ def install():
 
     # --disable-doc-build used. It doesn't go to the true directory.
     pisitools.dohtml("doc/*")
+    

hardware/printer/hplip/files/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch

@@ -0,0 +1,123 @@
+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
+ 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_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
+ 	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
+ 
+ install-data-hook:
+ if HPLIP_BUILD
+-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
+-	fi; \
+-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		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;
+ }

hardware/printer/hplip/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>hplip</Name>
@@ -8,11 +8,11 @@
             <Name>Pisi Linux Admins</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
-        <License>GPLv2+</License>
+        <License>custom</License>
-        <License>MIT</License>
+        <License>GPL2</License>
         <Summary>HP Linux Imaging and Printing System</Summary>
         <Description>HP Linux Imaging and Printing (HPLIP) System includes printer and scanner drivers and related service tools.</Description>
-        <Archive sha1sum="80b7c35adaa287ff51aa6938bf52046d06a32058" type="targz">mirrors://sourceforge/hplip/hplip-3.18.4.tar.gz</Archive>
+        <Archive sha1sum="149070eed123933e2702082a21c9b95a0b0d9929" type="targz">mirrors://sourceforge/hplip/hplip-3.21.2.tar.gz</Archive>
         <AdditionalFiles>
             <!-- PPD patcher -->
             <AdditionalFile permission="0755" target="patch-ppds">patch-ppds.sh</AdditionalFile>
@@ -35,23 +35,24 @@
             <Dependency>dbus-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>desktop-file-utils</Dependency>
+            <Dependency>avahi-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">fedora/hplip-avahi-parsing.patch</Patch>
             <Patch level="1">fedora/hplip-bad-low-ink-warning.patch</Patch>
             <Patch level="1">fedora/hplip-check-cups.patch</Patch>
             <Patch level="1">fedora/hplip-clear-old-state-reasons.patch</Patch>
-            <Patch level="1">fedora/hplip-colorlaserjet-mfp-m278-m281.patch</Patch>
+<!--             <Patch level="1">fedora/hplip-colorlaserjet-mfp-m278-m281.patch</Patch> -->
             <Patch level="1">fedora/hplip-device-reconnected.patch</Patch>
-            <Patch level="1">fedora/hplip-deviceIDs-drv.patch</Patch>
+<!--             <Patch level="1">fedora/hplip-deviceIDs-drv.patch</Patch> -->
             <Patch level="1">fedora/hplip-dj990c-margin.patch</Patch>
             <Patch level="1">fedora/hplip-3165-sourceoption.patch</Patch>
             <Patch level="1">fedora/hplip-hpcups-sigpipe.patch</Patch>
             <Patch level="1">fedora/hplip-hpijs-marker-supply.patch</Patch>
-            <Patch level="1">fedora/hplip-jpeg-compression.patch</Patch>
+<!--             <Patch level="1">fedora/hplip-jpeg-compression.patch</Patch> -->
-            <Patch level="1">fedora/hplip-lineart.patch</Patch>
+<!--             <Patch level="1">fedora/hplip-lineart.patch</Patch> -->
             <Patch level="1">fedora/hplip-log-stderr.patch</Patch>
-	    <Patch level="1">fedora/hplip-logdir.patch</Patch>
+<!-- 	    <Patch level="1">fedora/hplip-logdir.patch</Patch> -->
             <Patch level="1">fedora/hplip-no-asm.patch</Patch>
             <Patch level="1">fedora/hplip-no-write-bytecode.patch</Patch>
             <Patch level="1">fedora/hplip-noernie.patch</Patch>
@@ -71,7 +72,7 @@
             <!-- PisiLinuX patches -->
             <Patch level="1">pisilinux/desktop-i18n.patch</Patch>
             <Patch level="0">pisilinux/desktop-i18n-1.patch</Patch>
-            <Patch level="1">pisilinux/add-pisilinux-support.patch</Patch>
+<!--             <Patch level="1">pisilinux/add-pisilinux-support.patch</Patch> -->
             <Patch level="1">pisilinux/fix-polkit-directory.patch</Patch>
 
             <!-- Suppress module warnings when the command is run as root -->
@@ -80,6 +81,7 @@
             <!-- Consume session parameter from systray as it avoids startup -->
             <Patch level="1">pisilinux/hp-systray-consume-session-param.patch</Patch>
             <Patch level="1">Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch</Patch>
+            <Patch level="1">0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch</Patch>
         </Patches>
     </Source>
 
@@ -93,12 +95,16 @@
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>net-snmp</Dependency>
             <Dependency>foomatic-db</Dependency>
+            <Dependency>foomatic-db-engine</Dependency>
             <Dependency>sane-backends</Dependency>
+            <Dependency>sane-frontends</Dependency>
             <Dependency>cups</Dependency>
             <Dependency>dbus</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libusb</Dependency>
             <Dependency>openssl</Dependency>
+            <Dependency>avahi</Dependency>
+            <Dependency>avahi-libs</Dependency>
 <!--             <Dependency>usb-modeswitch</Dependency> -->
         </RuntimeDependencies>
         <Files>
@@ -172,6 +178,13 @@
     </Package>
 
     <History>
+        <Update release="10">
+            <Date>2021-04-26</Date>
+            <Version>3.21.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="9">
             <Date>2020-03-10</Date>
             <Version>3.18.4</Version>