Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cosmic-bg for openSUSE:Factory checked in at 2024-11-13 15:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cosmic-bg (Old) and /work/SRC/openSUSE:Factory/.cosmic-bg.new.2017 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cosmic-bg" Wed Nov 13 15:27:37 2024 rev:4 rq:1223136 version:1.0.0~alpha3 Changes: -------- --- /work/SRC/openSUSE:Factory/cosmic-bg/cosmic-bg.changes 2024-09-25 21:55:23.813536599 +0200 +++ /work/SRC/openSUSE:Factory/.cosmic-bg.new.2017/cosmic-bg.changes 2024-11-13 15:27:49.168104891 +0100 @@ -1,0 +2,6 @@ +Thu Oct 31 22:09:57 UTC 2024 - Richard Rahl <[email protected]> + +- update to 1.0.0~alpha3: + * feat: add JPEG XL support via jxl-oxide + +------------------------------------------------------------------- Old: ---- cosmic-bg-1.0.0~alpha2.tar.zst New: ---- cosmic-bg-1.0.0~alpha3.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cosmic-bg.spec ++++++ --- /var/tmp/diff_new_pack.LP1INJ/_old 2024-11-13 15:27:50.240149670 +0100 +++ /var/tmp/diff_new_pack.LP1INJ/_new 2024-11-13 15:27:50.240149670 +0100 @@ -18,7 +18,7 @@ %define appname com.system76.CosmicBackground Name: cosmic-bg -Version: 1.0.0~alpha2 +Version: 1.0.0~alpha3 Release: 0 Summary: COSMIC service for backgrounds License: MPL-2.0 @@ -32,7 +32,6 @@ BuildRequires: nasm BuildRequires: pkgconfig BuildRequires: rust >= 1.80 -BuildRequires: update-desktop-files BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(xkbcommon) @@ -54,7 +53,6 @@ %install just rootdir=%{buildroot} prefix=%{_prefix} install -%suse_update_desktop_file %{appname} %check %{cargo_test} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.LP1INJ/_old 2024-11-13 15:27:50.268150839 +0100 +++ /var/tmp/diff_new_pack.LP1INJ/_new 2024-11-13 15:27:50.268150839 +0100 @@ -3,9 +3,9 @@ <service name="tar_scm" mode="manual"> <param name="url">https://github.com/pop-os/cosmic-bg.git</param> <param name="scm">git</param> - <param name="revision">refs/tags/epoch-1.0.0-alpha.2</param> + <param name="revision">refs/tags/epoch-1.0.0-alpha.3</param> <param name="versionrewrite-pattern">epoch-(.*)</param> - <param name="versionformat">1.0.0~alpha2</param> + <param name="versionformat">1.0.0~alpha3</param> <param name="package-meta">yes</param> <param name="filename">cosmic-bg</param> </service> ++++++ cosmic-bg-1.0.0~alpha2.tar.zst -> cosmic-bg-1.0.0~alpha3.tar.zst ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/FETCH_HEAD new/cosmic-bg-1.0.0~alpha3/.git/FETCH_HEAD --- old/cosmic-bg-1.0.0~alpha2/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/cosmic-bg-1.0.0~alpha3/.git/FETCH_HEAD 2024-10-09 22:47:25.000000000 +0200 @@ -0,0 +1,4 @@ +328a4d3845d62a506a6e7769c6b1acf712b99b2a not-for-merge branch 'bg' of https://github.com/pop-os/cosmic-bg +98769b0aa222cf1103cc3b7033a754ba9a6d3363 not-for-merge branch 'cosmic-bg-update' of https://github.com/pop-os/cosmic-bg +fd44edf79b5ffbced27540fd222e37aa05daeeba not-for-merge branch 'master' of https://github.com/pop-os/cosmic-bg +e368396f6654d9356c23d9e33d165ffd0f77d870 not-for-merge branch 'optional-scale' of https://github.com/pop-os/cosmic-bg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/HEAD new/cosmic-bg-1.0.0~alpha3/.git/HEAD --- old/cosmic-bg-1.0.0~alpha2/.git/HEAD 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/HEAD 2024-10-09 22:47:25.000000000 +0200 @@ -1 +1 @@ -584f6b3c0454396df25d36c6c2b59b018946e81e +fd44edf79b5ffbced27540fd222e37aa05daeeba diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/ORIG_HEAD new/cosmic-bg-1.0.0~alpha3/.git/ORIG_HEAD --- old/cosmic-bg-1.0.0~alpha2/.git/ORIG_HEAD 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/ORIG_HEAD 2024-10-09 22:47:25.000000000 +0200 @@ -1 +1 @@ -584f6b3c0454396df25d36c6c2b59b018946e81e +fd44edf79b5ffbced27540fd222e37aa05daeeba Binary files old/cosmic-bg-1.0.0~alpha2/.git/index and new/cosmic-bg-1.0.0~alpha3/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/logs/HEAD new/cosmic-bg-1.0.0~alpha3/.git/logs/HEAD --- old/cosmic-bg-1.0.0~alpha2/.git/logs/HEAD 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/logs/HEAD 2024-10-09 22:47:25.000000000 +0200 @@ -1,2 +1,3 @@ -0000000000000000000000000000000000000000 584f6b3c0454396df25d36c6c2b59b018946e81e Richard Rahl <[email protected]> 1727221843 +0200 clone: from https://github.com/pop-os/cosmic-bg.git -584f6b3c0454396df25d36c6c2b59b018946e81e 584f6b3c0454396df25d36c6c2b59b018946e81e Richard Rahl <[email protected]> 1727221843 +0200 checkout: moving from master to refs/tags/epoch-1.0.0-alpha.2 +0000000000000000000000000000000000000000 fd44edf79b5ffbced27540fd222e37aa05daeeba Richard Rahl <[email protected]> 1730413386 +0100 clone: from https://github.com/pop-os/cosmic-bg.git +fd44edf79b5ffbced27540fd222e37aa05daeeba 584f6b3c0454396df25d36c6c2b59b018946e81e Richard Rahl <[email protected]> 1730413387 +0100 checkout: moving from master to refs/tags/epoch-1.0.0-alpha.2 +584f6b3c0454396df25d36c6c2b59b018946e81e fd44edf79b5ffbced27540fd222e37aa05daeeba Richard Rahl <[email protected]> 1730414239 +0100 merge refs/tags/epoch-1.0.0-alpha.3: Fast-forward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/logs/refs/heads/master new/cosmic-bg-1.0.0~alpha3/.git/logs/refs/heads/master --- old/cosmic-bg-1.0.0~alpha2/.git/logs/refs/heads/master 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/logs/refs/heads/master 2024-10-09 22:47:25.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 584f6b3c0454396df25d36c6c2b59b018946e81e Richard Rahl <[email protected]> 1727221843 +0200 clone: from https://github.com/pop-os/cosmic-bg.git +0000000000000000000000000000000000000000 fd44edf79b5ffbced27540fd222e37aa05daeeba Richard Rahl <[email protected]> 1730413386 +0100 clone: from https://github.com/pop-os/cosmic-bg.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/logs/refs/remotes/origin/HEAD new/cosmic-bg-1.0.0~alpha3/.git/logs/refs/remotes/origin/HEAD --- old/cosmic-bg-1.0.0~alpha2/.git/logs/refs/remotes/origin/HEAD 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/logs/refs/remotes/origin/HEAD 2024-10-09 22:47:25.000000000 +0200 @@ -1 +1 @@ -0000000000000000000000000000000000000000 584f6b3c0454396df25d36c6c2b59b018946e81e Richard Rahl <[email protected]> 1727221843 +0200 clone: from https://github.com/pop-os/cosmic-bg.git +0000000000000000000000000000000000000000 fd44edf79b5ffbced27540fd222e37aa05daeeba Richard Rahl <[email protected]> 1730413386 +0100 clone: from https://github.com/pop-os/cosmic-bg.git Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-03355e1d7256711d0074ef6772ba9e3895ec049b.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.promisor new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.promisor --- old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.promisor 1970-01-01 01:00:00.000000000 +0100 +++ new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.promisor 2024-10-09 22:47:25.000000000 +0200 @@ -0,0 +1,8 @@ +fd44edf79b5ffbced27540fd222e37aa05daeeba HEAD +328a4d3845d62a506a6e7769c6b1acf712b99b2a refs/heads/bg +98769b0aa222cf1103cc3b7033a754ba9a6d3363 refs/heads/cosmic-bg-update +fd44edf79b5ffbced27540fd222e37aa05daeeba refs/heads/master +e368396f6654d9356c23d9e33d165ffd0f77d870 refs/heads/optional-scale +e5637fcc83abeb4e9a675b04a9b98ae4a5c186fa refs/tags/epoch-1.0.0-alpha.1 +584f6b3c0454396df25d36c6c2b59b018946e81e refs/tags/epoch-1.0.0-alpha.2 +fd44edf79b5ffbced27540fd222e37aa05daeeba refs/tags/epoch-1.0.0-alpha.3 Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-16d9080f18135cb5608dd32aad2f083eec63fb50.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-2e98af00238426a70bef5ee0a692f7d6540b144b.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-4c3d0010d140470a29ce877e86fc6ac83f8519e4.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-7b8f1db65e2f7b7815a5041958fe8ddc59401da8.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-d4df951906d4aad47381da32612430d2c9424937.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.pack differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f1589994b02bf2ff9f7dd0582455a068f8210362.rev differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.idx and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.idx differ Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.pack and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.promisor new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.promisor --- old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.promisor 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.promisor 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -584f6b3c0454396df25d36c6c2b59b018946e81e HEAD -328a4d3845d62a506a6e7769c6b1acf712b99b2a refs/heads/bg -584f6b3c0454396df25d36c6c2b59b018946e81e refs/heads/master -e5637fcc83abeb4e9a675b04a9b98ae4a5c186fa refs/tags/epoch-1.0.0-alpha.1 -584f6b3c0454396df25d36c6c2b59b018946e81e refs/tags/epoch-1.0.0-alpha.2 Binary files old/cosmic-bg-1.0.0~alpha2/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.rev and new/cosmic-bg-1.0.0~alpha3/.git/objects/pack/pack-f6ac20ac2fc2ad4fe901d64e18013f10050bad53.rev differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/packed-refs new/cosmic-bg-1.0.0~alpha3/.git/packed-refs --- old/cosmic-bg-1.0.0~alpha2/.git/packed-refs 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/packed-refs 2024-10-09 22:47:25.000000000 +0200 @@ -1,5 +1,8 @@ # pack-refs with: peeled fully-peeled sorted 328a4d3845d62a506a6e7769c6b1acf712b99b2a refs/remotes/origin/bg -584f6b3c0454396df25d36c6c2b59b018946e81e refs/remotes/origin/master +98769b0aa222cf1103cc3b7033a754ba9a6d3363 refs/remotes/origin/cosmic-bg-update +fd44edf79b5ffbced27540fd222e37aa05daeeba refs/remotes/origin/master +e368396f6654d9356c23d9e33d165ffd0f77d870 refs/remotes/origin/optional-scale e5637fcc83abeb4e9a675b04a9b98ae4a5c186fa refs/tags/epoch-1.0.0-alpha.1 584f6b3c0454396df25d36c6c2b59b018946e81e refs/tags/epoch-1.0.0-alpha.2 +fd44edf79b5ffbced27540fd222e37aa05daeeba refs/tags/epoch-1.0.0-alpha.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/.git/refs/heads/master new/cosmic-bg-1.0.0~alpha3/.git/refs/heads/master --- old/cosmic-bg-1.0.0~alpha2/.git/refs/heads/master 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/.git/refs/heads/master 2024-10-09 22:47:25.000000000 +0200 @@ -1 +1 @@ -584f6b3c0454396df25d36c6c2b59b018946e81e +fd44edf79b5ffbced27540fd222e37aa05daeeba diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/Cargo.lock new/cosmic-bg-1.0.0~alpha3/Cargo.lock --- old/cosmic-bg-1.0.0~alpha2/Cargo.lock 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/Cargo.lock 2024-10-09 22:47:25.000000000 +0200 @@ -255,6 +255,7 @@ "eyre", "fast_image_resize", "image", + "jxl-oxide", "notify", "rand", "ron", @@ -795,6 +796,147 @@ ] [[package]] +name = "jxl-bitstream" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "5855ff16398ffbcf81fee52c41ca65326499c8764b21bb9952c367ace98995fb" +dependencies = [ + "tracing", +] + +[[package]] +name = "jxl-coding" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "da5b5093904e940bc11ef50e872c7bdf7b6e88653f012b925f8479daf212b5c9" +dependencies = [ + "jxl-bitstream", + "tracing", +] + +[[package]] +name = "jxl-color" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "97f0dd548fabf9c094f9f2304059c86764f606b9040c0bfcfac55f155f423b55" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-frame" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "4719f285ebfff5e64f352d0ef149a5244aef4f8e6b5aa666ba6241e90b50632f" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-image", + "jxl-modular", + "jxl-threadpool", + "jxl-vardct", + "tracing", +] + +[[package]] +name = "jxl-grid" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "e941628e8de1dc6ba1d2bba8ebc68a69f8ff50cc7ddce5bc821658d1f4ea6e59" +dependencies = [ + "tracing", +] + +[[package]] +name = "jxl-image" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "e3824c81613c05c19a9e4329d569145d3f460c0fcadb3965bd8418162d43f7f4" +dependencies = [ + "jxl-bitstream", + "jxl-color", + "jxl-grid", + "tracing", +] + +[[package]] +name = "jxl-modular" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "9f48a5d003627f380004c29d35e51672da06ae343a2e6fe8d9c84295b9a3e843" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-oxide" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "7c209f66ef0fe72df77b44ee6aae98eb87bc2dd236d6981e44e143cc37f33f6e" +dependencies = [ + "jxl-bitstream", + "jxl-color", + "jxl-frame", + "jxl-grid", + "jxl-image", + "jxl-render", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-render" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "aec53c004c9171e89f15ad1f029d6b638cbd70d3a70276746bb8c75f9393bb64" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-color", + "jxl-frame", + "jxl-grid", + "jxl-image", + "jxl-modular", + "jxl-threadpool", + "jxl-vardct", + "tracing", +] + +[[package]] +name = "jxl-threadpool" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "9d2860c68899a3c6266044fc26c6a0041e9f27145f58cc69b6eedc1b77f5ee13" +dependencies = [ + "rayon", + "rayon-core", + "tracing", +] + +[[package]] +name = "jxl-vardct" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "15da4b49b832b3d8a67329f47e2a1732e0847667938bb9b4a37d99a4668775c2" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-modular", + "jxl-threadpool", + "tracing", +] + +[[package]] name = "known-folders" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1137,9 +1279,9 @@ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -1501,18 +1643,18 @@ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/Cargo.toml new/cosmic-bg-1.0.0~alpha3/Cargo.toml --- old/cosmic-bg-1.0.0~alpha2/Cargo.toml 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/Cargo.toml 2024-10-09 22:47:25.000000000 +0200 @@ -11,6 +11,7 @@ eyre = "0.6.12" fast_image_resize = { version = "4.2.1", features = ["image"] } image = { workspace = true, features = ["hdr", "jpeg", "png", "rayon", "webp"] } +jxl-oxide = "0.9.0" notify = "6.1.1" rand = "0.8" ron = { workspace = true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/README.md new/cosmic-bg-1.0.0~alpha3/README.md --- old/cosmic-bg-1.0.0~alpha2/README.md 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/README.md 2024-10-09 22:47:25.000000000 +0200 @@ -42,4 +42,4 @@ ``` // SPDX-License-Identifier: MPL-2.0 -``` \ No newline at end of file +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cosmic-bg-1.0.0~alpha2/src/wallpaper.rs new/cosmic-bg-1.0.0~alpha3/src/wallpaper.rs --- old/cosmic-bg-1.0.0~alpha2/src/wallpaper.rs 2024-09-07 00:22:07.000000000 +0200 +++ new/cosmic-bg-1.0.0~alpha3/src/wallpaper.rs 2024-10-09 22:47:25.000000000 +0200 @@ -11,7 +11,9 @@ use cosmic_bg_config::{state::State, Color, Entry, SamplingMethod, ScalingMode, Source}; use cosmic_config::CosmicConfigEntry; -use image::{DynamicImage, ImageReader}; +use eyre::{eyre, OptionExt}; +use image::{DynamicImage, GrayAlphaImage, GrayImage, ImageReader, RgbImage, RgbaImage}; +use jxl_oxide::{EnumColourEncoding, JxlImage, PixelFormat}; use notify::{RecommendedWatcher, RecursiveMode, Watcher}; use rand::{seq::SliceRandom, thread_rng}; use sctk::reexports::{ @@ -123,27 +125,42 @@ tracing::info!("No source for wallpaper"); continue; }; + cur_resized_img = match source { Source::Path(ref path) => { if self.current_image.is_none() { - self.current_image = Some(match ImageReader::open(&path) { - Ok(img) => { - match img - .with_guessed_format() - .ok() - .and_then(|f| f.decode().ok()) - { - Some(img) => img, - None => { - tracing::warn!( - "Could not decode image: {}", - path.display() - ); - continue; + self.current_image = Some(match path.extension() { + Some(ext) if ext == "jxl" => match decode_jpegxl(&path) { + Ok(image) => image, + Err(why) => { + tracing::warn!( + ?why, + "jpegl-xl image decode failed: {}", + path.display() + ); + continue; + } + }, + + _ => match ImageReader::open(&path) { + Ok(img) => { + match img + .with_guessed_format() + .ok() + .and_then(|f| f.decode().ok()) + { + Some(img) => img, + None => { + tracing::warn!( + "could not decode image: {}", + path.display() + ); + continue; + } } } - } - Err(_) => continue, + Err(_) => continue, + }, }); } let img = self.current_image.as_ref().unwrap(); @@ -380,3 +397,74 @@ wallpaper.map(|(_name, path)| path) } + +/// Decodes JPEG XL image files into `image::DynamicImage` via `jxl-oxide`. +fn decode_jpegxl(path: &std::path::Path) -> eyre::Result<DynamicImage> { + let mut image = JxlImage::builder() + .open(path) + .map_err(|why| eyre!("failed to read image header: {why}"))?; + + image.request_color_encoding(EnumColourEncoding::srgb( + jxl_oxide::RenderingIntent::Relative, + )); + + let render = image + .render_frame(0) + .map_err(|why| eyre!("failed to render image frame: {why}"))?; + + let framebuffer = render.image_all_channels(); + + match image.pixel_format() { + PixelFormat::Graya => GrayAlphaImage::from_raw( + framebuffer.width() as u32, + framebuffer.height() as u32, + framebuffer + .buf() + .iter() + .map(|x| x * 255. + 0.5) + .map(|x| x as u8) + .collect::<Vec<_>>(), + ) + .map(DynamicImage::ImageLumaA8) + .ok_or_eyre("Can't decode gray alpha buffer"), + PixelFormat::Gray => GrayImage::from_raw( + framebuffer.width() as u32, + framebuffer.height() as u32, + framebuffer + .buf() + .iter() + .map(|x| x * 255. + 0.5) + .map(|x| x as u8) + .collect::<Vec<_>>(), + ) + .map(DynamicImage::ImageLuma8) + .ok_or_eyre("Can't decode gray buffer"), + PixelFormat::Rgba => RgbaImage::from_raw( + framebuffer.width() as u32, + framebuffer.height() as u32, + framebuffer + .buf() + .iter() + .map(|x| x * 255. + 0.5) + .map(|x| x as u8) + .collect::<Vec<_>>(), + ) + .map(DynamicImage::ImageRgba8) + .ok_or_eyre("Can't decode rgba buffer"), + PixelFormat::Rgb => RgbImage::from_raw( + framebuffer.width() as u32, + framebuffer.height() as u32, + framebuffer + .buf() + .iter() + .map(|x| x * 255. + 0.5) + .map(|x| x as u8) + .collect::<Vec<_>>(), + ) + .map(DynamicImage::ImageRgb8) + .ok_or_eyre("Can't decode rgb buffer"), + //TODO: handle this + PixelFormat::Cmyk => Err(eyre!("unsupported pixel format: CMYK")), + PixelFormat::Cmyka => Err(eyre!("unsupported pixel format: CMYKA")), + } +} ++++++ vendor.tar.zst ++++++ /work/SRC/openSUSE:Factory/cosmic-bg/vendor.tar.zst /work/SRC/openSUSE:Factory/.cosmic-bg.new.2017/vendor.tar.zst differ: char 7, line 1
