Skip to content

Commit

Permalink
v1.6-4
Browse files Browse the repository at this point in the history
  • Loading branch information
mortie committed Jan 10, 2023
1 parent b2ea29d commit 20ecc6a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'swaylock',
'c',
version: '1.6-3',
version: '1.6-4',
license: 'MIT',
meson_version: '>=0.48.0',
default_options: [
Expand Down

4 comments on commit 20ecc6a

@boredland
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am a bit confused by this. Did anything but the version number change here?

@mortie
Copy link
Owner Author

@mortie mortie commented on 20ecc6a Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit only changes the version number. But 1.6-3 was released in 2020, so the 1.6-4 release exists to include all the activity in this repo since then.

@PeterCxy
Copy link

@PeterCxy PeterCxy commented on 20ecc6a Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mortie If you are going to continue maintaining this repo, maybe it would be nice to include some changes from jirutka/swaylock-effects? I have also submitted a pull request over there to make swaylock-effects work with the latest sway / wlroots builds jirutka#20 (with the better ext_session_lock_v1 protocol). If this canonical version is going to be revived, I am willing to redirect that PR over here (but again, that requires including some of the upstream changes that have been present in the @jirutka repository).

@mortie
Copy link
Owner Author

@mortie mortie commented on 20ecc6a Jan 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PeterCxy I'm not quite ready to commit to maintaining this repo yet, but I'm considering it. I recently got an AMD GPU for my desktop, so now I at least have a computer that's capable of running a wlroots-based compositor without being buggy as hell. The main intention behind this new release is: regardless of what happens in the future, I want to have a release which reflects the bug fixes which has gone into this repo since the previous release, so that anyone still using my repo at least gets a release which works on Sway 1.8.

I did start looking at merging in the upstream changes. It doesn't actually look that difficult. Getting fade-in to work with the new session lock protocol might be a challenge. When and if I get around to that, then yeah, I'll be happy to take PRs.

I may also merge in some of the stuff that has gone into jirutka's fork. I'm not entirely sure what to do with the divergence between that project and mine. Maybe they should just keep living as separate projects, or maybe we can have a chat about combining efforts in a swaylock-effects github org (@jirutka if you're interested, let's get in touch).

Please sign in to comment.