From: adriangoransson <adriangoransson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Clight[d]: Update to 4.2 and 5.1
Date: Mon, 08 Feb 2021 14:48:26 +0100 [thread overview]
Message-ID: <20210208134826.llQqEBNCfOQMlW5hTlTlcMM4RX_EiAqvY1zChMADBd4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28579@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]
There is an updated pull request by adriangoransson against master on the void-packages repository
https://github.com/adriangoransson/void-packages master
https://github.com/void-linux/void-packages/pull/28579
Clight[d]: Update to 4.2 and 5.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28579.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-28579.patch --]
[-- Type: text/x-diff, Size: 6704 bytes --]
From cd18e2327b6e488af1ad8ce338ad27d2aba74d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Mon, 8 Feb 2021 09:43:59 +0100
Subject: [PATCH 1/2] Clightd: Update to 5.1
---
srcpkgs/Clightd/files/Clightd/run | 2 +-
srcpkgs/Clightd/template | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Clightd/files/Clightd/run b/srcpkgs/Clightd/files/Clightd/run
index 979d7e955cc..9170543376b 100644
--- a/srcpkgs/Clightd/files/Clightd/run
+++ b/srcpkgs/Clightd/files/Clightd/run
@@ -1,4 +1,4 @@
#!/bin/sh
sv check dbus >/dev/null || exit 1
-exec /usr/lib/clightd/clightd 2>&1
+exec /usr/libexec/clightd 2>&1
diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 79013c87829..4aef71d7e05 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,19 +1,23 @@
# Template file for 'Clightd'
pkgname=Clightd
-version=4.2
+version=5.1
revision=1
build_style=cmake
cmake_builddir=build
configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
hostmakedepends="pkg-config"
-makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel libXrandr-devel libXext-devel libX11-devel ddcutil"
+makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel libXrandr-devel libXext-devel libX11-devel ddcutil libjpeg-turbo-devel wayland-devel libdrm-devel libusb-devel"
depends="ddcutil"
short_desc="API to read webcam brightness & alter screen brightness/temperature"
maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/FedeDP/Clightd"
distfiles="https://github.com/FedeDP/Clightd/archive/${version}.tar.gz"
-checksum=39301b0cad2da9adb4b662b64563f35ad5b3724631d81c1db55c311bc10dec67
+checksum=ce5002ed7790fce64e323bd483d8e5dde70a7fa9bbebc8311f514e0d5a64ab10
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel"
+fi
post_install() {
vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/
From ae9371aea2540f376ab044f482df007869dba759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20G=C3=B6ransson?= <adriangoransson@gmail.com>
Date: Mon, 8 Feb 2021 10:02:07 +0100
Subject: [PATCH 2/2] Clight: Update to 4.2
This update **requires** Clightd >= 5.0.
Removed patch has been merged upstream.
---
srcpkgs/Clight/patches/bus.c.patch | 81 ------------------------------
srcpkgs/Clight/template | 13 +++--
2 files changed, 10 insertions(+), 84 deletions(-)
delete mode 100644 srcpkgs/Clight/patches/bus.c.patch
diff --git a/srcpkgs/Clight/patches/bus.c.patch b/srcpkgs/Clight/patches/bus.c.patch
deleted file mode 100644
index a0c4d3a1d6f..00000000000
--- a/srcpkgs/Clight/patches/bus.c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git src/modules/bus.c src/modules/bus.c
-index 00f49cf..7e65fef 100644
---- src/modules/bus.c
-+++ src/modules/bus.c
-@@ -2,7 +2,6 @@
-
- #define GET_BUS(a) sd_bus *tmp = a->bus; if (!tmp) { tmp = a->type == USER_BUS ? userbus : sysbus; } if (!tmp) { return -1; }
-
--static int _call(const bus_args *a, const char *signature, va_list args_va, const void **args_ptr, bool expect_reply);
- static void free_bus_structs(sd_bus_error *err, sd_bus_message *m, sd_bus_message *reply);
- static int check_err(int *r, sd_bus_error *err, const char *caller);
-
-@@ -66,7 +65,10 @@ static void receive(const msg_t *const msg, UNUSED const void* userdata) {
- }
- }
-
--static int _call(const bus_args *a, const char *signature, va_list args_va, const void **args_ptr, bool expect_reply) {
-+/*
-+ * Call a method on bus and store its result of type userptr_type in userptr.
-+ */
-+int call(const bus_args *a, const char *signature, ...) {
- sd_bus_error error = SD_BUS_ERROR_NULL;
- sd_bus_message *m = NULL, *reply = NULL;
- GET_BUS(a);
-@@ -76,26 +78,20 @@ static int _call(const bus_args *a, const char *signature, va_list args_va, cons
- goto finish;
- }
-
-- r = sd_bus_message_set_expect_reply(m, expect_reply);
-+ r = sd_bus_message_set_expect_reply(m, a->reply_cb != NULL);
- if (check_err(&r, &error, a->caller)) {
- goto finish;
- }
-
-- if (args_va) {
-- sd_bus_message_appendv(m, signature, args_va);
-- } else if (args_ptr) {
-- int len = strlen(signature);
-- if (len == 1) {
-- sd_bus_message_append_basic(m, signature[0], args_ptr);
-- } else {
-- for (int i = 0; i < len; i++) {
-- sd_bus_message_append_basic(m, signature[i], args_ptr[i]);
-- }
-- }
-+ if (signature && strlen(signature)) {
-+ va_list args;
-+ va_start(args, signature);
-+ sd_bus_message_appendv(m, signature, args);
-+ va_end(args);
- }
-
- /* Check if we need to wait for a response message */
-- if (expect_reply) {
-+ if (a->reply_cb != NULL) {
- r = sd_bus_call(tmp, m, 0, &error, &reply);
- if (check_err(&r, &error, a->caller)) {
- goto finish;
-@@ -111,22 +107,6 @@ finish:
- return r;
- }
-
--/*
-- * Call a method on bus and store its result of type userptr_type in userptr.
-- */
--int call(const bus_args *a, const char *signature, ...) {
-- int r = 0;
-- if (signature) {
-- va_list args;
-- va_start(args, signature);
-- r = _call(a, signature, args, NULL, a->reply_cb != NULL);
-- va_end(args);
-- } else {
-- r = _call(a, signature, NULL, NULL, a->reply_cb != NULL);
-- }
-- return r;
--}
--
- /*
- * Add a match on bus on certain signal for cb callback
- */
diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template
index 348c6fdd46a..5d9c87c2cd9 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,15 +1,22 @@
# Template file for 'Clight'
pkgname=Clight
-version=4.1
+version=4.2
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
dbus-devel libmodule-devel"
-depends="Clightd"
+depends="Clightd>=5.0"
short_desc="Use your webcam as a light sensor to adjust screen backlight"
maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/FedeDP/Clight"
distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
-checksum=84156f3dfd9ab863be25d3efc8b5d6d6043ba4a0b44259c2a1cee1367b3c97aa
+checksum=fc3c4952c755bad5f4274f69f5cc17142abb51d88d7c615873e3058edc1c1137
+
+post_install() {
+ vcompletion Extra/_clight zsh
+ vcompletion Extra/clight bash
+
+ vinstall Extra/desktop/clight.desktop 644 usr/share/applications
+}
next prev parent reply other threads:[~2021-02-08 13:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 9:38 [PR PATCH] " adriangoransson
2021-02-08 9:41 ` [PR PATCH] [Updated] " adriangoransson
2021-02-08 11:07 ` adriangoransson
2021-02-08 11:11 ` adriangoransson
2021-02-08 11:16 ` adriangoransson
2021-02-08 11:27 ` [PR PATCH] [Updated] " adriangoransson
2021-02-08 11:33 ` adriangoransson
2021-02-08 12:50 ` [PR PATCH] [Updated] " adriangoransson
2021-02-08 12:54 ` adriangoransson
2021-02-08 13:22 ` [PR REVIEW] " ericonr
2021-02-08 13:22 ` ericonr
2021-02-08 13:22 ` ericonr
2021-02-08 13:46 ` [PR PATCH] [Closed]: " adriangoransson
2021-02-08 13:46 ` [PR PATCH] [Updated] " adriangoransson
2021-02-08 13:48 ` adriangoransson
2021-02-08 13:48 ` adriangoransson [this message]
2021-02-08 13:50 ` [PR REVIEW] " adriangoransson
2021-02-08 13:52 ` [PR PATCH] [Updated] " adriangoransson
2021-02-08 13:54 ` [PR REVIEW] " adriangoransson
2021-02-08 15:06 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210208134826.llQqEBNCfOQMlW5hTlTlcMM4RX_EiAqvY1zChMADBd4@z \
--to=adriangoransson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).