pyrox.dev
lol
hplip: 3.19.6 -> 3.19.12
+62
-10
+6
-7
pkgs/misc/drivers/hplip/default.nix
+6
-7
pkgs/misc/drivers/hplip/default.nix
···
12
12
let
13
13
14
14
name = "hplip-${version}";
15
-
version = "3.19.6";
15
+
version = "3.19.12";
16
16
17
17
src = fetchurl {
18
18
url = "mirror://sourceforge/hplip/${name}.tar.gz";
19
-
sha256 = "0vfnc6pg7wzs68qn5mlk3cyl969d8n55bydgydq2wzfikvpfvnpw";
19
+
sha256 = "0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp";
20
20
};
21
21
22
22
plugin = fetchurl {
···
34
34
x86_64-linux = "x86_64";
35
35
armv6l-linux = "arm32";
36
36
armv7l-linux = "arm32";
37
+
aarch64-linux = "aarch64";
37
38
};
38
39
39
40
hplipArch = hplipPlatforms.${stdenv.hostPlatform.system}
40
41
or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}");
41
42
42
-
pluginArches = [ "x86_32" "x86_64" "arm32" ];
43
+
pluginArches = [ "x86_32" "x86_64" "arm32" "aarch64" ];
43
44
44
45
in
45
46
···
64
65
zlib
65
66
];
66
67
67
-
nativeBuildInputs = [
68
-
pkgconfig
69
-
];
68
+
nativeBuildInputs = [ pkgconfig ];
70
69
71
70
pythonPath = with python3Packages; [
72
71
dbus
···
226
225
license = if withPlugin
227
226
then licenses.unfree
228
227
else with licenses; [ mit bsd2 gpl2Plus ];
229
-
platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
228
+
platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
230
229
maintainers = with maintainers; [ ttuegel ];
231
230
};
232
231
}
+56
-3
pkgs/misc/drivers/hplip/image-processor.patch
+56
-3
pkgs/misc/drivers/hplip/image-processor.patch
···
1
-
diff --git i/prnt/hpcups/HPCupsFilter.cpp w/prnt/hpcups/HPCupsFilter.cpp
1
+
From 207aa582477dd874d1651db2d0654c5d6adb6e0a Mon Sep 17 00:00:00 2001
2
+
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
3
+
Date: Fri, 20 Dec 2019 13:13:52 +0000
4
+
Subject: [PATCH] remove imageprocessor
5
+
MIME-Version: 1.0
6
+
Content-Type: text/plain; charset=UTF-8
7
+
Content-Transfer-Encoding: 8bit
8
+
9
+
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
10
+
---
11
+
Makefile.am | 4 ++--
12
+
Makefile.in | 2 +-
13
+
prnt/hpcups/HPCupsFilter.cpp | 19 -------------------
14
+
3 files changed, 3 insertions(+), 22 deletions(-)
15
+
16
+
diff --git a/Makefile.am b/Makefile.am
17
+
index 891660d..484a051 100644
18
+
--- a/Makefile.am
19
+
+++ b/Makefile.am
20
+
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
21
+
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
22
+
endif #HPLIP_CLASS_DRIVER
23
+
24
+
-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
25
+
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
26
+
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
27
+
28
+
if !HPLIP_CLASS_DRIVER
29
+
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
30
+
prnt/hpcups/ImageProcessor.h
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
+
diff --git a/Makefile.in b/Makefile.in
39
+
index 16c39f0..46a767e 100644
40
+
--- a/Makefile.in
41
+
+++ b/Makefile.in
42
+
@@ -4814,7 +4814,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs
43
+
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h
44
+
45
+
@HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
46
+
-@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
47
+
+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
48
+
#else
49
+
#hpcupsdir = $(cupsfilterdir)
50
+
#hpcups_PROGRAMS = hpcups
51
+
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
2
52
index 5b282d8..153ee3a 100644
3
-
--- i/prnt/hpcups/HPCupsFilter.cpp
4
-
+++ w/prnt/hpcups/HPCupsFilter.cpp
53
+
--- a/prnt/hpcups/HPCupsFilter.cpp
54
+
+++ b/prnt/hpcups/HPCupsFilter.cpp
5
55
@@ -31,7 +31,6 @@
6
56
\*****************************************************************************/
7
57
···
60
110
unlink(hpPreProcessedRasterFile);
61
111
return ret_status;
62
112
}
113
+
--
114
+
2.24.1
115
+