public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/feedbackd/, dev-libs/feedbackd/files/
@ 2021-06-22 13:56 Marco Scardovi
  0 siblings, 0 replies; 3+ messages in thread
From: Marco Scardovi @ 2021-06-22 13:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4e42bb38c47de6d42828bf080028c362cdefe646
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Jun 22 13:56:25 2021 +0000
Commit:     Marco Scardovi <marco <AT> scardovi <DOT> com>
CommitDate: Tue Jun 22 13:56:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e42bb38

dev-libs/feedbackd: add package for phosh

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 dev-libs/feedbackd/Manifest                    |   2 +
 dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild   |  57 ++++++++
 dev-libs/feedbackd/files/55.patch              |  25 ++++
 dev-libs/feedbackd/files/pine64.pinephone.json | 175 +++++++++++++++++++++++++
 dev-libs/feedbackd/files/purism.librem5.json   | 174 ++++++++++++++++++++++++
 dev-libs/feedbackd/metadata.xml                |  11 ++
 6 files changed, 444 insertions(+)

diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest
new file mode 100644
index 000000000..3c583209d
--- /dev/null
+++ b/dev-libs/feedbackd/Manifest
@@ -0,0 +1,2 @@
+DIST b45468080eee851da500613ecedd709639b6d769.tar.gz 80860 BLAKE2B a80829b496e314fd04f17024a3e5415e02852b217df5f9bcbca6159b4bded5220cd6cc9d39a66c24de500bbe91c111ca1e4d05669b53decc07ca0adb91b851da SHA512 7e869c127059d2f070d368ca894808f2fb78fd04048662dabd303a45d86a3b53bf3646f64e088cd720c6f54777a86673156d3cf782fdd663dc25fae65bd04e6e
+DIST feedbackd-device-themes-1602d415aed30b1a67c0ff270551230725b8ef92.tar.gz 13832 BLAKE2B 87c1ccd52dec982e4e1651e11598b60daa8380f2de4c371e0abc70e2840abd1e62fa9fd70cbe8a5860942c282cac54ea11b548066cd01be5b49ba939b488ec3a SHA512 0e6ece5deddc3df3824aa01b6bbc2ad7fc9ab96db6afe9e4aa84652a005eb860c5552e52aeb17329dde84e8d2bccc33c7e603ab04eb2ca41ed19bbe331ce6933

diff --git a/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild
new file mode 100644
index 000000000..e7cff78b1
--- /dev/null
+++ b/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit vala meson udev
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+MY_PV="${PV}+git20210426"
+MY_P="${PN}-${MY_PV}"
+MY_COMMIT="b45468080eee851da500613ecedd709639b6d769"
+MY_THEME_COMMIT="1602d415aed30b1a67c0ff270551230725b8ef92"
+
+DESCRIPTION="A daemon to provide haptic feedback on events"
+HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
+SRC_URI="
+	https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz
+	https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+
+DEPEND="
+	gnome-base/dconf
+	media-libs/gsound
+	dev-libs/json-glib
+	dev-libs/libgudev
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/gobject-introspection
+	dev-util/meson
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	eapply_user
+	use vala && vala_src_prepare
+	sed -i 's/-G feedbackd/-G video/g' "${S}"/debian/feedbackd.udev || die
+}
+
+src_install() {
+	default
+	meson_src_install
+	insinto /usr/share/feedbackd/themes
+	doins "${WORKDIR}"/feedbackd-device-themes-"${MY_THEME_COMMIT}"/data/"{pine64.pinephone,purism.librem5}.json"
+	udev_newrules "${S}"/debian/feedbackd.udev 90-feedbackd.rules
+}

