File backport-support-for-old-ddcutil.patch of Package deepin-daemon
diff -Nur dde-daemon-6.0.43/bin/backlight_helper/ddcci/ddcci.go dde-daemon-6.0.43-new/bin/backlight_helper/ddcci/ddcci.go
--- dde-daemon-6.0.43/bin/backlight_helper/ddcci/ddcci.go 2024-07-24 17:47:41.000000000 +0800
+++ dde-daemon-6.0.43-new/bin/backlight_helper/ddcci/ddcci.go 2024-08-07 15:21:19.871855102 +0800
@@ -104,9 +104,9 @@
displayHandleMap: make(map[string]*displayHandle),
}
- status := C.ddca_init2((*C.char)(unsafe.Pointer(nil)), C.DDCA_SYSLOG_NOTICE, C.DDCA_INIT_OPTIONS_CLIENT_OPENED_SYSLOG, (***C.char)(unsafe.Pointer(nil)))
+ status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
if status < C.int(0) {
- return nil, fmt.Errorf("brightness: Error ddcci init: %d", status)
+ return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
}
err := ddc.RefreshDisplays()
@@ -117,14 +117,14 @@
content, err := exec.Command("/usr/bin/dpkg-architecture", "-qDEB_HOST_MULTIARCH").Output()
if err != nil {
// use dlopen search library when dpkg-architecture not available
- cStr := C.CString("libddcutil.so.5")
+ cStr := C.CString("libddcutil.so.0")
defer C.free(unsafe.Pointer(cStr))
ret := C.InitDDCCISo(cStr)
if ret == -2 {
logger.Debug("failed to initialize ddca_free_all_displays sym")
}
} else {
- path := filepath.Join("/usr/lib", strings.TrimSpace(string(content)), "libddcutil.so.5")
+ path := filepath.Join("/usr/lib", strings.TrimSpace(string(content)), "libddcutil.so.0")
logger.Debug("so path:", path)
cStr := C.CString(path)
defer C.free(unsafe.Pointer(cStr))