* [bug#37991] [PATCH] gnu: Add redshift-wayland @ 2019-10-30 13:08 Josh Holland 2019-10-30 13:14 ` [bug#37991] (no subject) Josh Holland 2019-11-08 10:13 ` [bug#37991] [PATCH] gnu: redshift: Use fork with support for Wayland Josh Holland 0 siblings, 2 replies; 8+ messages in thread From: Josh Holland @ 2019-10-30 13:08 UTC (permalink / raw) To: 37991; +Cc: Josh Holland * gnu/packages/xdisorg.scm (redshift-wayland): New variable. --- I am not sure if the package name and description are appropriate - please change if they are not. gnu/packages/xdisorg.scm | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 17dc16b44c..010dd9d048 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1103,6 +1103,49 @@ night to daytime temperature to allow your eyes to slowly adapt. At night the color temperature should be set to match the lamps in your room.") (license license:gpl3+))) +(define-public redshift-wayland + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift-wayland") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen (with Wayland support)") + (description + "Redshift adjusts the color temperature according to the position of the +sun. A different color temperature is set during night and daytime. During +twilight and early morning, the color temperature transitions smoothly from +night to daytime temperature to allow your eyes to slowly adapt. At night the +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) + (define-public xscreensaver (package (name "xscreensaver") -- 2.23.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#37991] (no subject) 2019-10-30 13:08 [bug#37991] [PATCH] gnu: Add redshift-wayland Josh Holland @ 2019-10-30 13:14 ` Josh Holland 2019-11-04 22:09 ` Ludovic Courtès 2019-11-08 10:13 ` [bug#37991] [PATCH] gnu: redshift: Use fork with support for Wayland Josh Holland 1 sibling, 1 reply; 8+ messages in thread From: Josh Holland @ 2019-10-30 13:14 UTC (permalink / raw) To: 37991 Alternatively, I suppose this package could replace the original redshift altogether. -- Josh Holland ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#37991] (no subject) 2019-10-30 13:14 ` [bug#37991] (no subject) Josh Holland @ 2019-11-04 22:09 ` Ludovic Courtès 2019-11-06 15:23 ` Josh Holland 0 siblings, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2019-11-04 22:09 UTC (permalink / raw) To: Josh Holland; +Cc: 37991 Hello, Josh Holland <josh@inv.alid.pw> skribis: > Alternatively, I suppose this package could replace the original > redshift altogether. Yeah, if it works for both X11 and Wayland, we might simply keep this one. Could you check ‘guix size redshift’ vs. ‘guix size redshift-wayland’, to estimate the cost of supporting both X and Wayland? If the cost in size is too important, then we could keep separate packages, but in that case one should inherit from the other to reduce duplication. Thanks, Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#37991] (no subject) 2019-11-04 22:09 ` Ludovic Courtès @ 2019-11-06 15:23 ` Josh Holland 2019-11-07 20:10 ` Ludovic Courtès 0 siblings, 1 reply; 8+ messages in thread From: Josh Holland @ 2019-11-06 15:23 UTC (permalink / raw) To: Ludovic Courtès; +Cc: 37991 Hi, Ludovic Courtès <ludo@gnu.org> writes: > Could you check ‘guix size redshift’ vs. ‘guix size redshift-wayland’, > to estimate the cost of supporting both X and Wayland? $ ./pre-inst-env guix size redshift store item total self /gnu/store/ahqgl4h89xqj695lgqvsaf6zh2nhy4pj-glibc-2.29 37.4 35.8 28.3% /gnu/store/2plcy91lypnbbysb18ymnhaw3zwk8pg1-gcc-7.4.0-lib 70.0 32.6 25.8% /gnu/store/b8pr2k0i2zd07zmb7kpffmcimqi337if-glib-2.60.6 111.3 14.4 11.3% /gnu/store/xymkwf57x988q8cny2is1dgzrbr9xdfi-util-linux-2.34 91.4 14.3 11.3% /gnu/store/gzp4ig4rdb1qf4i5dy1d9nl0zmj5q09y-ncurses-6.1-20190609 75.9 5.9 4.6% /gnu/store/wlpk6qxv479njqbxanhk6c4ism0jb5qk-libxcb-1.13 76.4 5.6 4.4% /gnu/store/06ybqkh3lb3g7c77b74izy32grglf45x-libx11-1.6.8 81.4 5.0 3.9% /gnu/store/48z4wz0iv6c0h20b72g97b27alj48x9i-libsepol-2.7 72.4 2.4 1.9% /gnu/store/5j6w0x3aq0i5r9565w92lrh016vlmv2d-pcre-8.43 71.7 1.7 1.3% /gnu/store/cp72ncw4prnsga65n3pzll07hpsg524f-bash-static-5.0.7 1.6 1.6 1.3% /gnu/store/sb1hkmc4mk7xkiqih1d925jb9yvjgvrk-libselinux-2.7 75.4 1.3 1.0% /gnu/store/29jhbbg1hf557x8j53f9sxd9imlmf02a-bash-minimal-5.0.7 38.4 1.0 0.8% /gnu/store/s041h8lkjxr3r8kylbybxd6q5qq3qs3p-libdrm-2.4.99 74.2 1.0 0.8% /gnu/store/lbip9isk25isymvnb159l115xnacb5j8-xz-5.2.4 72.0 0.9 0.7% /gnu/store/y6q2myfry9zvk0y5df4hbj00dznr6v34-libbsd-0.9.1 70.7 0.7 0.5% /gnu/store/qxfa4jljbd1dsx4q06izwd1jw1qilx99-pciutils-3.6.2 73.1 0.5 0.4% /gnu/store/an6v469sfkhxsfb4vqkip1rz9p0sbjx7-redshift-1.12 126.6 0.5 0.4% /gnu/store/j01p4wjas358cvayyjqpl449hmpanra8-libxext-1.3.4 81.9 0.4 0.4% /gnu/store/d064bv2b1hrb07j2zj78i608db7qldx9-kmod-26 72.5 0.3 0.3% /gnu/store/qx7p7hiq90mi7r78hcr9cyskccy2j4bg-zlib-1.2.11 70.2 0.2 0.2% /gnu/store/6bnd1gwfd9a9gxm18vzdjpsr36paz47i-libxdmcp-1.1.3 70.8 0.2 0.1% /gnu/store/ain96mrdwqd4s9shdd3s7m4syp5icdx5-libffi-3.2.1 70.1 0.1 0.1% /gnu/store/2v3dzwjn80jdxywkylck1csjc0hwwdvl-libpciaccess-0.16 73.2 0.1 0.1% /gnu/store/2kfywk72dfbwcz3zsc6fspjj5n39ridr-libxxf86vm-1.1.4 81.9 0.1 0.1% /gnu/store/bwjxngk8vgzj99kw835qhd1qggs0mpcn-libxau-1.0.9 70.1 0.0 0.0% total: 126.6 MiB $ ./pre-inst-env guix size redshift-wayland store item total self /gnu/store/ahqgl4h89xqj695lgqvsaf6zh2nhy4pj-glibc-2.29 37.4 35.8 26.2% /gnu/store/2plcy91lypnbbysb18ymnhaw3zwk8pg1-gcc-7.4.0-lib 70.0 32.6 23.9% /gnu/store/b8pr2k0i2zd07zmb7kpffmcimqi337if-glib-2.60.6 111.3 14.4 10.5% /gnu/store/xymkwf57x988q8cny2is1dgzrbr9xdfi-util-linux-2.34 91.4 14.3 10.4% /gnu/store/cpv88zzh37l7gnsinbwxiz6mnv63s07x-libxml2-2.9.9 80.1 7.9 5.8% /gnu/store/gzp4ig4rdb1qf4i5dy1d9nl0zmj5q09y-ncurses-6.1-20190609 75.9 5.9 4.3% /gnu/store/wlpk6qxv479njqbxanhk6c4ism0jb5qk-libxcb-1.13 76.4 5.6 4.1% /gnu/store/06ybqkh3lb3g7c77b74izy32grglf45x-libx11-1.6.8 81.4 5.0 3.6% /gnu/store/48z4wz0iv6c0h20b72g97b27alj48x9i-libsepol-2.7 72.4 2.4 1.8% /gnu/store/5j6w0x3aq0i5r9565w92lrh016vlmv2d-pcre-8.43 71.7 1.7 1.2% /gnu/store/cp72ncw4prnsga65n3pzll07hpsg524f-bash-static-5.0.7 1.6 1.6 1.2% /gnu/store/m7lpzgn381a7kjcjd3k9yn99q2kybzgk-wayland-1.17.0 82.4 1.4 1.0% /gnu/store/sb1hkmc4mk7xkiqih1d925jb9yvjgvrk-libselinux-2.7 75.4 1.3 0.9% /gnu/store/29jhbbg1hf557x8j53f9sxd9imlmf02a-bash-minimal-5.0.7 38.4 1.0 0.8% /gnu/store/s041h8lkjxr3r8kylbybxd6q5qq3qs3p-libdrm-2.4.99 74.2 1.0 0.7% /gnu/store/lbip9isk25isymvnb159l115xnacb5j8-xz-5.2.4 72.0 0.9 0.7% /gnu/store/h3w04l83yrx9rxcc62k0plgxr5hpc1xg-expat-2.2.7 70.7 0.7 0.5% /gnu/store/y6q2myfry9zvk0y5df4hbj00dznr6v34-libbsd-0.9.1 70.7 0.7 0.5% /gnu/store/ywcm36ikjspp3616lvzs5sazy2d40r9s-redshift-wayland-1.12-1.7da875d 136.7 0.5 0.4% /gnu/store/qxfa4jljbd1dsx4q06izwd1jw1qilx99-pciutils-3.6.2 73.1 0.5 0.4% /gnu/store/j01p4wjas358cvayyjqpl449hmpanra8-libxext-1.3.4 81.9 0.4 0.3% /gnu/store/d064bv2b1hrb07j2zj78i608db7qldx9-kmod-26 72.5 0.3 0.2% /gnu/store/qx7p7hiq90mi7r78hcr9cyskccy2j4bg-zlib-1.2.11 70.2 0.2 0.2% /gnu/store/6bnd1gwfd9a9gxm18vzdjpsr36paz47i-libxdmcp-1.1.3 70.8 0.2 0.1% /gnu/store/ain96mrdwqd4s9shdd3s7m4syp5icdx5-libffi-3.2.1 70.1 0.1 0.1% /gnu/store/2v3dzwjn80jdxywkylck1csjc0hwwdvl-libpciaccess-0.16 73.2 0.1 0.1% /gnu/store/2kfywk72dfbwcz3zsc6fspjj5n39ridr-libxxf86vm-1.1.4 81.9 0.1 0.1% /gnu/store/bwjxngk8vgzj99kw835qhd1qggs0mpcn-libxau-1.0.9 70.1 0.0 0.0% total: 136.7 MiB > If the cost in size is too important, then we could keep separate > packages, but in that case one should inherit from the other to reduce > duplication. I agree, but IMO 10 MiB is fairly insignificant. My only reservation is that this isn't a formally released package, but I've been using it for a week or so without any issues (though I haven't tested it on an X11 system). -- Josh Holland ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#37991] (no subject) 2019-11-06 15:23 ` Josh Holland @ 2019-11-07 20:10 ` Ludovic Courtès 2019-11-09 23:14 ` Marius Bakke 0 siblings, 1 reply; 8+ messages in thread From: Ludovic Courtès @ 2019-11-07 20:10 UTC (permalink / raw) To: Josh Holland; +Cc: 37991 Hi Josh, Josh Holland <josh@inv.alid.pw> skribis: > Ludovic Courtès <ludo@gnu.org> writes: >> Could you check ‘guix size redshift’ vs. ‘guix size redshift-wayland’, >> to estimate the cost of supporting both X and Wayland? > $ ./pre-inst-env guix size redshift [...] > total: 126.6 MiB > > $ ./pre-inst-env guix size redshift-wayland [...] > total: 136.7 MiB > > >> If the cost in size is too important, then we could keep separate >> packages, but in that case one should inherit from the other to reduce >> duplication. > > I agree, but IMO 10 MiB is fairly insignificant. My only reservation is > that this isn't a formally released package, but I've been using it for > a week or so without any issues (though I haven't tested it on an X11 > system). I agree. So, could you send a patch that updates ‘redshift’ to this snapshot and adds Wayland support? Just add a comment stating why we’re using this snapshot instead of the latest release. Thanks! Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#37991] (no subject) 2019-11-07 20:10 ` Ludovic Courtès @ 2019-11-09 23:14 ` Marius Bakke 2019-11-16 16:41 ` bug#37991: " Ludovic Courtès 0 siblings, 1 reply; 8+ messages in thread From: Marius Bakke @ 2019-11-09 23:14 UTC (permalink / raw) To: Ludovic Courtès, Josh Holland; +Cc: 37991 [-- Attachment #1: Type: text/plain, Size: 1207 bytes --] Ludovic Courtès <ludo@gnu.org> writes: > Hi Josh, > > Josh Holland <josh@inv.alid.pw> skribis: > >> Ludovic Courtès <ludo@gnu.org> writes: >>> Could you check ‘guix size redshift’ vs. ‘guix size redshift-wayland’, >>> to estimate the cost of supporting both X and Wayland? >> $ ./pre-inst-env guix size redshift > > [...] > >> total: 126.6 MiB >> >> $ ./pre-inst-env guix size redshift-wayland > > [...] > >> total: 136.7 MiB >> >> >>> If the cost in size is too important, then we could keep separate >>> packages, but in that case one should inherit from the other to reduce >>> duplication. >> >> I agree, but IMO 10 MiB is fairly insignificant. My only reservation is >> that this isn't a formally released package, but I've been using it for >> a week or so without any issues (though I haven't tested it on an X11 >> system). > > I agree. > > So, could you send a patch that updates ‘redshift’ to this snapshot and > adds Wayland support? Just add a comment stating why we’re using this > snapshot instead of the latest release. Since this Wayland variant is a fork of Redshift, I think it is better to keep it as a separate package for now. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 487 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#37991: (no subject) 2019-11-09 23:14 ` Marius Bakke @ 2019-11-16 16:41 ` Ludovic Courtès 0 siblings, 0 replies; 8+ messages in thread From: Ludovic Courtès @ 2019-11-16 16:41 UTC (permalink / raw) To: Marius Bakke; +Cc: 37991-done, Josh Holland Hello Marius & Josh, Marius Bakke <mbakke@fastmail.com> skribis: > Ludovic Courtès <ludo@gnu.org> writes: [...] >> So, could you send a patch that updates ‘redshift’ to this snapshot and >> adds Wayland support? Just add a comment stating why we’re using this >> snapshot instead of the latest release. > > Since this Wayland variant is a fork of Redshift, I think it is better > to keep it as a separate package for now. Oh I stand correct; I thought this was the upcoming version of Redshift. Then yes, I agree with you Marius. I’ve applied the patch Josh initially submitted. Thanks again Josh, and apologies for the unnecessary back-and-forth! Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#37991] [PATCH] gnu: redshift: Use fork with support for Wayland. 2019-10-30 13:08 [bug#37991] [PATCH] gnu: Add redshift-wayland Josh Holland 2019-10-30 13:14 ` [bug#37991] (no subject) Josh Holland @ 2019-11-08 10:13 ` Josh Holland 1 sibling, 0 replies; 8+ messages in thread From: Josh Holland @ 2019-11-08 10:13 UTC (permalink / raw) To: 37991; +Cc: Josh Holland * gnu/packages/xdisorg.scm (redshift): Change source to fork adding Wayland support. --- gnu/packages/xdisorg.scm | 113 +++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 29 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 17dc16b44c..05b17d0be5 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1070,38 +1070,93 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") (license license:x11))) (define-public redshift - (package - (name "redshift") - (version "1.12") - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/jonls/redshift/" - "releases/download/v" version - "/redshift-" version ".tar.xz")) - (sha256 - (base32 - "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) - (inputs - `(("libdrm" ,libdrm) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("libxxf86vm" ,libxxf86vm) - ("glib" ,glib))) ; for Geoclue2 support - (home-page "https://github.com/jonls/redshift") - (synopsis "Adjust the color temperature of your screen") - (description - "Redshift adjusts the color temperature according to the position of the + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + ;; This is not the original upstream source (that is + ;; https://github.com/jonls/redshift.git). This snapshot adds Wayland + ;; support via the wlr_gamma_control_unstable_v1 protocol. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen") + (description + "Redshift adjusts the color temperature according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. At night the -color temperature should be set to match the lamps in your room.") - (license license:gpl3+))) +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) + +(define-public redshift-wayland + (let ((commit "7da875d34854a6a34612d5ce4bd8718c32bec804") + (revision "1")) + (package + (name "redshift-wayland") + (version (string-append "1.12-" + revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minus7/redshift.git") + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0nbkcw3avmzjg1jr1g9yfpm80kzisy55idl09b6wvzv2sz27n957")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("libdrm" ,libdrm) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxxf86vm" ,libxxf86vm) + ("glib" ,glib) ; for Geoclue2 support + ("wayland" ,wayland))) + (home-page "https://github.com/minus7/redshift") + (synopsis "Adjust the color temperature of your screen (with Wayland support)") + (description + "Redshift adjusts the color temperature according to the position of the +sun. A different color temperature is set during night and daytime. During +twilight and early morning, the color temperature transitions smoothly from +night to daytime temperature to allow your eyes to slowly adapt. At night the +color temperature should be set to match the lamps in your room. + +This is a fork with added support for Wayland using the wlr-gamma-control +protocol.") + (license license:gpl3+)))) (define-public xscreensaver (package -- 2.24.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-11-16 16:43 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-30 13:08 [bug#37991] [PATCH] gnu: Add redshift-wayland Josh Holland 2019-10-30 13:14 ` [bug#37991] (no subject) Josh Holland 2019-11-04 22:09 ` Ludovic Courtès 2019-11-06 15:23 ` Josh Holland 2019-11-07 20:10 ` Ludovic Courtès 2019-11-09 23:14 ` Marius Bakke 2019-11-16 16:41 ` bug#37991: " Ludovic Courtès 2019-11-08 10:13 ` [bug#37991] [PATCH] gnu: redshift: Use fork with support for Wayland Josh Holland
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.