z572 pushed a commit to branch master
in repository guix.
commit 3e4e1aa99bb6556b5a5850952ffd6304897481f5
Author: Ashish SHUKLA <[email protected]>
AuthorDate: Tue Jul 23 21:21:27 2024 +0200
gnu: ddcci-driver-linux: Update to 0.4.5.
* gnu/packages/linux.scm (ddcci-driver-linux): Update to 0.4.5.
[source]: Remove already upstream patch.
* gnu/packages/patches/ddcci-driver-linux-6.8.patch: Remove it.
* gnu/local.mk: Unregister it.
Change-Id: I1d4920ec84ea2a67554560181e99e9e2d535af2a
Signed-off-by: Zheng Junjie <[email protected]>
---
gnu/local.mk | 2 +-
gnu/packages/linux.scm | 6 ++--
.../patches/ddcci-driver-linux-linux-6.8.patch | 36 ----------------------
3 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index fac7b5973b..6d2b14e72d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -65,6 +65,7 @@
# Copyright © 2023 Herman Rimm <[email protected]>
# Copyright © 2023 Troy Figiel <[email protected]>
# Copyright © 2024 David Elsing <[email protected]>
+# Copyright © 2024 Ashish SHUKLA <[email protected]>
#
# This file is part of GNU Guix.
#
@@ -1111,7 +1112,6 @@ dist_patch_DATA =
\
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
- %D%/packages/patches/ddcci-driver-linux-linux-6.8.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 283f9511ab..613d4b260c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -81,6 +81,7 @@
;;; Copyright © 2024 Gabriel Wicki <[email protected]>
;;; Copyright © 2024 Sharlatan Hellseher <[email protected]>
;;; Copyright © 2024 Arun Isaac <[email protected]>
+;;; Copyright © 2024 Ashish SHUKLA <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1810,7 +1811,7 @@ graphics card on Optimus laptops.")
(define-public ddcci-driver-linux
(package
(name "ddcci-driver-linux")
- (version "0.4.4")
+ (version "0.4.5")
(source
(origin
(method git-fetch)
@@ -1820,8 +1821,7 @@ graphics card on Optimus laptops.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "19vi7dk4jv5wm18cznz4lj2fb1c7m7j3ig62x4a6qy9djxf9z472"))
- (patches (search-patches "ddcci-driver-linux-linux-6.8.patch"))))
+ (base32 "0j2bgzadrbcyf3k4zplv7p5yqb9pw2ca6wzkqjhhidaah2722vlf"))))
(build-system linux-module-build-system)
(arguments
(list #:tests? #f ; no tests
diff --git a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch
b/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch
deleted file mode 100644
index 89ded73c14..0000000000
--- a/gnu/packages/patches/ddcci-driver-linux-linux-6.8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Retrieved from:
https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/3eb20df68a545d07b8501f13fa9d20e9c6f577ed.patch
-
-From 7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e Mon Sep 17 00:00:00 2001
-From: Bruno Inec <[email protected]>
-Date: Wed, 20 Mar 2024 10:36:56 +0100
-Subject: [PATCH] Compatibility with Linux 6.8
-
----
- ddcci/ddcci.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c
-index 87b0818..6073c75 100644
---- a/ddcci/ddcci.c
-+++ b/ddcci/ddcci.c
-@@ -1666,7 +1666,7 @@ static int ddcci_detect(struct i2c_client *client,
struct i2c_board_info *info)
- pr_debug("detected %d:%02x\n", client->adapter->nr, outer_addr);
-
- /* set device type */
-- strlcpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci"
: "ddcci-dependent", I2C_NAME_SIZE);
-+ strscpy(info->type, (outer_addr == DDCCI_DEFAULT_DEVICE_ADDR) ? "ddcci"
: "ddcci-dependent", I2C_NAME_SIZE);
-
- return 0;
- }
-@@ -1824,7 +1824,7 @@ static struct i2c_driver ddcci_driver = {
- #else
- .remove = ddcci_remove,
- #endif
-- .class = I2C_CLASS_DDC,
-+ .class = I2C_CLASS_SPD,
- .detect = ddcci_detect,
- .address_list = I2C_ADDRS(
- DDCCI_DEFAULT_DEVICE_ADDR>>1
---
-GitLab
-
