Re: [PR PATCH] [Updated] Clightd: update to 4.2; Clight: update to 4.1

[ahesford <ahesford@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

There is an updated pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages clight
https://github.com/void-linux/void-packages/pull/25266

Clightd: update to 4.2; Clight: update to 4.1


A patch file from https://github.com/void-linux/void-packages/pull/25266.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-clight-25266.patch --]
[-- Type: text/x-diff, Size: 5465 bytes --]

From f98ae8d7f999b4de37582431c163b7c3eecd5888 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 1 Oct 2020 23:28:01 -0400
Subject: [PATCH 1/2] Clightd: update to 4.2.

---
 srcpkgs/Clightd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template
index 0b913e51414..79013c87829 100644
--- a/srcpkgs/Clightd/template
+++ b/srcpkgs/Clightd/template
@@ -1,7 +1,7 @@
 # Template file for 'Clightd'
 pkgname=Clightd
-version=4.1
-revision=2
+version=4.2
+revision=1
 build_style=cmake
 cmake_builddir=build
 configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1"
@@ -13,7 +13,7 @@ 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=1f884489faf9bf53d4a92db3f381a8fb06eb37515f026213a316a3285593686d
+checksum=39301b0cad2da9adb4b662b64563f35ad5b3724631d81c1db55c311bc10dec67
 
 post_install() {
 	vinstall Scripts/i2c_clightd.conf 644 /usr/lib/modules-load.d/

From d16c4866dd731eca8fd8983b3c56f92e94084c2c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 1 Oct 2020 23:29:51 -0400
Subject: [PATCH 2/2] Clight: update to 4.1.

Includes upstream patch to enable compilation on ARM archs.
---
 srcpkgs/Clight/patches/bus.c.patch | 81 ++++++++++++++++++++++++++++++
 srcpkgs/Clight/template            |  6 +--
 2 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/Clight/patches/bus.c.patch

diff --git a/srcpkgs/Clight/patches/bus.c.patch b/srcpkgs/Clight/patches/bus.c.patch
new file mode 100644
index 00000000000..a0c4d3a1d6f
--- /dev/null
+++ b/srcpkgs/Clight/patches/bus.c.patch
@@ -0,0 +1,81 @@
+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 a517bd7d4da..348c6fdd46a 100644
--- a/srcpkgs/Clight/template
+++ b/srcpkgs/Clight/template
@@ -1,7 +1,7 @@
 # Template file for 'Clight'
 pkgname=Clight
-version=4.0
-revision=2
+version=4.1
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
@@ -12,4 +12,4 @@ 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=ae1deba71d376b14acc2a7495b1a6a4ed43fa438c59c1d4fcb2648d44964bd71
+checksum=84156f3dfd9ab863be25d3efc8b5d6d6043ba4a0b44259c2a1cee1367b3c97aa