Skip to content

GitLab

H
hplip
Commit ff8cef63 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated hplip to 3.21.4

parent faeb85a4
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 230 deletions
Makefile
View file @ ff8cef63
all: all:
tar xf hplip-3.20.6.tar.gz tar xf hplip-3.21.4.tar.gz
patch -Np1 -d hplip-3.20.6 < hplip-3.20.6-arm64.patch patch -Np1 -d hplip-3.21.4 < hplip-3.21.4-arm64.patch
patch -Np1 -d hplip-3.20.6 < hplip-3.20.6-no_libImageProcessor.patch cd hplip-3.21.4 && ./configure --prefix=/usr --disable-scan-build --disable-imageProcessor-build --disable-network-build
cd hplip-3.20.6 && ./configure --prefix=/usr --disable-scan-build $(MAKE) -C hplip-3.21.4
$(MAKE) -C hplip-3.20.6 $(MAKE) -C hplip-3.21.4 install
$(MAKE) -C hplip-3.20.6 install rm -rf hplip-3.21.4
rm -rf hplip-3.20.6
hplip-3.20.6-no_libImageProcessor.patch deleted 100644 → 0
View file @ faeb85a4
diff -uNr hplip-3.20.6/Makefile.am hplip-3.20.6-no_libImageProcessor/Makefile.am
--- hplip-3.20.6/Makefile.am 2020-06-18 22:37:43.000000000 +0930
+++ hplip-3.20.6-no_libImageProcessor/Makefile.am 2021-07-29 11:09:37.147496375 +0930
@@ -166,7 +166,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
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
@@ -590,11 +590,10 @@
prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
prnt/hpcups/genPCLm.h \
common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
- prnt/hpcups/ImageProcessor.h
+ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
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
@@ -679,21 +678,10 @@
dist_filter_DATA = hpcups hpps dat2drv
-dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so prnt/plugins/lj-x86_64.so
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 \
@@ -874,10 +862,6 @@
rm -rf $(distdir)/setup.py
rm -rf $(distdir)/systray.py
rm -rf $(distdir)/timedate.py
- rm -rf $(distdir)/prnt/plugins/lj-arm32.so
- rm -rf $(distdir)/prnt/plugins/lj-arm64.so
- rm -rf $(distdir)/prnt/plugins/lj-x86_32.so
- rm -rf $(distdir)/prnt/plugins/lj-x86_64.so
rm -rf $(distdir)/hpijs-drv
rm -rf $(distdir)/prnt/hpcups/
rm -rf $(distdir)/prnt/ps/
diff -uNr hplip-3.20.6/Makefile.in hplip-3.20.6-no_libImageProcessor/Makefile.in
--- hplip-3.20.6/Makefile.in 2020-06-18 22:39:56.000000000 +0930
+++ hplip-3.20.6-no_libImageProcessor/Makefile.in 2021-07-29 11:09:37.149496382 +0930
@@ -103,7 +103,7 @@
# ip library
@HPLIP_BUILD_TRUE@am__append_12 = libhpip.la
-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_14 = dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \
@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ installer/text_install.py \
@@ -500,8 +500,7 @@
prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
prnt/hpcups/genPCLm.h common/utils.c common/utils.h \
prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
- prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
- prnt/hpcups/ImageProcessor.h
+ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
@HPCUPS_INSTALL_TRUE@am_hpcups_OBJECTS = \
@HPCUPS_INSTALL_TRUE@ hpcups-HPCupsFilter.$(OBJEXT) \
@HPCUPS_INSTALL_TRUE@ hpcups-dbuscomm.$(OBJEXT) \
@@ -728,8 +727,7 @@
am__dist_models_DATA_DIST = data/models/models.dat
am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \
prnt/drv/hpcups.drv.in.template \
- prnt/hpcups/libImageProcessor-x86_64.so \
- prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \
+ scan/sane/hpaio.desc \
installer/text_install.py data/localization/hplip_de.ts \
data/localization/hplip_es.ts data/localization/hplip_fr.ts \
data/localization/hplip_it.ts data/localization/hplip_pt.ts \
@@ -2030,11 +2028,6 @@
ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \
ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \
ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
-am__dist_printplugins_DATA_DIST = prnt/plugins/hbpl1-arm32.so \
- prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so \
- prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so \
- prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so \
- prnt/plugins/lj-x86_64.so
am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
prnt/pcl.py prnt/colorcal.py
am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
@@ -4850,11 +4843,10 @@
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
-@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
+@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -4902,7 +4894,6 @@
@HPLIP_CLASS_DRIVER_TRUE@filterdir = $(cupsfilterdir)
@HPLIP_CLASS_DRIVER_TRUE@printpluginsdir = $(cupsfilterdir)
@HPLIP_CLASS_DRIVER_TRUE@dist_filter_DATA = hpcups hpps dat2drv
-@HPLIP_CLASS_DRIVER_TRUE@dist_printplugins_DATA = prnt/plugins/hbpl1-arm32.so prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so prnt/plugins/lj-x86_64.so
all: all-am
.SUFFIXES:
@@ -9625,16 +9616,6 @@
install-data-hook:
-@HPLIP_BUILD_TRUE@ if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
-@HPLIP_BUILD_TRUE@ fi; \
-@HPLIP_BUILD_TRUE@ if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
-@HPLIP_BUILD_TRUE@ cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
-@HPLIP_BUILD_TRUE@ chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
-@HPLIP_BUILD_TRUE@ ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
-@HPLIP_BUILD_TRUE@ fi
# If scanner build, add hpaio entry to sane dll.conf.
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
@@ -9801,10 +9782,6 @@
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/setup.py
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/systray.py
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/timedate.py
-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-arm32.so
-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-arm64.so
-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-x86_32.so
-@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/plugins/lj-x86_64.so
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/hpijs-drv
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/hpcups/
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/ps/
diff -uNr hplip-3.20.6/prnt/hpcups/HPCupsFilter.cpp hplip-3.20.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.20.6/prnt/hpcups/HPCupsFilter.cpp 2020-06-18 22:37:39.000000000 +0930
+++ hplip-3.20.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp 2021-07-29 11:09:37.149496382 +0930
@@ -31,8 +31,6 @@
\*****************************************************************************/
#include "HPCupsFilter.h"
-#include "ImageProcessor.h"
-
#include <signal.h>
#include <sys/wait.h>
#include <sys/utsname.h>
@@ -637,16 +635,9 @@
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
- image_processor_t* imageProcessor = imageProcessorCreate();
while (cupsRasterReadHeader2(cups_raster, &cups_header))
{
-
- IMAGE_PROCESSOR_ERROR 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 +736,6 @@
color_raster = rgbRaster;
black_raster = kRaster;
- 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 +765,6 @@
}
} // for() loop end
- 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 +779,6 @@
rgbRaster = NULL;
}
- imageProcessorDestroy(imageProcessor);
-
unlink(hpPreProcessedRasterFile);
return ret_status;
}
hplip-3.20.6-arm64.patch → hplip-3.21.4-arm64.patch
View file @ ff8cef63
diff -uNr hplip-3.20.6/config.guess hplip-3.20.6-arm64/config.guess diff -uNr hplip-3.21.4/config.guess hplip-3.21.4-arm64/config.guess
--- hplip-3.20.6/config.guess 2011-05-12 17:26:51.000000000 +0930 --- hplip-3.21.4/config.guess 2011-05-12 17:26:51.000000000 +0930
+++ hplip-3.20.6-arm64/config.guess 2021-07-29 11:08:49.403334723 +0930 +++ hplip-3.21.4-arm64/config.guess 2023-08-11 23:43:31.138104577 +0930
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
...@@ -897,9 +897,9 @@ diff -uNr hplip-3.20.6/config.guess hplip-3.20.6-arm64/config.guess ...@@ -897,9 +897,9 @@ diff -uNr hplip-3.20.6/config.guess hplip-3.20.6-arm64/config.guess
config.guess timestamp = $timestamp config.guess timestamp = $timestamp
diff -uNr hplip-3.20.6/config.sub hplip-3.20.6-arm64/config.sub diff -uNr hplip-3.21.4/config.sub hplip-3.21.4-arm64/config.sub
--- hplip-3.20.6/config.sub 2011-05-12 17:26:51.000000000 +0930 --- hplip-3.21.4/config.sub 2011-05-12 17:26:51.000000000 +0930
+++ hplip-3.20.6-arm64/config.sub 2021-07-29 11:08:49.403334723 +0930 +++ hplip-3.21.4-arm64/config.sub 2023-08-11 23:43:31.139104581 +0930
@@ -1,38 +1,31 @@ @@ -1,38 +1,31 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment