[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/phoc][upstream/latest] 5 commits: output: Check enable pending state when an enable commit is pending

[Guido Günther (@agx)]

Guido Günther pushed to branch upstream/latest at Debian On Mobile / phoc


Commits:
d63b0e6b by Guido Günther at 2023-03-11T12:01:24+01:00
output: Check enable pending state when an enable commit is pending

This can happen in case of failure and we want to retry
it in this case.

Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/900
(cherry picked from commit 37542bb80be8a7746d2ccda0c02048dd92fac7af)

- - - - -
0a3c3de1 by Guido Günther at 2023-03-12T11:55:42+01:00
d/gbp.conf: Switch to point release branch

- - - - -
3e837438 by Guido Günther at 2023-03-12T11:55:42+01:00
Document changes and release 0.25.2

We skip 0.25.1 to be in sync with phosh.

- - - - -
3aee71bf by Guido Günther at 2023-03-12T11:22:02+00:00
Merge branch 'phoc-0.25.x' into 'phoc-0.25.x'

Backport blank/unblank fix to 0.25

See merge request World/Phosh/phoc!430
- - - - -
84c608de by Guido Günther at 2023-03-12T12:38:52+01:00
New upstream version 0.25.2
- - - - -


5 changed files:

- NEWS
- debian/changelog
- debian/gbp.conf
- meson.build
- src/output.c


Changes:

=====================================
NEWS
=====================================
@@ -1,3 +1,9 @@
+phoc 0.25.2
+-----------
+Released March 2023
+* Fix display not coming up again after fast
+  blank/unblank on some devices like PP and PPP.
+
 phoc 0.25.0
 -----------
 Released February 2023


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+phoc (0.25.2) experimental; urgency=medium
+
+  * output: Check enable pending state when an enable commit is pending.
+    This can happen in case of failure and we want to retry
+    it in this case.
+    Closes: https://gitlab.gnome.org/World/Phosh/phosh/-/issues/900
+    (cherry picked from commit 37542bb80be8a7746d2ccda0c02048dd92fac7af)
+
+ -- Guido Günther <agx at sigxcpu.org>  Sat, 11 Mar 2023 12:01:38 +0100
+
 phoc (0.25.0) experimental; urgency=medium
 
   * build: Untabify


=====================================
debian/gbp.conf
=====================================
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = main
+debian-branch = phoc-0.25.x
 debian-tag = v%(version)s
 debian-tag-msg = %(pkg)s v%(version)s
 


=====================================
meson.build
=====================================
@@ -1,5 +1,5 @@
 project('phoc', 'c',
-          version: '0.25.0',
+          version: '0.25.2',
           license: 'GPLv3+',
     meson_version: '>= 0.56.0',
   default_options: [


=====================================
src/output.c
=====================================
@@ -1186,6 +1186,7 @@ phoc_output_handle_output_power_manager_set_mode (struct wl_listener *listener,
   struct wlr_output_power_v1_set_mode_event *event = data;
   PhocOutput *self;
   bool enable = true;
+  bool current;
 
   g_return_if_fail (event && event->output && event->output->data);
   self = event->output->data;
@@ -1203,7 +1204,11 @@ phoc_output_handle_output_power_manager_set_mode (struct wl_listener *listener,
     return;
   }
 
-  if (enable == self->wlr_output->enabled)
+  current = self->wlr_output->enabled;
+  if (self->wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED)
+    current = self->wlr_output->pending.enabled;
+
+  if (enable == current)
     return;
 
   wlr_output_enable (self->wlr_output, enable);



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phoc/-/compare/3fade2a164c09535172395d7390308b3163e51f2...84c608de335c19c01bfe1e9f237324a25b6b2d25

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phoc/-/compare/3fade2a164c09535172395d7390308b3163e51f2...84c608de335c19c01bfe1e9f237324a25b6b2d25
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20230312/ca63f68f/attachment-0001.htm>