[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/feedbackd][upstream/latest] 7 commits: sound: Set 'event' media role

Arnaud Ferraris gitlab at salsa.debian.org
Mon Nov 16 09:12:27 GMT 2020



Arnaud Ferraris pushed to branch upstream/latest at Debian On Mobile / feedbackd


Commits:
99e39fba by Guido Günther at 2020-09-30T19:16:25+02:00
sound: Set 'event' media role

This allows pa to cork, duck, etc.

- - - - -
581b83cd by Guido Günther at 2020-09-30T19:16:37+02:00
gitlab-ci: Honor PKG_ONLY

This allow us to get debs quicker

- - - - -
e79a24b5 by Luca Weiss at 2020-10-25T22:30:25+01:00
fbd-dev-leds: fix brightness parameter

The fbd_dev_led_set_brightness function is only getting called with
parameter 0 at the moment so this was never noticed.

- - - - -
ed0253fc by Luca Weiss at 2020-10-26T08:21:05+00:00
Fix typos

- - - - -
5ca5d500 by Guido Günther at 2020-11-14T15:33:27+01:00
udev: Update led maching for the librem5

The names changed in device tree which tickles up into userspace.

- - - - -
3b3deddb by Guido Günther at 2020-11-14T15:39:27+01:00
debian: Don't abuse the video group

Use a separate group for users that should be able to access
the LED devices.

- - - - -
ce02a0a5 by Guido Günther at 2020-11-14T15:55:30+01:00
Document changes and release 0.0.0+git20201114

- - - - -


11 changed files:

- .gitlab-ci.yml
- Event-naming-spec-0.0.0.md
- Feedback-theme-spec-0.0.0.md
- debian/changelog
- + debian/feedbackd.postinst
- debian/feedbackd.udev
- doc/overview.xml
- libfeedback/lfb-event.h
- src/fbd-dev-leds.c
- src/fbd-dev-sound.c
- src/fbd-feedback-led.c


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -31,6 +31,9 @@ build:native-debian-buster:full:
   script:
     - meson --werror . _build
     - ninja -C _build
+  except:
+    variables:
+      - $PKG_ONLY == "1"
 
 # Minimal build for e.g. submodule usage
 build:native-debian-buster:lib:
@@ -40,6 +43,9 @@ build:native-debian-buster:lib:
   script:
     - meson --werror -Ddaemon=false -Dgtk_doc=false . _build
     - ninja -C _build
+  except:
+    variables:
+      - $PKG_ONLY == "1"
 
 build:native-debian-bullseye:
   <<: *tags
@@ -51,6 +57,9 @@ build:native-debian-bullseye:
   script:
     - meson -Db_coverage=true --werror . _build
     - ninja -C _build
+  except:
+    variables:
+      - $PKG_ONLY == "1"
 
 test:native-debian-bullseye:
   <<: *tags
@@ -61,6 +70,9 @@ test:native-debian-bullseye:
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
   script:
     - dbus-run-session ninja -C _build test coverage
+  except:
+    variables:
+      - $PKG_ONLY == "1"
 
 package:deb-debian-buster:
   extends: .l5-build-debian-package


=====================================
Event-naming-spec-0.0.0.md
=====================================
@@ -72,7 +72,7 @@ applications which will use the Feedback Theme Specification.
 - power-plug: The power cable has been plugged in.
 - power-unplug: The power cable has been unplugged.
 - alarm-clock-elapsed: A user configured alarm elapsed.
-- timeout-completed: A user configured timout completed (e.g. a stop watch).
+- timeout-completed: A user configured timeout completed (e.g. a stop watch).
 
 ### Actions
 


=====================================
Feedback-theme-spec-0.0.0.md
=====================================
@@ -65,7 +65,7 @@ uses a format [similar to the above in JSON](./data/default.json).
 
 # Recommendations
 
-- The silent theme shoud not produce any audible feedback. This includes
+- The silent theme should not produce any audible feedback. This includes
   the buzzing of haptic motors.
 - The quiet theme should not play any sounds. Haptic motors and LEDs can
   be used.


