From 83ab1d473d2d0d3728a630ee89ded20ac63bb540 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 31 Mar 2024 18:29:57 +0200 Subject: [PATCH 1/2] ddcutil: split library into subpackage --- common/shlibs | 2 +- srcpkgs/ddcutil/template | 25 ++++++++++++++++++++++++- srcpkgs/libddcutil | 1 + srcpkgs/libddcutil-devel | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/libddcutil create mode 120000 srcpkgs/libddcutil-devel diff --git a/common/shlibs b/common/shlibs index 1ee5b1f0544b5c..b37d15fb22f16b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3071,7 +3071,7 @@ libphodav-3.0.so.0 phodav-3.0_1 libgfshare.so.2 libgfshare-2.0.0_1 libtacacs.so.1 tacacs-4.0.4.28_1 libffms2.so.4 libffms2-2.23.1_1 -libddcutil.so.5 ddcutil-2.1.4_1 +libddcutil.so.5 libddcutil-2.1.4_2 liblsmash.so.2 liblsmash-2.9.1_1 libgiac.so.0 libgiac-1.4.9r17_1 libgnustep-base.so.1.29 gnustep-base-1.29.0_1 diff --git a/srcpkgs/ddcutil/template b/srcpkgs/ddcutil/template index e34da8423fbd40..d2fa13bdec6a6a 100644 --- a/srcpkgs/ddcutil/template +++ b/srcpkgs/ddcutil/template @@ -1,7 +1,7 @@ # Template file for 'ddcutil' pkgname=ddcutil version=2.1.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--libdir=/usr/lib" hostmakedepends="automake libtool pkg-config" @@ -28,3 +28,26 @@ esac pre_configure() { NOCONFIGURE=1 ./autogen.sh } + +libddcutil_package() { + conflicts="ddcutil<=2.1.4_1" + short_desc+=" - library files" + pkg_install() { + vmove "usr/lib/*.so.*" + vmove "usr/share/ddcutil" + vmove "usr/lib/modules-load.d" + vmove "usr/lib/udev" + } +} + +libddcutil-devel_package() { + conflicts="ddcutil<=2.1.4_1" + short_desc+=" - development files" + depends="libddcutil-${version}_${revision}" + pkg_install() { + vmove "usr/lib/*.so" + vmove "usr/lib/pkgconfig" + vmove "usr/lib/cmake" + vmove "usr/include" + } +} diff --git a/srcpkgs/libddcutil b/srcpkgs/libddcutil new file mode 120000 index 00000000000000..951a9f5d13f90e --- /dev/null +++ b/srcpkgs/libddcutil @@ -0,0 +1 @@ +ddcutil \ No newline at end of file diff --git a/srcpkgs/libddcutil-devel b/srcpkgs/libddcutil-devel new file mode 120000 index 00000000000000..951a9f5d13f90e --- /dev/null +++ b/srcpkgs/libddcutil-devel @@ -0,0 +1 @@ +ddcutil \ No newline at end of file From 8f76bca3ceb4c669b708cc5c67d3762cb774f41e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 31 Mar 2024 18:33:19 +0200 Subject: [PATCH 2/2] Clightd: build against libddcutil --- srcpkgs/Clightd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Clightd/template b/srcpkgs/Clightd/template index c5c32022f00211..982e0fc0267ab3 100644 --- a/srcpkgs/Clightd/template +++ b/srcpkgs/Clightd/template @@ -1,12 +1,12 @@ # Template file for 'Clightd' pkgname=Clightd version=5.9 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_DDC=1 -DENABLE_GAMMA=1 -DENABLE_DPMS=1 -DENABLE_SCREEN=1" hostmakedepends="pkg-config wayland-devel" makedepends="eudev-libudev-devel libmodule-devel polkit-devel elogind-devel - libXrandr-devel libXext-devel libX11-devel ddcutil libjpeg-turbo-devel + libXrandr-devel libXext-devel libX11-devel libddcutil-devel libjpeg-turbo-devel wayland-devel libdrm-devel libusb-devel libiio-devel" depends="ddcutil" short_desc="API to read webcam brightness & alter screen brightness/temperature"