gnu/packages/patches/hplip-remove-imageprocessor.patch

   1 This patch is based heavily on the Debian patch.
   2
   3 https://salsa.debian.org/printing-team/hplip/raw/debian/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
   4
   5 ---
   6  Makefile.am                  | 22 +++-------------------
   7  Makefile.in                  | 33 +++++----------------------------
   8  prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
   9  3 files changed, 8 insertions(+), 68 deletions(-)
  10
  11 diff --git a/Makefile.am b/Makefile.am
  12 index ef6480f..ecada5c 100644
  13 --- a/Makefile.am
  14 +++ b/Makefile.am
  15 @@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
  16  dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
  17  endif #HPLIP_CLASS_DRIVER
  18
  19 -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
  20 +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
  21  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
  22
  23  if !HPLIP_CLASS_DRIVER
  24 @@ -590,11 +590,10 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
  25         prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
  26         prnt/hpcups/genPCLm.h \
  27         common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
  28 -       prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
  29 -       prnt/hpcups/ImageProcessor.h
  30 +       prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
  31
  32  hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
  33 -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
  34 +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
  35  #else
  36  #hpcupsdir = $(cupsfilterdir)
  37  #hpcups_PROGRAMS = hpcups
  38 @@ -679,21 +678,10 @@ printpluginsdir=$(cupsfilterdir)
  39
  40
  41  dist_filter_DATA = hpcups hpps dat2drv
  42 -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
  43  endif #HPLIP_CLASS_DRIVER
  44
  45  install-data-hook:
  46  if HPLIP_BUILD
  47 -       if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
  48 -               cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
  49 -               chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
  50 -               ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
  51 -       fi; \
  52 -       if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
  53 -               cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
  54 -               chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
  55 -               ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
  56 -       fi
  57  if !HPLIP_CLASS_DRIVER
  58  #         If scanner build, add hpaio entry to sane dll.conf.
  59         if [ "$(scan_build)" = "yes" ]; then \
  60 @@ -874,10 +862,6 @@ if HPLIP_CLASS_DRIVER
  61         rm -rf $(distdir)/setup.py
  62         rm -rf $(distdir)/systray.py
  63         rm -rf $(distdir)/timedate.py
  64 -       rm -rf $(distdir)/prnt/plugins/lj-arm32.so
  65 -       rm -rf $(distdir)/prnt/plugins/lj-arm64.so
  66 -       rm -rf $(distdir)/prnt/plugins/lj-x86_32.so
  67 -       rm -rf $(distdir)/prnt/plugins/lj-x86_64.so
  68         rm -rf $(distdir)/hpijs-drv
  69         rm -rf $(distdir)/prnt/hpcups/
  70         rm -rf $(distdir)/prnt/ps/
  71 diff --git a/Makefile.in b/Makefile.in
  72 index 910a268..cd44203 100644
  73 --- a/Makefile.in
  74 +++ b/Makefile.in
  75 @@ -103,7 +103,7 @@ DIST_COMMON = $(am__configure_deps) \
  76
  77  # ip library
  78  @HPLIP_BUILD_TRUE@am__append_12 = libhpip.la
  79 -@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
  80 +@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_13 = prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
  81  @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
  82  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@am__append_15 = scan/sane/hpaio.desc \
  83  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@  installer/text_install.py \
  84 @@ -500,8 +500,7 @@ am__hpcups_SOURCES_DIST = prnt/hpcups/HPCupsFilter.cpp \
  85         prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
  86         prnt/hpcups/genPCLm.h common/utils.c common/utils.h \
  87         prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
  88 -       prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
  89 -       prnt/hpcups/ImageProcessor.h
  90 +       prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
  91  @HPCUPS_INSTALL_TRUE@am_hpcups_OBJECTS =  \
  92  @HPCUPS_INSTALL_TRUE@  hpcups-HPCupsFilter.$(OBJEXT) \
  93  @HPCUPS_INSTALL_TRUE@  hpcups-dbuscomm.$(OBJEXT) \
  94 @@ -723,8 +722,7 @@ am__dist_locatedriver_DATA_DIST = locatedriver
  95  am__dist_models_DATA_DIST = data/models/models.dat
  96  am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \
  97         prnt/drv/hpcups.drv.in.template \
  98 -       prnt/hpcups/libImageProcessor-x86_64.so \
  99 -       prnt/hpcups/libImageProcessor-x86_32.so scan/sane/hpaio.desc \
 100 +       scan/sane/hpaio.desc \
 101         installer/text_install.py data/localization/hplip_de.ts \
 102         data/localization/hplip_es.ts data/localization/hplip_fr.ts \
 103         data/localization/hplip_it.ts data/localization/hplip_pt.ts \
 104 @@ -1932,11 +1930,6 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-designjet_z6810ps_42in-ps.ppd.gz \
 105         ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \
 106         ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \
 107         ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
 108 -am__dist_printplugins_DATA_DIST = prnt/plugins/hbpl1-arm32.so \
 109 -       prnt/plugins/hbpl1-arm64.so prnt/plugins/hbpl1-x86_32.so \
 110 -       prnt/plugins/hbpl1-x86_64.so prnt/plugins/lj-arm32.so \
 111 -       prnt/plugins/lj-arm64.so prnt/plugins/lj-x86_32.so \
 112 -       prnt/plugins/lj-x86_64.so
 113  am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
 114         prnt/pcl.py prnt/colorcal.py
 115  am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
 116 @@ -4665,11 +4658,10 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
 117  @HPCUPS_INSTALL_TRUE@  prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
 118  @HPCUPS_INSTALL_TRUE@  prnt/hpcups/genPCLm.h \
 119  @HPCUPS_INSTALL_TRUE@  common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
 120 -@HPCUPS_INSTALL_TRUE@  prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp \
 121 -@HPCUPS_INSTALL_TRUE@  prnt/hpcups/ImageProcessor.h
 122 +@HPCUPS_INSTALL_TRUE@  prnt/hpcups/genJPEGStrips.cpp prnt/hpcups/RunLenEncoding.cpp
 123
 124  @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
 125 -@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
 126 +@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
 127  #else
 128  #hpcupsdir = $(cupsfilterdir)
 129  #hpcups_PROGRAMS = hpcups
 130 @@ -4717,7 +4709,6 @@ ppddir = $(hpppddir)
 131  @HPLIP_CLASS_DRIVER_TRUE@filterdir = $(cupsfilterdir)
 132  @HPLIP_CLASS_DRIVER_TRUE@printpluginsdir = $(cupsfilterdir)
 133  @HPLIP_CLASS_DRIVER_TRUE@dist_filter_DATA = hpcups hpps dat2drv
 134 -@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
 135  all: all-am
 136
 137  .SUFFIXES:
 138 @@ -9380,16 +9371,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
 139
 140
 141  install-data-hook:
 142 -@HPLIP_BUILD_TRUE@     if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
 143 -@HPLIP_BUILD_TRUE@             cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
 144 -@HPLIP_BUILD_TRUE@             chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
 145 -@HPLIP_BUILD_TRUE@             ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
 146 -@HPLIP_BUILD_TRUE@     fi; \
 147 -@HPLIP_BUILD_TRUE@     if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
 148 -@HPLIP_BUILD_TRUE@             cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
 149 -@HPLIP_BUILD_TRUE@             chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
 150 -@HPLIP_BUILD_TRUE@             ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
 151 -@HPLIP_BUILD_TRUE@     fi
 152  #         If scanner build, add hpaio entry to sane dll.conf.
 153  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@   if [ "$(scan_build)" = "yes" ]; then \
 154  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@      $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
 155 @@ -9556,10 +9537,6 @@ dist-hook:
 156  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/setup.py
 157  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/systray.py
 158  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/timedate.py
 159 -@HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/plugins/lj-arm32.so
 160 -@HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/plugins/lj-arm64.so
 161 -@HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/plugins/lj-x86_32.so
 162 -@HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/plugins/lj-x86_64.so
 163  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/hpijs-drv
 164  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/hpcups/
 165  @HPLIP_CLASS_DRIVER_TRUE@      rm -rf $(distdir)/prnt/ps/
 166 diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
 167 index 5b282d8..0bacfaf 100644
 168 --- a/prnt/hpcups/HPCupsFilter.cpp
 169 +++ b/prnt/hpcups/HPCupsFilter.cpp
 170 @@ -31,7 +31,6 @@
 171  \*****************************************************************************/
 172
 173  #include "HPCupsFilter.h"
 174 -#include "ImageProcessor.h"
 175
 176  #include <signal.h>
 177  #include <sys/wait.h>
 178 @@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
 179
 180
 181      sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
 182 -    image_processor_t* imageProcessor = imageProcessorCreate();
 183
 184      while (cupsRasterReadHeader2(cups_raster, &cups_header))
 185      {
 186
 187 -        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
 188 -        if (result != IPE_SUCCESS){
 189 -            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
 190 -        }
 191 -
 192          current_page_number++;
 193
 194          if (current_page_number == 1) {
 195 @@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
 196              color_raster = rgbRaster;
 197              black_raster = kRaster;
 198
 199 -            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
 200 -            if (result != IPE_SUCCESS){
 201 -                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
 202 -            }
 203 -
 204 -
 205              if ((y == 0) && !is_ljmono) {
 206                  //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
 207                  //may not skip blank lines before actual data
 208 @@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
 209              }
 210          }  // for() loop end
 211
 212 -        result = imageProcessorEndPage(imageProcessor);
 213 -        if (result != IPE_SUCCESS){
 214 -                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
 215 -        }
 216 -
 217 -
 218          m_Job.NewPage();
 219          if (err != NO_ERROR) {
 220              break;
 221 @@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
 222          rgbRaster = NULL;
 223      }
 224
 225 -    imageProcessorDestroy(imageProcessor);
 226 -
 227      unlink(hpPreProcessedRasterFile);
 228      return ret_status;
 229  }
 230 --
 231 2.19.1
 232