diff --git a/dev-libs/feedbackd/files/55.patch b/dev-libs/feedbackd/files/55.patch
new file mode 100644
index 000000000..6946b6d14
--- /dev/null
+++ b/dev-libs/feedbackd/files/55.patch
@@ -0,0 +1,25 @@
+From b0ef14bb5f73e0a1f5345f0ddd3b3992205daebf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
+Date: Tue, 4 May 2021 08:53:30 +0000
+Subject: [PATCH] fbd-feedback-manager: fix device-specific themes path
+
+---
+ src/fbd-feedback-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c
+index 39c27eb..ac6cdfa 100644
+--- a/src/fbd-feedback-manager.c
++++ b/src/fbd-feedback-manager.c
+@@ -455,7 +455,7 @@ find_themefile (void)
+       for (i = 0; i < g_strv_length (xdg_data_dirs); i++) {
+         g_autofree gchar *config_path = NULL;
+ 
+-        config_path = g_strconcat (xdg_data_dirs[i], "feedbackd/themes/", comp, ".json", NULL);
++        config_path = g_strconcat (xdg_data_dirs[i], "/feedbackd/themes/", comp, ".json", NULL);
+         g_debug ("Searching for device specific themefile in %s", config_path);
+ 
+         // Check if file exist
+-- 
+GitLab
+

diff --git a/dev-libs/feedbackd/files/pine64.pinephone.json b/dev-libs/feedbackd/files/pine64.pinephone.json
new file mode 100644
index 000000000..2b628454c
--- /dev/null
+++ b/dev-libs/feedbackd/files/pine64.pinephone.json
@@ -0,0 +1,175 @@
+{
+  "name" : "default",
+  "profiles" : [
+    {
+      "name" : "full",
+      "feedbacks" : [
+        {
+          "event-name" : "alarm-clock-elapsed",
+          "type"       : "Sound",
+          "effect"     : "alarm-clock-elapsed"
+        },
+        {
+          "event-name" : "button-pressed",
+          "type"       : "Sound",
+          "effect"     : "button-pressed"
+        },
+        {
+          "event-name" : "button-released",
+          "type"       : "Sound",
+          "effect"     : "button-released"
+        },
+        {
+          "event-name" : "message-new-email",
+          "type"       : "Sound",
+          "effect"     : "message-new-email"
+        },
+        {
+          "event-name" : "message-new-instant",
+          "type"       : "Sound",
+          "effect"     : "message-new-instant"
+        },
+        {
+          "event-name" : "message-new-sms",
+          "type"       : "Sound",
+          "effect"     : "message-new-instant"
+        },
+        {
+          "event-name" : "phone-incoming-call",
+          "type"       : "Sound",
+          "effect"     : "phone-incoming-call"
+        },
+        {
+          "event-name" : "timeout-completed",
+          "type"       : "Sound",
+          "effect"     : "complete"
+        },
+        {
+          "event-name" : "theme-demo",
+          "type"       : "Sound",
+          "effect"     : "theme-demo"
+        },
+        {
+          "event-name" : "window-close",
+          "type"       : "Sound",
+          "effect"     : "theme-demo"
+        }
+      ]
+    },
+    {
+      "name" : "quiet",
+      "feedbacks" : [
+        {
+          "event-name"   : "alarm-clock-elapsed",
+          "type"         : "VibraPeriodic",
+          "magnitude"    : 32767,
+          "duration"     : 10000,
+          "fade-in-time" : 10000,
+          "fade-in-level": 4096
+        },
+        {
+          "event-name" : "bell-terminal",
+          "type"       : "VibraRumble",
+          "duration"   : 100
+        },
+        {
+          "event-name" : "button-pressed",
+          "type"       : "VibraRumble",
+          "duration"   : 80
+        },
+        {
+          "event-name" : "button-released",
+          "type"       : "VibraRumble",
+          "duration"   : 40
+        },
+        {
+          "event-name" : "message-new-email",
+          "type"       : "VibraRumble",
+          "duration"   : 750,
+          "count"      : 3,
+          "pause"      : 100
+        },
+        {
+          "event-name" : "message-new-instant",
+          "type"       : "VibraRumble",
+          "duration"   : 750
+        },
+        {
+          "event-name" : "message-new-sms",
+          "type"       : "VibraRumble",
+          "duration"   : 1250,
+          "count"      : 2,
+          "pause"      : 250
+        },
+        {
+          "event-name" : "message-sent-instant",
+          "type"       : "VibraRumble",
+          "duration"   : 250
+        },
+        {
+          "event-name" : "phone-incoming-call",
+          "type"       : "VibraPeriodic",
+          "duration"   : 10000
+        },
+        {
+          "event-name" : "timeout-completed",
+          "type"       : "VibraRumble",
+          "duration"   : 500
+        },
+        {
+          "event-name" : "theme-demo",
+          "type"       : "VibraPeriodic",
+          "magnitude"  : 32767,
+          "duration"   : 5000
+        },
+        {
+          "event-name" : "window-close",
+          "type"       : "VibraRumble",
+          "duration"   : 75
+        }
+      ]
+    },
+    {
+      "name" : "silent",
+      "feedbacks" : [
+        {
+          "event-name" : "battery-caution",
+          "type"       : "Led",
+          "color"      : "red",
+          "frequency"  : 5000
+        },
+        {
+          "event-name" : "phone-missed-call",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 3000
+        },
+        {
+          "event-name" : "message-missed-email",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 2000
+        },
+        {
+          "event-name" : "message-missed-instant",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 1000
+        },
+        {
+          "event-name" : "message-missed-notification",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 500
+        },
+        {
+          "event-name" : "message-missed-sms",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 2000
+        }
+      ]
+    }
+  ]
+}
+

diff --git a/dev-libs/feedbackd/files/purism.librem5.json b/dev-libs/feedbackd/files/purism.librem5.json
new file mode 100644
index 000000000..043e7263f
--- /dev/null
+++ b/dev-libs/feedbackd/files/purism.librem5.json
@@ -0,0 +1,174 @@
+{
+  "name" : "default",
+  "profiles" : [
+    {
+      "name" : "full",
+      "feedbacks" : [
+        {
+          "event-name" : "alarm-clock-elapsed",
+          "type"       : "Sound",
+          "effect"     : "alarm-clock-elapsed"
+        },
+        {
+          "event-name" : "button-pressed",
+          "type"       : "Sound",
+          "effect"     : "button-pressed"
+        },
+        {
+          "event-name" : "button-released",
+          "type"       : "Sound",
+          "effect"     : "button-released"
+        },
+        {
+          "event-name" : "message-new-email",
+          "type"       : "Sound",
+          "effect"     : "message-new-email"
+        },
+        {
+          "event-name" : "message-new-instant",
+          "type"       : "Sound",
+          "effect"     : "message-new-instant"
+        },
+        {
+          "event-name" : "message-new-sms",
+          "type"       : "Sound",
+          "effect"     : "message-new-instant"
+        },
+        {
+          "event-name" : "phone-incoming-call",
+          "type"       : "Sound",
+          "effect"     : "phone-incoming-call"
+        },
+        {
+          "event-name" : "timeout-completed",
+          "type"       : "Sound",
+          "effect"     : "complete"
+        },
+        {
+          "event-name" : "theme-demo",
+          "type"       : "Sound",
+          "effect"     : "theme-demo"
+        },
+        {
+          "event-name" : "window-close",
+          "type"       : "Sound",
+          "effect"     : "theme-demo"
+        }
+      ]
+    },
+    {
+      "name" : "quiet",
+      "feedbacks" : [
+        {
+          "event-name"   : "alarm-clock-elapsed",
+          "type"         : "VibraPeriodic",
+          "magnitude"    : 32767,
+          "duration"     : 10000,
+          "fade-in-time" : 10000,
+          "fade-in-level": 4096
+        },
+        {
+          "event-name" : "bell-terminal",
+          "type"       : "VibraRumble",
+          "duration"   : 100
+        },
+        {
+          "event-name" : "button-pressed",
+          "type"       : "VibraRumble",
+          "duration"   : 15
+        },
+        {
+          "event-name" : "button-released",
+          "type"       : "VibraRumble",
+          "duration"   : 12
+        },
+        {
+          "event-name" : "message-new-email",
+          "type"       : "VibraRumble",
+          "duration"   : 750,
+          "count"      : 3,
+          "pause"      : 100
+        },
+        {
+          "event-name" : "message-new-instant",
+          "type"       : "VibraRumble",
+          "duration"   : 150
+        },
+        {
+          "event-name" : "message-new-sms",
+          "type"       : "VibraRumble",
+          "duration"   : 500,
+          "count"      : 2,
+          "pause"      : 100
+        },
+        {
+          "event-name" : "message-sent-instant",
+          "type"       : "VibraRumble",
+          "duration"   : 150
+        },
+        {
+          "event-name" : "phone-incoming-call",
+          "type"       : "VibraPeriodic",
+          "duration"   : 10000
+        },
+        {
+          "event-name" : "timeout-completed",
+          "type"       : "VibraRumble",
+          "duration"   : 100
+        },
+        {
+          "event-name" : "theme-demo",
+          "type"       : "VibraPeriodic",
+          "magnitude"  : 32767,
+          "duration"   : 5000
+        },
+        {
+          "event-name" : "window-close",
+          "type"       : "VibraRumble",
+          "duration"   : 25
+        }
+      ]
+    },
+    {
+      "name" : "silent",
+      "feedbacks" : [
+        {
+          "event-name" : "battery-caution",
+          "type"       : "Led",
+          "color"      : "red",
+          "frequency"  : 5000
+        },
+        {
+          "event-name" : "phone-missed-call",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 3000
+        },
+        {
+          "event-name" : "message-missed-email",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 2000
+        },
+        {
+          "event-name" : "message-missed-instant",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 1000
+        },
+        {
+          "event-name" : "message-missed-notification",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 500
+        },
+        {
+          "event-name" : "message-missed-sms",
+          "type"       : "Led",
+          "color"      : "blue",
+          "frequency"  : 2000
+        }
+      ]
+    }
+  ]
+}

diff --git a/dev-libs/feedbackd/metadata.xml b/dev-libs/feedbackd/metadata.xml
new file mode 100644
index 000000000..a0b29038e
--- /dev/null
+++ b/dev-libs/feedbackd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">atom/atom</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/feedbackd/, dev-libs/feedbackd/files/
@ 2021-07-24  5:38 Gerben Jan Dijkman
  0 siblings, 0 replies; 3+ messages in thread
From: Gerben Jan Dijkman @ 2021-07-24  5:38 UTC (permalink / raw
  To: gentoo-commits

commit:     02a1a0202de75802ba25483653afce54cb087c9b
Author:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
AuthorDate: Sat Jul 24 05:38:47 2021 +0000
Commit:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
CommitDate: Sat Jul 24 05:38:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=02a1a020

dev-libs/feedbackd: Version bump, removed the -r

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Gerben jan Dijkman <gjdijkman <AT> gjdwebserver.nl>

 dev-libs/feedbackd/Manifest                        |  4 +-
 dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild       | 58 ----------------------
 dev-libs/feedbackd/feedbackd-0.0.0.ebuild          | 56 +++++++++++++++++++++
 dev-libs/feedbackd/files/55.patch                  | 25 ----------
 ...pine64.pinephone.json => pine64,pinephone.json} |  0
 .../{purism.librem5.json => purism,librem5.json}   |  0
 dev-libs/feedbackd/metadata.xml                    | 14 +++++-
 7 files changed, 70 insertions(+), 87 deletions(-)

diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest
index 9078b3a9e..97cd91a6f 100644
--- a/dev-libs/feedbackd/Manifest
+++ b/dev-libs/feedbackd/Manifest
@@ -1,2 +1,2 @@
-DIST feedbackd-b45468080eee851da500613ecedd709639b6d769.tar.gz 80860 BLAKE2B a80829b496e314fd04f17024a3e5415e02852b217df5f9bcbca6159b4bded5220cd6cc9d39a66c24de500bbe91c111ca1e4d05669b53decc07ca0adb91b851da SHA512 7e869c127059d2f070d368ca894808f2fb78fd04048662dabd303a45d86a3b53bf3646f64e088cd720c6f54777a86673156d3cf782fdd663dc25fae65bd04e6e
-DIST feedbackd-device-themes-1602d415aed30b1a67c0ff270551230725b8ef92.tar.gz 13832 BLAKE2B 87c1ccd52dec982e4e1651e11598b60daa8380f2de4c371e0abc70e2840abd1e62fa9fd70cbe8a5860942c282cac54ea11b548066cd01be5b49ba939b488ec3a SHA512 0e6ece5deddc3df3824aa01b6bbc2ad7fc9ab96db6afe9e4aa84652a005eb860c5552e52aeb17329dde84e8d2bccc33c7e603ab04eb2ca41ed19bbe331ce6933
+DIST 48b4bb97d62fa1917a9e54852f593d3190ef188c.tar.gz 79913 BLAKE2B 9173619846072bf46a83c88a5383c36aa2493773a31de0a25b7d2db9ce45873674f7a551ff009b7e18e4bde19807ef92da81b6c27e9c78d568066f0350f1eaba SHA512 e87da6123fe56167cb5e1a5d0fbe2d17356e337b53f6348ddd1f9fb5236f213bf72b3b04763edf36fd477fd969ac10f87eafc4136880e40981b7f8b0c4508065
+DIST feedbackd-device-themes-516e80e0b00bbd904e64b0c272c40218290fe9f5.tar.gz 14397 BLAKE2B 189d20635fac63085f0154c939c1c3f5e3e8543eb074f8f82486c4503224eceb0ddc3674f48530e6cb1fa3bc44ad6b1797c5fb1ec575f225e54db97e204c8ec0 SHA512 4ace1c68b26395de54cfae84e5c8cde8642d2bfd663238d4fc527bce44cb937155d1113af56b26b8a0c0168332a617ce6ef5971ea100c664541ae083c47c1661

diff --git a/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild
deleted file mode 100644
index e5c161faf..000000000
--- a/dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit vala meson udev
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-MY_PV="${PV}+git20210426"
-MY_P="${PN}-${MY_PV}"
-MY_COMMIT="b45468080eee851da500613ecedd709639b6d769"
-MY_THEME_COMMIT="1602d415aed30b1a67c0ff270551230725b8ef92"
-
-DESCRIPTION="A daemon to provide haptic feedback on events"
-HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
-SRC_URI="
-	https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz -> ${PN}-${MY_COMMIT}.tar.gz
-	https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64"
-SLOT="0"
-
-DEPEND="
-	gnome-base/dconf
-	media-libs/gsound
-	dev-libs/json-glib
-	dev-libs/libgudev
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/gobject-introspection
-	dev-util/meson
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	eapply_user
-	use vala && vala_src_prepare
-	sed -i 's/-G feedbackd/-G video/g' "${S}"/debian/feedbackd.udev || die
-}
-
-src_install() {
-	default
-	meson_src_install
-	insinto /usr/share/feedbackd/themes
-	doins "${FILESDIR}"/pine64.pinephone.json
-	doins "${FILESDIR}"/purism.librem5.json
-	udev_newrules "${S}"/debian/feedbackd.udev 90-feedbackd.rules
-}

