Clight: update to 4.0.

This commit is contained in:
Andrew Benson 2019-11-26 10:44:45 -06:00 committed by Helmut Pozimski
parent 9ab497d484
commit d8da4a898f
3 changed files with 15 additions and 39 deletions

View file

@ -0,0 +1,10 @@
--- src/utils/log.c.orig
+++ src/utils/log.c
@@ -1,5 +1,7 @@
+#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include "commons.h"
static FILE *log_file;

View file

@ -1,35 +0,0 @@
From 8491e18e940a71a74874885436691e2443b21844 Mon Sep 17 00:00:00 2001
From: Federico Di Pierro <nierro92@gmail.com>
Date: Mon, 18 Mar 2019 20:24:48 +0100
Subject: [PATCH] Avoid flaot libsystemd/libelogind version. Fixes #70.
---
CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d6f173..f6e0c3d 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -34,6 +34,12 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 99)
# Required dependencies
pkg_check_modules(REQ_LIBS REQUIRED popt gsl libconfig)
pkg_search_module(LOGIN_LIBS REQUIRED libelogind libsystemd>=221)
+
+# Avoid float versioning for libsystemd/libelogind
+string(REPLACE "." ";" LOGIN_LIBS_VERSION_LIST ${LOGIN_LIBS_VERSION})
+list(GET LOGIN_LIBS_VERSION_LIST 0 LOGIN_LIBS_VERSION_MAJOR)
+message(STATUS "Found lib${LOGIN_LIBS_LIBRARIES} version ${LOGIN_LIBS_VERSION_MAJOR}")
+
target_link_libraries(${PROJECT_NAME}
m
${REQ_LIBS_LIBRARIES}
@@ -44,7 +50,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
"${LOGIN_LIBS_INCLUDE_DIRS}"
)
target_compile_definitions(${PROJECT_NAME} PRIVATE
- -DLIBSYSTEMD_VERSION=${LOGIN_LIBS_VERSION}
+ -DLIBSYSTEMD_VERSION=${LOGIN_LIBS_VERSION_MAJOR}
)
list(APPEND COMBINED_LDFLAGS ${REQ_LIBS_LDFLAGS})
list(APPEND COMBINED_LDFLAGS ${LOGIN_LIBS_LDFLAGS})

View file

@ -1,14 +1,15 @@
# Template file for 'Clight'
pkgname=Clight
version=3.1
revision=2
version=4.0
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion dbus-devel"
makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
dbus-devel libmodule-devel"
depends="Clightd"
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=842e639b86f898da225104878543b97d2626a3326e663f84333d075f9e718b89
checksum=ae1deba71d376b14acc2a7495b1a6a4ed43fa438c59c1d4fcb2648d44964bd71