=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+feedbackd (0.0.0+git20201114) amber-phone; urgency=high
+
+  [ Guido Günther ]
+  * sound: Set 'event' media role.  This allows pa to cork, duck, etc.
+  * gitlab-ci: Honor PKG_ONLY.  This allow us to get debs quicker
+  * udev: Update led maching for the librem5.  The names changed in device
+    tree which tickles up into userspace.
+  * debian: Don't abuse the video group.  Use a separate group for users that
+    should be able to access the LED devices.
+
+  [ Luca Weiss ]
+  * fbd-dev-leds: fix brightness parameter.
+    The fbd_dev_led_set_brightness function is only getting called with
+    parameter 0 at the moment so this was never noticed.
+  * Fix typos
+
+ -- Guido Günther <agx at sigxcpu.org>  Sat, 14 Nov 2020 15:54:23 +0100
+
 feedbackd (0.0.0+git20200726) amber-phone; urgency=medium
 
   [ Arnaud Ferraris ]
@@ -34,7 +52,7 @@ feedbackd (0.0.0+git20200726) amber-phone; urgency=medium
     reason in the actual test function anyway.
   * tests: Test event not found case too
   * feedback-manager: Deeply free the feedback list.
-    Instead of freeing each elemnt after each iteration and then the list
+    Instead of freeing each element after each iteration and then the list
     itself at the very end just fully free the list. g_autoslist does
     not work well on oder glib so do that manually.
     This is just cosmetics.
@@ -59,7 +77,7 @@ feedbackd (0.0.0+git20200714) amber-phone; urgency=medium
 
   [ Guido Günther ]
   * lfb-event: Clarify return values of `finished` functions.
-    They just inidicate that we talked to feedbackd succesfully.
+    They just inidicate that we talked to feedbackd successfully.
   * lfb-event: Connect done handler in async case too.
     Otherwise the event state is not updated properly
   * tests: Don't quit mainloop on event end.
@@ -97,7 +115,7 @@ feedbackd (0.0.0+git20200707) amber-phone; urgency=medium
   * docs: Add manpages (Closes: #12)
   * data: Drop phone-missed-call in 'quiet' profile.  Only want LEDs there.
   * feedbackd: Add helper to set up permissions for LEDs.
-    This helper knows about the tiggers and necessary permission.
+    This helper knows about the triggers and necessary permission.
     It's intended to be run via udev.
   * debian: Setup leds via udev.
     This allows feedbackd to set periodic feedback and makes usable


=====================================
debian/feedbackd.postinst
=====================================
@@ -0,0 +1,42 @@
+#!/bin/sh
+# postinst script for feedbackd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see https://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+        if ! getent group feedbackd >/dev/null; then
+            addgroup --quiet --system feedbackd
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+


=====================================
debian/feedbackd.udev
=====================================
@@ -6,9 +6,11 @@ ACTION=="remove", GOTO="feedbackd_end"
 
 SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ENV{ID_PATH}=="platform-vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"
 
-# Front leds of the Librem5
-SUBSYSTEM=="leds", DEVPATH=="*/phone:*:front", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G video"
+# Front leds of the Librem5 (pre 5.9)
+SUBSYSTEM=="leds", DEVPATH=="*/phone:*:front", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd"
+# Front leds of the Librem5 (5.9 and later)
+SUBSYSTEM=="leds", DEVPATH=="*/*:status", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd"
 # Front leds of the PinePhone
-SUBSYSTEM=="leds", DEVPATH=="*/*:indicator", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G video"
+SUBSYSTEM=="leds", DEVPATH=="*/*:indicator", ENV{FEEDBACKD_TYPE}="led", RUN+="/usr/libexec/fbd-ledctrl -p %S%p -t pattern -G feedbackd"
 
 LABEL="feedbackd_end"


=====================================
doc/overview.xml
=====================================
@@ -96,13 +96,13 @@
 	recommended.
       </para>
       <para>
-	You can also acknoledge this with the definition option of your C compiler, like <literal>-DFEEDBACK_USE_UNSTABLE_API</literal>.
+	You can also acknowledge this with the definition option of your C compiler, like <literal>-DFEEDBACK_USE_UNSTABLE_API</literal>.
 	This is required from Vala.
       </para>
 
       <para>
 	To use &package_name; from Vala, you must define the acknowledgment in C via <literal>-X -DFEEDBACK_USE_UNSTABLE_API</literal>.
-	If your build system uses a two pass compilation and hence your Vala compiler outputs C (Meson, Automake, or using the <literal>--ccode</literal> Vala compiler option trigger that) then you must add <literal>-DLIBFEEDBACK_USE_UNSTABLE_API</literal> to your C compiler argments instead.
+	If your build system uses a two pass compilation and hence your Vala compiler outputs C (Meson, Automake, or using the <literal>--ccode</literal> Vala compiler option trigger that) then you must add <literal>-DLIBFEEDBACK_USE_UNSTABLE_API</literal> to your C compiler arguments instead.
       </para>
     </simplesect>
 


=====================================
libfeedback/lfb-event.h
=====================================
@@ -16,7 +16,7 @@ G_BEGIN_DECLS
 
 /**
  * LfbEventState:
- * @LFB_EVENT_STATE_ERRORED: An error occured triggering feedbacks
+ * @LFB_EVENT_STATE_ERRORED: An error occurred triggering feedbacks
  * @LFB_EVENT_STATE_NONE: No state information yet
  * @LFB_EVENT_STATE_RUNNING: The feedbacks for this event are currently running
  * @LFB_EVENT_STATE_ENDED: All feedbacks for this event ended


=====================================
src/fbd-dev-leds.c
=====================================
@@ -63,7 +63,7 @@ fbd_dev_led_set_brightness (FbdDevLed *led, guint brightness)
 {
   g_autoptr (GError) err = NULL;
 
-  if (!fbd_udev_set_sysfs_path_attr_as_int (led->dev, LED_BRIGHTNESS_ATTR, 0, &err)) {
+  if (!fbd_udev_set_sysfs_path_attr_as_int (led->dev, LED_BRIGHTNESS_ATTR, brightness, &err)) {
     g_warning ("Failed to setup brightness: %s", err->message);
     return FALSE;
   }


=====================================
src/fbd-dev-sound.c
=====================================
@@ -174,6 +174,7 @@ fbd_dev_sound_play (FbdDevSound *self, FbdFeedbackSound *feedback, FbdDevSoundPl
                             data,
                             GSOUND_ATTR_EVENT_ID, fbd_feedback_sound_get_effect (feedback),
                             GSOUND_ATTR_EVENT_DESCRIPTION, "Feedbackd sound feedback",
+                            GSOUND_ATTR_MEDIA_ROLE, "event",
                             NULL);
   return TRUE;
 }


=====================================
src/fbd-feedback-led.c
=====================================
@@ -103,7 +103,7 @@ fbd_feedback_led_run (FbdFeedbackBase *base)
   FbdDevLeds *dev = fbd_feedback_manager_get_dev_leds (manager);
 
   g_return_if_fail (FBD_IS_DEV_LEDS (dev));
-  g_debug ("Periodic led feeedback: self->max_brightness, self->frequency");
+  g_debug ("Periodic led feedback: self->max_brightness, self->frequency");
 
   /* FIXME: handle priority */
   fbd_dev_leds_start_periodic (dev,



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/feedbackd/-/compare/9e2c13a1fe228970d933ce05cf56be0ae98a6ae1...ce02a0a52df9ce5a86aab50bbc8a590e4898653f

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/feedbackd/-/compare/9e2c13a1fe228970d933ce05cf56be0ae98a6ae1...ce02a0a52df9ce5a86aab50bbc8a590e4898653f
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/20201116/81173211/attachment-0001.html>


More information about the Debian-on-mobile-maintainers mailing list