diff --git a/dev-libs/feedbackd/feedbackd-0.0.0.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0.ebuild
new file mode 100644
index 000000000..f439042da
--- /dev/null
+++ b/dev-libs/feedbackd/feedbackd-0.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit vala meson udev
+
+KEYWORDS="~arm ~arm64"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+MY_COMMIT="48b4bb97d62fa1917a9e54852f593d3190ef188c"
+MY_THEME_COMMIT="516e80e0b00bbd904e64b0c272c40218290fe9f5"
+
+DESCRIPTION="A daemon to provide haptic feedback on events"
+HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
+
+SRC_URI="https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz
+https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
+"
+
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+DEPEND="
+		gnome-base/dconf
+		media-libs/gsound
+		dev-libs/json-glib
+		dev-libs/libgudev
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+		dev-libs/gobject-introspection
+		dev-util/meson
+		dev-util/pkgconfig
+		vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	eapply_user
+	use vala && vala_src_prepare
+	sed -i 's/-G feedbackd/-G video/g' ${S}/debian/feedbackd.udev
+}
+
+src_install() {
+	default
+	meson_src_install
+	insinto /usr/share/feedbackd/themes
+	doins ${WORKDIR}/feedbackd-device-themes-${MY_THEME_COMMIT}/data/*.json
+	udev_newrules ${S}/debian/feedbackd.udev 90-feedbackd.rules
+}

diff --git a/dev-libs/feedbackd/files/55.patch b/dev-libs/feedbackd/files/55.patch
deleted file mode 100644
index 6946b6d14..000000000
--- a/dev-libs/feedbackd/files/55.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b0ef14bb5f73e0a1f5345f0ddd3b3992205daebf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
-Date: Tue, 4 May 2021 08:53:30 +0000
-Subject: [PATCH] fbd-feedback-manager: fix device-specific themes path
-
----
- src/fbd-feedback-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c
-index 39c27eb..ac6cdfa 100644
---- a/src/fbd-feedback-manager.c
-+++ b/src/fbd-feedback-manager.c
-@@ -455,7 +455,7 @@ find_themefile (void)
-       for (i = 0; i < g_strv_length (xdg_data_dirs); i++) {
-         g_autofree gchar *config_path = NULL;
- 
--        config_path = g_strconcat (xdg_data_dirs[i], "feedbackd/themes/", comp, ".json", NULL);
-+        config_path = g_strconcat (xdg_data_dirs[i], "/feedbackd/themes/", comp, ".json", NULL);
-         g_debug ("Searching for device specific themefile in %s", config_path);
- 
-         // Check if file exist
--- 
-GitLab
-

diff --git a/dev-libs/feedbackd/files/pine64.pinephone.json b/dev-libs/feedbackd/files/pine64,pinephone.json
similarity index 100%
rename from dev-libs/feedbackd/files/pine64.pinephone.json
rename to dev-libs/feedbackd/files/pine64,pinephone.json

diff --git a/dev-libs/feedbackd/files/purism.librem5.json b/dev-libs/feedbackd/files/purism,librem5.json
similarity index 100%
rename from dev-libs/feedbackd/files/purism.librem5.json
rename to dev-libs/feedbackd/files/purism,librem5.json

diff --git a/dev-libs/feedbackd/metadata.xml b/dev-libs/feedbackd/metadata.xml
index b372191c7..1fa5f7fb0 100644
--- a/dev-libs/feedbackd/metadata.xml
+++ b/dev-libs/feedbackd/metadata.xml
@@ -1,5 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gjdijkman@gjdwebserver.nl</email>
+		<name>Gerben Jan Dijkman</name>
+	</maintainer>
+	<longdescription lang="en">
+	A daemon to provide haptic (and later more) feedback on events.
+	</longdescription>
+	<upstream>
+		<doc>https://source.puri.sm/Librem5/feedbackd/</doc>
+		<bugs-to>https://source.puri.sm/Librem5/feedbackd/-/issues</bugs-to>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/feedbackd/, dev-libs/feedbackd/files/
@ 2022-06-19 18:50 Anna Vyalkova
  0 siblings, 0 replies; 3+ messages in thread
From: Anna Vyalkova @ 2022-06-19 18:50 UTC (permalink / raw
  To: gentoo-commits

commit:     d30b590c9d2366408b29fe4d7565c2257a7baef3
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Jun 19 16:55:50 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Jun 19 18:50:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d30b590c

dev-libs/feedbackd: tag version

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 dev-libs/feedbackd/Manifest                        |   3 +-
 dev-libs/feedbackd/feedbackd-0.0.0-r1.ebuild       |  56 -------
 .../feedbackd/feedbackd-0.0.0_p20220520.ebuild     |  46 ++++++
 dev-libs/feedbackd/files/pine64.pinephone.json     | 175 ---------------------
 dev-libs/feedbackd/files/purism.librem5.json       | 174 --------------------
 5 files changed, 47 insertions(+), 407 deletions(-)

diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest
index cea03db06..d556de2a4 100644
--- a/dev-libs/feedbackd/Manifest
+++ b/dev-libs/feedbackd/Manifest
@@ -1,2 +1 @@
-DIST feedbackd-0.0.0-753fff3e7ae1d0bce4f58cef721e45c50c404786.tar.gz 81596 BLAKE2B 8bc99c5d2376bb9bac9ba692c56c6f9bde58ce63f7e75cb6ba882cfe12bb796144f14c9a7fbca9e05b2a77404b2f12e9bdec3c6bac9848ac977283ff23f0b539 SHA512 cc3b0429514b02aa669cb545c888df2c0c676cc7f62658a78b835fbb6218ae9b8055dc5c5802b9ce3ad3323b2ceaa99cbadad5f2c134fb00c57a3e70514ce6a8
-DIST feedbackd-device-themes-d0ac6ae01b184d65f32a640e02539e807bf2a3bf.tar.gz 14706 BLAKE2B d313db08ff0902b3050e0e7bd05c424809a3e7f158cae96943d9c7ccddd5305a1f1ba18bfc9277d5d3f0a3b97cdf3e2553753c0e8f429a17459510fbb48e21ac SHA512 483e7174ffd3e10e9159fbc4b1b7b1b291f00747870795754634e22a51b2df78530648d44f33be164d8204cc54bb6120d8a7d8a5191b4e465e3a4554bc4245d8
+DIST feedbackd-0.0.0_p20220520.tar.gz 82971 BLAKE2B a92a782d642fdadda709e1b9b379a3253164c9397df7ce158c8c0873cced7886f41e6e3cabc19e85fc7043aedd37cead3cb61a4fb227347c0a454e88ffff822b SHA512 7400afec08cbc85f2251a0f56a08480dea1a50b30937bbe76e4828ac9aef1d9e3fe427887a5fde3337fa907c2f2a9ca0795ef41f4339b9624386d5d539a55e75

diff --git a/dev-libs/feedbackd/feedbackd-0.0.0-r1.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0-r1.ebuild
deleted file mode 100644
index de0a06df9..000000000
--- a/dev-libs/feedbackd/feedbackd-0.0.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit vala meson udev
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-MY_COMMIT="753fff3e7ae1d0bce4f58cef721e45c50c404786"
-MY_THEME_COMMIT="d0ac6ae01b184d65f32a640e02539e807bf2a3bf"
-
-DESCRIPTION="A daemon to provide haptic feedback on events"
-HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
-
-SRC_URI="https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz -> ${P}-${MY_COMMIT}.tar.gz
-https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
-"
-
-S=${WORKDIR}/${PN}-${MY_COMMIT}
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-DEPEND="
-		gnome-base/dconf
-		media-libs/gsound
-		dev-libs/json-glib
-		dev-libs/libgudev
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-		dev-libs/gobject-introspection
-		dev-util/meson
-		virtual/pkgconfig
-		vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	eapply_user
-	use vala && vala_src_prepare
-	sed -i 's/-G feedbackd/-G video/g' "${S}/debian/feedbackd.udev"
-}
-
-src_install() {
-	default
-	meson_src_install
-	insinto /usr/share/feedbackd/themes
-	doins "${WORKDIR}/feedbackd-device-themes-${MY_THEME_COMMIT}/data/"*.json
-	udev_newrules "${S}/debian/feedbackd.udev" 90-feedbackd.rules
-}

diff --git a/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild
new file mode 100644
index 000000000..3b5bfb37a
--- /dev/null
+++ b/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+inherit vala meson udev
+
+MY_PV="v${PV/_p/+git}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A daemon to provide haptic feedback on events"
+HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
+SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	gnome-base/dconf
+	media-libs/gsound
+	dev-libs/json-glib
+	dev-libs/libgudev:=
+"
+RDEPEND="${DEPEND}
+	dev-libs/feedbackd-device-themes
+"
+BDEPEND="
+	dev-libs/gobject-introspection
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+	sed -i 's/-G feedbackd/-G video/g' debian/feedbackd.udev || die
+}
+
+src_install() {
+	meson_src_install
+	udev_newrules "${S}/debian/feedbackd.udev" 90-feedbackd.rules
+}

diff --git a/dev-libs/feedbackd/files/pine64.pinephone.json b/dev-libs/feedbackd/files/pine64.pinephone.json
deleted file mode 100644
index 2b628454c..000000000
--- a/dev-libs/feedbackd/files/pine64.pinephone.json
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  "name" : "default",
-  "profiles" : [
-    {
-      "name" : "full",
-      "feedbacks" : [
-        {
-          "event-name" : "alarm-clock-elapsed",
-          "type"       : "Sound",
-          "effect"     : "alarm-clock-elapsed"
-        },
-        {
-          "event-name" : "button-pressed",
-          "type"       : "Sound",
-          "effect"     : "button-pressed"
-        },
-        {
-          "event-name" : "button-released",
-          "type"       : "Sound",
-          "effect"     : "button-released"
-        },
-        {
-          "event-name" : "message-new-email",
-          "type"       : "Sound",
-          "effect"     : "message-new-email"
-        },
-        {
-          "event-name" : "message-new-instant",
-          "type"       : "Sound",
-          "effect"     : "message-new-instant"
-        },
-        {
-          "event-name" : "message-new-sms",
-          "type"       : "Sound",
-          "effect"     : "message-new-instant"
-        },
-        {
-          "event-name" : "phone-incoming-call",
-          "type"       : "Sound",
-          "effect"     : "phone-incoming-call"
-        },
-        {
-          "event-name" : "timeout-completed",
-          "type"       : "Sound",
-          "effect"     : "complete"
-        },
-        {
-          "event-name" : "theme-demo",
-          "type"       : "Sound",
-          "effect"     : "theme-demo"
-        },
-        {
-          "event-name" : "window-close",
-          "type"       : "Sound",
-          "effect"     : "theme-demo"
-        }
-      ]
-    },
-    {
-      "name" : "quiet",
-      "feedbacks" : [
-        {
-          "event-name"   : "alarm-clock-elapsed",
-          "type"         : "VibraPeriodic",
-          "magnitude"    : 32767,
-          "duration"     : 10000,
-          "fade-in-time" : 10000,
-          "fade-in-level": 4096
-        },
-        {
-          "event-name" : "bell-terminal",
-          "type"       : "VibraRumble",
-          "duration"   : 100
-        },
-        {
-          "event-name" : "button-pressed",
-          "type"       : "VibraRumble",
-          "duration"   : 80
-        },
-        {
-          "event-name" : "button-released",
-          "type"       : "VibraRumble",
-          "duration"   : 40
-        },
-        {
-          "event-name" : "message-new-email",
-          "type"       : "VibraRumble",
-          "duration"   : 750,
-          "count"      : 3,
-          "pause"      : 100
-        },
-        {
-          "event-name" : "message-new-instant",
-          "type"       : "VibraRumble",
-          "duration"   : 750
-        },
-        {
-          "event-name" : "message-new-sms",
-          "type"       : "VibraRumble",
-          "duration"   : 1250,
-          "count"      : 2,
-          "pause"      : 250
-        },
-        {
-          "event-name" : "message-sent-instant",
-          "type"       : "VibraRumble",
-          "duration"   : 250
-        },
-        {
-          "event-name" : "phone-incoming-call",
-          "type"       : "VibraPeriodic",
-          "duration"   : 10000
-        },
-        {
-          "event-name" : "timeout-completed",
-          "type"       : "VibraRumble",
-          "duration"   : 500
-        },
-        {
-          "event-name" : "theme-demo",
-          "type"       : "VibraPeriodic",
-          "magnitude"  : 32767,
-          "duration"   : 5000
-        },
-        {
-          "event-name" : "window-close",
-          "type"       : "VibraRumble",
-          "duration"   : 75
-        }
-      ]
-    },
-    {
-      "name" : "silent",
-      "feedbacks" : [
-        {
-          "event-name" : "battery-caution",
-          "type"       : "Led",
-          "color"      : "red",
-          "frequency"  : 5000
-        },
-        {
-          "event-name" : "phone-missed-call",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 3000
-        },
-        {
-          "event-name" : "message-missed-email",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 2000
-        },
-        {
-          "event-name" : "message-missed-instant",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 1000
-        },
-        {
-          "event-name" : "message-missed-notification",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 500
-        },
-        {
-          "event-name" : "message-missed-sms",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 2000
-        }
-      ]
-    }
-  ]
-}
-

diff --git a/dev-libs/feedbackd/files/purism.librem5.json b/dev-libs/feedbackd/files/purism.librem5.json
deleted file mode 100644
index 043e7263f..000000000
--- a/dev-libs/feedbackd/files/purism.librem5.json
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-  "name" : "default",
-  "profiles" : [
-    {
-      "name" : "full",
-      "feedbacks" : [
-        {
-          "event-name" : "alarm-clock-elapsed",
-          "type"       : "Sound",
-          "effect"     : "alarm-clock-elapsed"
-        },
-        {
-          "event-name" : "button-pressed",
-          "type"       : "Sound",
-          "effect"     : "button-pressed"
-        },
-        {
-          "event-name" : "button-released",
-          "type"       : "Sound",
-          "effect"     : "button-released"
-        },
-        {
-          "event-name" : "message-new-email",
-          "type"       : "Sound",
-          "effect"     : "message-new-email"
-        },
-        {
-          "event-name" : "message-new-instant",
-          "type"       : "Sound",
-          "effect"     : "message-new-instant"
-        },
-        {
-          "event-name" : "message-new-sms",
-          "type"       : "Sound",
-          "effect"     : "message-new-instant"
-        },
-        {
-          "event-name" : "phone-incoming-call",
-          "type"       : "Sound",
-          "effect"     : "phone-incoming-call"
-        },
-        {
-          "event-name" : "timeout-completed",
-          "type"       : "Sound",
-          "effect"     : "complete"
-        },
-        {
-          "event-name" : "theme-demo",
-          "type"       : "Sound",
-          "effect"     : "theme-demo"
-        },
-        {
-          "event-name" : "window-close",
-          "type"       : "Sound",
-          "effect"     : "theme-demo"
-        }
-      ]
-    },
-    {
-      "name" : "quiet",
-      "feedbacks" : [
-        {
-          "event-name"   : "alarm-clock-elapsed",
-          "type"         : "VibraPeriodic",
-          "magnitude"    : 32767,
-          "duration"     : 10000,
-          "fade-in-time" : 10000,
-          "fade-in-level": 4096
-        },
-        {
-          "event-name" : "bell-terminal",
-          "type"       : "VibraRumble",
-          "duration"   : 100
-        },
-        {
-          "event-name" : "button-pressed",
-          "type"       : "VibraRumble",
-          "duration"   : 15
-        },
-        {
-          "event-name" : "button-released",
-          "type"       : "VibraRumble",
-          "duration"   : 12
-        },
-        {
-          "event-name" : "message-new-email",
-          "type"       : "VibraRumble",
-          "duration"   : 750,
-          "count"      : 3,
-          "pause"      : 100
-        },
-        {
-          "event-name" : "message-new-instant",
-          "type"       : "VibraRumble",
-          "duration"   : 150
-        },
-        {
-          "event-name" : "message-new-sms",
-          "type"       : "VibraRumble",
-          "duration"   : 500,
-          "count"      : 2,
-          "pause"      : 100
-        },
-        {
-          "event-name" : "message-sent-instant",
-          "type"       : "VibraRumble",
-          "duration"   : 150
-        },
-        {
-          "event-name" : "phone-incoming-call",
-          "type"       : "VibraPeriodic",
-          "duration"   : 10000
-        },
-        {
-          "event-name" : "timeout-completed",
-          "type"       : "VibraRumble",
-          "duration"   : 100
-        },
-        {
-          "event-name" : "theme-demo",
-          "type"       : "VibraPeriodic",
-          "magnitude"  : 32767,
-          "duration"   : 5000
-        },
-        {
-          "event-name" : "window-close",
-          "type"       : "VibraRumble",
-          "duration"   : 25
-        }
-      ]
-    },
-    {
-      "name" : "silent",
-      "feedbacks" : [
-        {
-          "event-name" : "battery-caution",
-          "type"       : "Led",
-          "color"      : "red",
-          "frequency"  : 5000
-        },
-        {
-          "event-name" : "phone-missed-call",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 3000
-        },
-        {
-          "event-name" : "message-missed-email",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 2000
-        },
-        {
-          "event-name" : "message-missed-instant",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 1000
-        },
-        {
-          "event-name" : "message-missed-notification",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 500
-        },
-        {
-          "event-name" : "message-missed-sms",
-          "type"       : "Led",
-          "color"      : "blue",
-          "frequency"  : 2000
-        }
-      ]
-    }
-  ]
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-06-19 18:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-22 13:56 [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/feedbackd/, dev-libs/feedbackd/files/ Marco Scardovi
  -- strict thread matches above, loose matches on Subject: below --
2021-07-24  5:38 Gerben Jan Dijkman
2022-06-19 18:50 Anna Vyalkova

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox