--- b/print/hplip-plugin/Makefile +++ b/print/hplip-plugin/Makefile @@ -1,7 +1,7 @@ # Created by: amistry@am-productions.biz PORTNAME= hplip-plugin -PORTVERSION= 3.20.6 +PORTVERSION= 3.21.2 CATEGORIES= print MASTER_SITES= https://developers.hp.com/sites/default/files/ DISTNAME= hplip-${DISTVERSION}-plugin --- b/print/hplip-plugin/distinfo +++ b/print/hplip-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592831579 -SHA256 (hplip-3.20.6-plugin.run) = 9700cb20c259417e7678a1347634d8c3fb2f03d13369ad96e6536a49f0f1e3cf -SIZE (hplip-3.20.6-plugin.run) = 11514108 +TIMESTAMP = 1620114304 +SHA256 (hplip-3.21.2-plugin.run) = 363a467925ecca8a0856821ea74a2ae74445f654313f59427289452032d6aef3 +SIZE (hplip-3.21.2-plugin.run) = 11514233 --- b/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,7 +1,7 @@ # Created by: amistry@am-productions.biz PORTNAME= hplip -PORTVERSION= 3.20.6 +PORTVERSION= 3.21.2 CATEGORIES= print MASTER_SITES= SF --- b/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592831566 -SHA256 (hplip-3.20.6.tar.gz) = c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20 -SIZE (hplip-3.20.6.tar.gz) = 25908476 +TIMESTAMP = 1619960060 +SHA256 (hplip-3.21.2.tar.gz) = 410421a13e62205d41bacd3215993c89e513fb4d7fab07e23e2720465aea7c41 +SIZE (hplip-3.21.2.tar.gz) = 27014784 --- b/print/hplip/files/patch-prnt_hpcups_HPCupsFilter.cpp +++ b/print/hplip/files/patch-prnt_hpcups_HPCupsFilter.cpp @@ -1,4 +1,4 @@ ---- prnt/hpcups/HPCupsFilter.cpp.orig 2019-10-22 06:14:20 UTC +--- prnt/hpcups/HPCupsFilter.cpp.orig 2021-02-14 23:55:21 UTC +++ prnt/hpcups/HPCupsFilter.cpp @@ -31,7 +31,6 @@ \*****************************************************************************/ @@ -8,55 +8,66 @@ #include #include -@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup - +@@ -651,21 +650,8 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); -- image_processor_t* imageProcessor = imageProcessorCreate(); - + +- 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)) { - -- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &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) { -@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup +@@ -764,14 +750,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup 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 -@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup +@@ -801,14 +779,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup } } // 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; -@@ -799,8 +780,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup - kRaster = NULL; - rgbRaster = NULL; +@@ -824,10 +794,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cup } -- -- imageProcessorDestroy(imageProcessor); + +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0) +- { +- imageProcessorDestroy(imageProcessor); +- } unlink(hpPreProcessedRasterFile); return ret_status; + } --- a/print/hplip/files/patch-protocol_discovery_mdns.c +++ /dev/null @@ -1,86 +0,0 @@ -Use a dynamically allocated port instead of binding port 5353. The bind(2) -call fails when Avahi has already claimed port 5353. On top of that, HPLIP -only performs one-shot queries and those shouldn't be using port 5353 according -to RFC 6762. - -Don't disable loop-back. It's harmless. - -Use default TTL of 1. RFC 6762 requires 255 for responses, not for queries. - -There's no need to join the multicast group for one-shot queries. Responses -are sent to the unicast address. - ---- protocol/discovery/mdns.c.orig 2020-07-01 14:48:56 UTC -+++ protocol/discovery/mdns.c -@@ -24,7 +24,11 @@ - Author: Sanjay Kumar - \*****************************************************************************/ - --//#include -+#include -+#include -+#include -+#include -+#include - #include - #include - #include -@@ -70,57 +74,13 @@ static int mdns_convert_name_to_dns(const char *name, - static int mdns_open_socket(int *psocket) - { - int stat = MDNS_STATUS_ERROR; -- int udp_socket = -1, yes = 1; -- char loop = 0, ttl = 255; -- struct sockaddr_in recv_addr , addr; -- struct ip_mreq mreq; -+ int udp_socket; - - DBG("mdns_open_socket entry.\n"); - - if ((udp_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) - { - BUG("unable to create udp socket: %m\n"); -- goto bugout; -- } -- -- /* Get rid of "address already in use" error message. */ -- if (setsockopt(udp_socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) == -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Bind the socket to port and IP equal to INADDR_ANY. */ -- bzero(&recv_addr, sizeof(recv_addr)); -- recv_addr.sin_family = AF_INET; -- recv_addr.sin_addr.s_addr = htonl(INADDR_ANY); -- recv_addr.sin_port = htons(5353); -- if (bind(udp_socket, (struct sockaddr *) &recv_addr, sizeof(recv_addr)) == -1) -- { -- BUG("unable to bind udp socket: %m\n"); -- goto bugout; -- } -- -- /* Set multicast loopback off. */ -- if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)) == -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Set ttl to 255. Required by mdns. */ -- if (setsockopt(udp_socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl))== -1) -- { -- BUG("unable to setsockopt: %m\n"); -- goto bugout; -- } -- -- /* Join the .local multicast group */ -- mreq.imr_multiaddr.s_addr = inet_addr("224.0.0.251"); -- mreq.imr_interface.s_addr = htonl(INADDR_ANY); -- if (setsockopt(udp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(struct ip_mreq)) == -1) { -- BUG("unable to add to multicast group: %m\n"); -- close(udp_socket); - goto bugout; - } - --- b/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -116,6 +116,7 @@ share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi %%DATADIR%%/base/imageprocessing.py %%DATADIR%%/base/imagesize.py %%DATADIR%%/base/ldif.py +%%DATADIR%%/base/local.py %%DATADIR%%/base/logger.py %%DATADIR%%/base/magic.py %%DATADIR%%/base/maint.py @@ -796,13 +797,17 @@ share/ppd/HP/hp-color_laserjet_cp5520_series-pcl3.ppd.gz share/ppd/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz share/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_e45028-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_e55040-ps.ppd.gz share/ppd/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz share/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz share/ppd/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz share/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz share/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_flow_e57540-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_flowmfp_m578-ps.ppd.gz share/ppd/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m153-m154-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m155-m156-ps.ppd.gz @@ -812,14 +817,19 @@ share/ppd/HP/hp-color_laserjet_m255-m256-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m282-m285-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_m455-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_m554-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_m555-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m652_m653-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz share/ppd/HP/hp-color_laserjet_m856-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_mfp_e47528-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_mfp_e57540-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_e78223-ps.ppd.gz @@ -828,7 +838,9 @@ share/ppd/HP/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_mfp_m480-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz +share/ppd/HP/hp-color_laserjet_mfp_m578-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz share/ppd/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz @@ -1312,6 +1324,7 @@ share/ppd/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz share/ppd/HP/hp-laserjet_cp1025.ppd.gz share/ppd/HP/hp-laserjet_cp1025nw.ppd.gz share/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz +share/ppd/HP/hp-laserjet_e40040-ps.ppd.gz share/ppd/HP/hp-laserjet_e50145-ps.ppd.gz share/ppd/HP/hp-laserjet_e60055-e60075-ps.ppd.gz share/ppd/HP/hp-laserjet_e60155-ps.ppd.gz @@ -1338,12 +1351,15 @@ share/ppd/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz share/ppd/HP/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz +share/ppd/HP/hp-laserjet_m207-m212.ppd.gz share/ppd/HP/hp-laserjet_m2727_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m2727_mfp_series-ps.ppd.gz share/ppd/HP/hp-laserjet_m3027_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m3027_mfp-ps.ppd.gz share/ppd/HP/hp-laserjet_m3035_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m3035_mfp-ps.ppd.gz +share/ppd/HP/hp-laserjet_m406-ps.ppd.gz +share/ppd/HP/hp-laserjet_m407-ps.ppd.gz share/ppd/HP/hp-laserjet_m4345_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m4345_mfp-ps.ppd.gz share/ppd/HP/hp-laserjet_m4349_mfp-pcl3.ppd.gz @@ -1365,6 +1381,7 @@ share/ppd/HP/hp-laserjet_m9050_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz share/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz share/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_e42540-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72425-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72430-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_e72525-25-30-35-ps.ppd.gz @@ -1375,6 +1392,8 @@ share/ppd/HP/hp-laserjet_mfp_m129-m134.ppd.gz share/ppd/HP/hp-laserjet_mfp_m232-m237.ppd.gz share/ppd/HP/hp-laserjet_mfp_m28-m31.ppd.gz share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_m430-ps.ppd.gz +share/ppd/HP/hp-laserjet_mfp_m431-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz @@ -1689,24 +1708,32 @@ share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_pro_750-ps.ppd.gz share/ppd/HP/hp-pagewide_pro_mfp_772-777-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_3900ps_mfp-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_3920ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4000ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4000ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4100ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4100ps_mfp-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_4200ps-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_4200ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4500ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4500ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4600ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_4600ps_mfp-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_4700ps-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_4700ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5000ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5000ps_blueprinter-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5000ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5100ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5100ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_5100ps_mfp_blueprinter-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_5200ps-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_5200ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_6000ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_6000ps_mfp-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_8000ps-ps.ppd.gz share/ppd/HP/hp-pagewide_xl_8000ps_blueprinter-ps.ppd.gz +share/ppd/HP/hp_pagewide_xl_8200ps-ps.ppd.gz share/ppd/HP/hp-photosmart_100.ppd.gz share/ppd/HP/hp-photosmart_1115.ppd.gz share/ppd/HP/hp-photosmart_1215.ppd.gz