diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-01-16 10:01:10 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-16 10:01:10 -0600 |
commit | c6bed9f7dd295d18a2cc7dd2e857688f6b927adb (patch) | |
tree | 102f08d82323fd6d07505fdd8a7d6b3966e92ba2 /pkgs/misc/drivers | |
parent | fec5edc7c089eace5748711c11db72888bf49232 (diff) | |
parent | 4d7ae1e646a1be33cb96dfadfe296989c7f984b3 (diff) |
Merge pull request #76128 from Mic92/hplip
hplip: 3.19.6 -> 3.19.12
Diffstat (limited to 'pkgs/misc/drivers')
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 13 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/image-processor.patch | 59 |
2 files changed, 62 insertions, 10 deletions
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index ecb74f39ab9a9..a7e080ebce29a 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,11 +12,11 @@ let name = "hplip-${version}"; - version = "3.19.6"; + version = "3.19.12"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0vfnc6pg7wzs68qn5mlk3cyl969d8n55bydgydq2wzfikvpfvnpw"; + sha256 = "0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp"; }; plugin = fetchurl { @@ -34,12 +34,13 @@ let x86_64-linux = "x86_64"; armv6l-linux = "arm32"; armv7l-linux = "arm32"; + aarch64-linux = "aarch64"; }; hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); - pluginArches = [ "x86_32" "x86_64" "arm32" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ]; in @@ -64,9 +65,7 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ - pkgconfig - ]; + nativeBuildInputs = [ pkgconfig ]; pythonPath = with python3Packages; [ dbus @@ -226,7 +225,7 @@ python3Packages.buildPythonApplication { license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; - platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/misc/drivers/hplip/image-processor.patch b/pkgs/misc/drivers/hplip/image-processor.patch index ef1040ba08bb7..30df1d29d97ec 100644 --- a/pkgs/misc/drivers/hplip/image-processor.patch +++ b/pkgs/misc/drivers/hplip/image-processor.patch @@ -1,7 +1,57 @@ -diff --git i/prnt/hpcups/HPCupsFilter.cpp w/prnt/hpcups/HPCupsFilter.cpp +From 207aa582477dd874d1651db2d0654c5d6adb6e0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Fri, 20 Dec 2019 13:13:52 +0000 +Subject: [PATCH] remove imageprocessor +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + Makefile.am | 4 ++-- + Makefile.in | 2 +- + prnt/hpcups/HPCupsFilter.cpp | 19 ------------------- + 3 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 891660d..484a051 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 +diff --git a/Makefile.in b/Makefile.in +index 16c39f0..46a767e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4814,7 +4814,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs + @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h + + @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 +diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp index 5b282d8..153ee3a 100644 ---- i/prnt/hpcups/HPCupsFilter.cpp -+++ w/prnt/hpcups/HPCupsFilter.cpp +--- a/prnt/hpcups/HPCupsFilter.cpp ++++ b/prnt/hpcups/HPCupsFilter.cpp @@ -31,7 +31,6 @@ \*****************************************************************************/ @@ -60,3 +110,6 @@ index 5b282d8..153ee3a 100644 unlink(hpPreProcessedRasterFile); return ret_status; } +-- +2.24.1 + |