Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: archlinux build error #623

Merged
merged 1 commit into from
Jun 19, 2024
Merged

fix: archlinux build error #623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions bin/backlight_helper/ddcci/ddcci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package ddcci
//#cgo LDFLAGS:-ldl
//#cgo pkg-config: ddcutil
//#include <ddcutil_c_api.h>
//#include <ddcutil_types.h>
//#include <stdlib.h>
//#include "ddcci_wrapper.h"
import "C"
Expand Down Expand Up @@ -103,9 +104,9 @@ func newDDCCI() (*ddcci, error) {
displayHandleMap: make(map[string]*displayHandle),
}

status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
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)))
if status < C.int(0) {
return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
return nil, fmt.Errorf("brightness: Error ddcci init: %d", status)
}

err := ddc.RefreshDisplays()
Expand All @@ -116,14 +117,14 @@ func newDDCCI() (*ddcci, error) {
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.0")
cStr := C.CString("libddcutil.so.5")
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.0")
path := filepath.Join("/usr/lib", strings.TrimSpace(string(content)), "libddcutil.so.5")
logger.Debug("so path:", path)
cStr := C.CString(path)
defer C.free(unsafe.Pointer(cStr))
Expand Down
Loading