Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10091 from suvari/master

Browse Source 
hplip: version bump to 3.22.2
This commit is contained in:
Kamil ATLI
2022-03-12 00:28:01 +03:00
committed by GitHub
parent 817696fb02 45070e18a4
commit 1d7df0e3e2
3 changed files with 28 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/printer/hplip/actions.py
+1 -1
View File
@@ -40,7 +40,6 @@ def setup():
--with-docdir=/usr/share/doc/hplip \ --with-docdir=/usr/share/doc/hplip \
--with-mimedir=/usr/share/cups/mime \ --with-mimedir=/usr/share/cups/mime \
--enable-qt5 \ --enable-qt5 \
--enable-hpijs-install \
--enable-udev-acl-rules \ --enable-udev-acl-rules \
--enable-pp-build \ --enable-pp-build \
--enable-fax-build \ --enable-fax-build \
@@ -55,6 +54,7 @@ def setup():
--disable-qt3 \ --disable-qt3 \
--disable-policykit \ --disable-policykit \
--disable-doc-build \ --disable-doc-build \
--disable-imageProcessor-build \
--disable-foomatic-ppd-install \ --disable-foomatic-ppd-install \
") ")
hardware/printer/hplip/files/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+13 -99
View File
@@ -1,37 +1,25 @@
From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 --- hplip-3.21.10_old/Makefile.am 2021-11-12 18:11:58.692675460 +0100
From: Didier Raboud <odyx@debian.org> +++ hplip-3.21.10/Makefile.am 2021-11-12 18:14:12.582672763 +0100
Date: Tue, 21 Aug 2018 18:18:10 +0200 @@ -167,7 +167,7 @@
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 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER 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 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/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 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
@@ -597,7 +597,7 @@
if !HPLIP_CLASS_DRIVER
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
prnt/hpcups/ImageProcessor.h prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) 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 -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
#else #else
#hpcupsdir = $(cupsfilterdir) #hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups #hpcups_PROGRAMS = hpcups
@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER @@ -687,16 +687,6 @@
install-data-hook: install-data-hook:
if HPLIP_BUILD if HPLIP_BUILD
- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ - if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
@@ -44,80 +32,6 @@ index 1b097c4f9..8d5d78c9f 100644
- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
- fi - fi
if !HPLIP_CLASS_DRIVER if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
# If scanner build, add hpaio entry to sane dll.conf. echo "ipp-usb directory exists"; \
if [ "$(scan_build)" = "yes" ]; then \ cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
--- 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
+14 -1
View File
@@ -12,7 +12,7 @@
<License>GPL2</License> <License>GPL2</License>
<Summary>HP Linux Imaging and Printing System</Summary> <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> <Description>HP Linux Imaging and Printing (HPLIP) System includes printer and scanner drivers and related service tools.</Description>
<Archive sha1sum="149070eed123933e2702082a21c9b95a0b0d9929" type="targz">mirrors://sourceforge/hplip/hplip-3.21.2.tar.gz</Archive> <Archive sha1sum="4a7aae1f3a33ca98611a8b26b9fa8a1b851253b0" type="targz">mirrors://sourceforge/hplip/hplip-3.22.2.tar.gz</Archive>
<AdditionalFiles> <AdditionalFiles>
<!-- PPD patcher --> <!-- PPD patcher -->
<AdditionalFile permission="0755" target="patch-ppds">patch-ppds.sh</AdditionalFile> <AdditionalFile permission="0755" target="patch-ppds">patch-ppds.sh</AdditionalFile>
@@ -26,6 +26,7 @@
<Dependency>zlib-devel</Dependency> <Dependency>zlib-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency> <Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>foomatic-db</Dependency> <Dependency>foomatic-db</Dependency>
<Dependency>rpcbind</Dependency>
<Dependency>net-snmp-devel</Dependency> <Dependency>net-snmp-devel</Dependency>
<Dependency>sane-backends-devel</Dependency> <Dependency>sane-backends-devel</Dependency>
<Dependency>cups-devel</Dependency> <Dependency>cups-devel</Dependency>
@@ -37,6 +38,9 @@
<Dependency>desktop-file-utils</Dependency> <Dependency>desktop-file-utils</Dependency>
<Dependency>avahi-devel</Dependency> <Dependency>avahi-devel</Dependency>
<Dependency>python-reportlab</Dependency> <Dependency>python-reportlab</Dependency>
<Dependency>libxcrypt-devel</Dependency>
<Dependency>python-pillow-devel</Dependency>
<!-- <Dependency>python-qt5-devel</Dependency> -->
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">fedora/hplip-avahi-parsing.patch</Patch> <Patch level="1">fedora/hplip-avahi-parsing.patch</Patch>
@@ -92,6 +96,7 @@
<IsA>library</IsA> <IsA>library</IsA>
<IsA>driver</IsA> <IsA>driver</IsA>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>wget</Dependency>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>libjpeg-turbo</Dependency> <Dependency>libjpeg-turbo</Dependency>
<Dependency>net-snmp</Dependency> <Dependency>net-snmp</Dependency>
@@ -106,6 +111,7 @@
<Dependency>openssl</Dependency> <Dependency>openssl</Dependency>
<Dependency>avahi</Dependency> <Dependency>avahi</Dependency>
<Dependency>avahi-libs</Dependency> <Dependency>avahi-libs</Dependency>
<Dependency>python-pillow</Dependency>
<Dependency>python-reportlab</Dependency> <Dependency>python-reportlab</Dependency>
<!-- <Dependency>usb-modeswitch</Dependency> --> <!-- <Dependency>usb-modeswitch</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
@@ -180,6 +186,13 @@
</Package> </Package>
<History> <History>
<Update release="11">
<Date>2022-03-12</Date>
<Version>3.22.2</Version>
<Comment>Version bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="10"> <Update release="10">
<Date>2021-04-26</Date> <Date>2021-04-26</Date>
<Version>3.21.2</Version> <Version>3.21.2</Version>