Date: Thursday, February 18, 2021 @ 13:19:28 Author: lcarlier Revision: 864115
upgpkg: lib32-lm_sensors 3.6.0.r5313.g31d1f125-1: sync with latest upstream commit Modified: lib32-lm_sensors/trunk/PKGBUILD Deleted: lib32-lm_sensors/trunk/lm_sensors-fancontrol.patch -----------------------------+ PKGBUILD | 30 ++++++++++++++++++++---------- lm_sensors-fancontrol.patch | 29 ----------------------------- 2 files changed, 20 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-18 13:15:15 UTC (rev 864114) +++ PKGBUILD 2021-02-18 13:19:28 UTC (rev 864115) @@ -3,35 +3,45 @@ # Contributor: Lubosz Sarnecki <lubo...@gmail.com> pkgname=lib32-lm_sensors -pkgver=3.6.0 -_ver=${pkgver//\./-} +pkgver=3.6.0.r5313.g31d1f125 +_commit=31d1f125d8076f1c8c8f3224b31d240e6e6a1763 +#_pkgver=${pkgver//./-} pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring (32-bit)" arch=('x86_64') url="http://www.lm-sensors.org/" license=('GPL' 'LGPL') +makedepends=('git') depends=('lm_sensors' 'lib32-glibc') -source=(lm_sensors-${pkgver}::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz) -sha1sums=('2ef03242b62d70523919d06859503f12feb9f7d4') +provides=('libsensors.so') +#source=(lm_sensors-${pkgver}.tar.gz::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz) +source=("git+https://github.com/groeck/lm-sensors.git#commit=${_commit}") +sha256sums=('SKIP') +pkgver() { + cd "${srcdir}"/lm-sensors* + + echo 3.6.0.r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD) +} + prepare() { - cd lm-sensors-${_ver} + cd "${srcdir}"/lm-sensors* sed -i 's/CC := gcc/CC := gcc -m32/' Makefile } build() { - cd lm-sensors-${_ver} + cd "${srcdir}"/lm-sensors* make PREFIX=/usr } package() { - cd lm-sensors-${_ver} + cd "${srcdir}"/lm-sensors* - make PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR="${pkgdir}" install + make PREFIX=/usr LIBDIR=/usr/lib32 BUILD_STATIC_LIB=0 DESTDIR="${pkgdir}" install - rm -r ${pkgdir}/etc/ - rm -r ${pkgdir}/usr/{bin,sbin,include,man} + rm -r "${pkgdir}"/etc/ + rm -r "${pkgdir}"/usr/{bin,sbin,include,man} } Deleted: lm_sensors-fancontrol.patch =================================================================== --- lm_sensors-fancontrol.patch 2021-02-18 13:15:15 UTC (rev 864114) +++ lm_sensors-fancontrol.patch 2021-02-18 13:19:28 UTC (rev 864115) @@ -1,29 +0,0 @@ ---- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200 -+++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200 -@@ -297,7 +297,7 @@ - cd $DIR - - # Check for configuration change --if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]] - then - echo "Configuration is too old, please run pwmconfig again" >&2 - exit 1 -@@ -337,7 +337,7 @@ - # It didn't work, try pwmN_enable=1 pwmN=255 - echo 1 > $ENABLE 2> /dev/null - echo $MAX > $1 -- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ] -+ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ] - then - # Success - return 0 -@@ -469,7 +469,7 @@ - else - # calculate the new value from temperature and settings - pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}" -- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ] -+ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ] - then # if fan was stopped start it using a safe value - echo $minsa > $pwmo - # Sleep while still handling signals