projects/aports·blob master · refs

364 lines · 9.1 KiB

1Patch-Source: https://github.com/Kirottu/watershot/pull/15
2--
3diff --git a/Cargo.lock b/Cargo.lock
4index bef75e4..dd3d142 100644
5--- a/Cargo.lock
6+++ b/Cargo.lock
7@@ -44,15 +44,6 @@ dependencies = [
8 "version_check",
9 ]
10
11-[[package]]
12-name = "aho-corasick"
13-version = "0.7.20"
14-source = "registry+https://github.com/rust-lang/crates.io-index"
15-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
16-dependencies = [
17- "memchr",
18-]
19-
20 [[package]]
21 name = "android_system_properties"
22 version = "0.1.5"
23@@ -128,12 +119,6 @@ version = "0.6.3"
24 source = "registry+https://github.com/rust-lang/crates.io-index"
25 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
26
27-[[package]]
28-name = "bit_field"
29-version = "0.10.1"
30-source = "registry+https://github.com/rust-lang/crates.io-index"
31-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
32-
33 [[package]]
34 name = "bitflags"
35 version = "1.3.2"
36@@ -377,12 +362,6 @@ dependencies = [
37 "cfg-if",
38 ]
39
40-[[package]]
41-name = "crunchy"
42-version = "0.2.2"
43-source = "registry+https://github.com/rust-lang/crates.io-index"
44-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
45-
46 [[package]]
47 name = "cxx"
48 version = "1.0.87"
49@@ -476,10 +455,8 @@ version = "0.10.0"
50 source = "registry+https://github.com/rust-lang/crates.io-index"
51 checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
52 dependencies = [
53- "humantime",
54 "is-terminal",
55 "log",
56- "regex",
57 "termcolor",
58 ]
59
60@@ -504,21 +481,6 @@ dependencies = [
61 "libc",
62 ]
63
64-[[package]]
65-name = "exr"
66-version = "1.5.2"
67-source = "registry+https://github.com/rust-lang/crates.io-index"
68-checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded"
69-dependencies = [
70- "bit_field",
71- "flume",
72- "half",
73- "lebe",
74- "miniz_oxide",
75- "smallvec",
76- "threadpool",
77-]
78-
79 [[package]]
80 name = "fastrand"
81 version = "1.8.0"
82@@ -544,19 +506,6 @@ dependencies = [
83 "miniz_oxide",
84 ]
85
86-[[package]]
87-name = "flume"
88-version = "0.10.14"
89-source = "registry+https://github.com/rust-lang/crates.io-index"
90-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
91-dependencies = [
92- "futures-core",
93- "futures-sink",
94- "nanorand",
95- "pin-project",
96- "spin",
97-]
98-
99 [[package]]
100 name = "fnv"
101 version = "1.0.7"
102@@ -587,18 +536,6 @@ version = "0.1.1"
103 source = "registry+https://github.com/rust-lang/crates.io-index"
104 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
105
106-[[package]]
107-name = "futures-core"
108-version = "0.3.25"
109-source = "registry+https://github.com/rust-lang/crates.io-index"
110-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
111-
112-[[package]]
113-name = "futures-sink"
114-version = "0.3.25"
115-source = "registry+https://github.com/rust-lang/crates.io-index"
116-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
117-
118 [[package]]
119 name = "getrandom"
120 version = "0.2.8"
121@@ -606,20 +543,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
122 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
123 dependencies = [
124 "cfg-if",
125- "js-sys",
126 "libc",
127 "wasi 0.11.0+wasi-snapshot-preview1",
128- "wasm-bindgen",
129-]
130-
131-[[package]]
132-name = "gif"
133-version = "0.11.4"
134-source = "registry+https://github.com/rust-lang/crates.io-index"
135-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
136-dependencies = [
137- "color_quant",
138- "weezl",
139 ]
140
141 [[package]]
142@@ -730,15 +655,6 @@ dependencies = [
143 "bitflags 1.3.2",
144 ]
145
146-[[package]]
147-name = "half"
148-version = "2.1.0"
149-source = "registry+https://github.com/rust-lang/crates.io-index"
150-checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554"
151-dependencies = [
152- "crunchy",
153-]
154-
155 [[package]]
156 name = "hashbrown"
157 version = "0.12.3"
158@@ -793,12 +709,6 @@ version = "0.2.1"
159 source = "registry+https://github.com/rust-lang/crates.io-index"
160 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
161
162-[[package]]
163-name = "humantime"
164-version = "2.1.0"
165-source = "registry+https://github.com/rust-lang/crates.io-index"
166-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
167-
168 [[package]]
169 name = "iana-time-zone"
170 version = "0.1.53"
171@@ -832,14 +742,10 @@ dependencies = [
172 "bytemuck",
173 "byteorder",
174 "color_quant",
175- "exr",
176- "gif",
177 "jpeg-decoder",
178 "num-rational",
179 "num-traits",
180 "png",
181- "scoped_threadpool",
182- "tiff",
183 "webp",
184 ]
185
186@@ -928,12 +834,6 @@ version = "1.4.0"
187 source = "registry+https://github.com/rust-lang/crates.io-index"
188 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
189
190-[[package]]
191-name = "lebe"
192-version = "0.5.2"
193-source = "registry+https://github.com/rust-lang/crates.io-index"
194-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
195-
196 [[package]]
197 name = "libc"
198 version = "0.2.138"
199@@ -1097,15 +997,6 @@ dependencies = [
200 "unicode-xid",
201 ]
202
203-[[package]]
204-name = "nanorand"
205-version = "0.7.0"
206-source = "registry+https://github.com/rust-lang/crates.io-index"
207-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
208-dependencies = [
209- "getrandom",
210-]
211-
212 [[package]]
213 name = "nix"
214 version = "0.24.3"
215@@ -1295,26 +1186,6 @@ dependencies = [
216 "indexmap",
217 ]
218
219-[[package]]
220-name = "pin-project"
221-version = "1.0.12"
222-source = "registry+https://github.com/rust-lang/crates.io-index"
223-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
224-dependencies = [
225- "pin-project-internal",
226-]
227-
228-[[package]]
229-name = "pin-project-internal"
230-version = "1.0.12"
231-source = "registry+https://github.com/rust-lang/crates.io-index"
232-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
233-dependencies = [
234- "proc-macro2",
235- "quote",
236- "syn 1.0.107",
237-]
238-
239 [[package]]
240 name = "pkg-config"
241 version = "0.3.26"
242@@ -1484,23 +1355,6 @@ dependencies = [
243 "bitflags 1.3.2",
244 ]
245
246-[[package]]
247-name = "regex"
248-version = "1.7.1"
249-source = "registry+https://github.com/rust-lang/crates.io-index"
250-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
251-dependencies = [
252- "aho-corasick",
253- "memchr",
254- "regex-syntax",
255-]
256-
257-[[package]]
258-name = "regex-syntax"
259-version = "0.6.28"
260-source = "registry+https://github.com/rust-lang/crates.io-index"
261-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
262-
263 [[package]]
264 name = "remove_dir_all"
265 version = "0.5.3"
266@@ -1559,12 +1413,6 @@ version = "1.0.1"
267 source = "registry+https://github.com/rust-lang/crates.io-index"
268 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
269
270-[[package]]
271-name = "scoped_threadpool"
272-version = "0.1.9"
273-source = "registry+https://github.com/rust-lang/crates.io-index"
274-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
275-
276 [[package]]
277 name = "scopeguard"
278 version = "1.1.0"
279@@ -1636,15 +1484,6 @@ dependencies = [
280 "xkbcommon",
281 ]
282
283-[[package]]
284-name = "spin"
285-version = "0.9.4"
286-source = "registry+https://github.com/rust-lang/crates.io-index"
287-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
288-dependencies = [
289- "lock_api",
290-]
291-
292 [[package]]
293 name = "spirv"
294 version = "0.2.0+1.5.4"
295@@ -1732,26 +1571,6 @@ dependencies = [
296 "syn 1.0.107",
297 ]
298
299-[[package]]
300-name = "threadpool"
301-version = "1.8.1"
302-source = "registry+https://github.com/rust-lang/crates.io-index"
303-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
304-dependencies = [
305- "num_cpus",
306-]
307-
308-[[package]]
309-name = "tiff"
310-version = "0.8.1"
311-source = "registry+https://github.com/rust-lang/crates.io-index"
312-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
313-dependencies = [
314- "flate2",
315- "jpeg-decoder",
316- "weezl",
317-]
318-
319 [[package]]
320 name = "time"
321 version = "0.1.45"
322@@ -2090,12 +1909,6 @@ dependencies = [
323 "libwebp-sys",
324 ]
325
326-[[package]]
327-name = "weezl"
328-version = "0.1.7"
329-source = "registry+https://github.com/rust-lang/crates.io-index"
330-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
331-
332 [[package]]
333 name = "wgpu"
334 version = "0.16.1"
335diff --git a/Cargo.toml b/Cargo.toml
336index a73b6a2..03dab10 100644
337--- a/Cargo.toml
338+++ b/Cargo.toml
339@@ -6,11 +6,15 @@ edition = "2021"
340
341 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
342
343+[features]
344+default = ["webp"]
345+webp = ["image/webp-encoder"]
346+
347 [dependencies]
348 smithay-client-toolkit = "0.17.0"
349 wayland-backend = { version = "0.1.2", features = ["client_system"] }
350 wayland-client = { version = "0.30.2", features = ["calloop"] }
351-image = { version = "0.24.5", features = ["webp-encoder"] }
352+image = { version = "0.24.5", default-features = false, features = ["farbfeld", "jpeg", "jpeg_rayon", "png"] }
353 ron = "0.8.0"
354 serde = { version = "1.0.152", features = ["derive"] }
355 fontconfig = "0.6.0"
356@@ -18,7 +22,7 @@ wl-clipboard-rs = "0.7.0"
357 nix = { version = "0.26.1", default-features = false, features = ["process"] }
358 clap = { version = "4.0.32", features = ["derive"] }
359 chrono = "0.4.23"
360-env_logger = "0.10.0"
361+env_logger = { version = "0.10.0", default-features = false, features = ["auto-color"] }
362 log = "0.4.17"
363 wgpu = "0.16.1"
364 raw-window-handle = "0.5.2"