jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:voidlinux/xbps-packages

Browse source
This commit is contained in:
Juan RP 2014-07-17 19:46:15 +02:00
parent 420e58f846 0af1e3a4b2
commit 5896d34ed5
17 changed files with 305 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Manual.md
View file

@ -187,6 +187,12 @@ The optional 4th argument can be used to change the `file name`.
`$DESTDIR`. The optional 2nd argument can be used to change the
`file name`.
- *vconf()* `vconf <file> [<name>]`
Installs `file` into `etc` in the pkg
`$DESTDIR`. The optional 2nd argument can be used to change the
`file name`.
- *vsconf()* `vsconf <file> [<name>]`
Installs `file` into `usr/share/examples/<pkgname>` in the pkg

13
common/helpers/install.sh
View file

@ -13,7 +13,7 @@ _noglob_helper() {
}
# Apply _noglob to v* commands
for cmd in vinstall vcopy vmove vmkdir vbin vman vdoc vsconf vlicense; do
for cmd in vinstall vcopy vmove vmkdir vbin vman vdoc vconf vsconf vlicense; do
alias ${cmd}="set -f; _noglob_helper _${cmd}"
done
@ -67,6 +67,17 @@ _vdoc() {
vinstall "$file" 644 "usr/share/doc/${pkgname}" "$targetfile"
}
_vconf() {
local file="$1" targetfile="$2"
if [ $# -lt 1 ]; then
msg_red "$pkgver: vconf: 1 argument expected: <file>\n"
return 1
fi
vinstall "$file" 644 "etc/${pkgname}" "$targetfile"
}
_vsconf() {
local file="$1" targetfile="$2"

1
common/shlibs
View file

@ -1678,3 +1678,4 @@ libgrail.so.6 grail-3.1.0_1
libgeis.so.1 geis-2.2.16_1
libndp.so.0 libndp-1.3_1
libepoxy.so.0 libepoxy-1.2_1
libfakekey.so.0 libfakekey-0.1_1

36
srcpkgs/fingerprint-gui/template Normal file
View file

@ -0,0 +1,36 @@
# Template file for 'fingerprint-gui'
pkgname=fingerprint-gui
version=1.05
revision=1
make_dirs="/var/lib/fingerprint-gui 0755 root input
/var/upek_data 0750 root input"
hostmakedepends="qt-qmake"
makedepends="qt-devel qca-devel libfprint-devel libfakekey-devel polkit-qt-devel pam-devel"
depends="desktop-file-utils"
short_desc="Fingerprint management GUI"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="http://www.n-view.net/Appliance/fingerprint/index.php"
distfiles="http://ullrich-online.cc/nview/Appliance/fingerprint/download/${pkgname}-${version}.tar.gz"
checksum=4058ffa55de8ea346ae8747ec88828d2312656b3d8a54c57198b04e4032097db
do_build() {
sed -i 's/plugdev/input/g' \
upek/91-fingerprint-gui-upek.rules \
bin/fingerprint-helper/92-fingerprint-gui-uinput.rules
qmake LIBPOLKIT_QT=LIBPOLKIT_QT_1_1 PREFIX=/usr LIB=/usr/lib
make ${makejobs}
}
do_install() {
make INSTALL_ROOT=${DESTDIR}/ install
vdoc CHANGELOG
vconf upek/upek.cfg
vmkdir usr/lib/udev/rules.d
mv ${DESTDIR}/etc/udev/rules.d/* ${DESTDIR}/usr/lib/udev/rules.d
vinstall upek/91-fingerprint-gui-upek.rules 644 usr/lib/udev/rules.d
case "$XBPS_TARGET_MACHINE" in
i686*) vcopy "upek/lib/libbsapi.so.*" usr/lib;;
x86_64*) vcopy "upek/lib64/libbsapi.so.*" usr/lib;;
esac
}

12
srcpkgs/hdapsd/template Normal file
View file

@ -0,0 +1,12 @@
# Template file for 'hdapsd'
pkgname=hdapsd
version=20090401
revision=1
only_for_archs="i686 x86_64"
build_style=gnu-configure
short_desc="HDAPS userspace hard drive protection daemon"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="http://sourceforge.net/projects/hdaps/"
distfiles="${SOURCEFORGE_SITE}/hdaps/$pkgname-$version.tar.gz"
checksum=32979d58de4c54a7cc5671e7e7b4f0b653b659104faa9610433f8bb5dd4cef7a

1
srcpkgs/libfakekey-devel Symbolic link
View file

@ -0,0 +1 @@
libfakekey

25
srcpkgs/libfakekey/template Normal file
View file

@ -0,0 +1,25 @@
# Template file for 'libfakekey'
pkgname=libfakekey
version=0.1
revision=1
build_style=gnu-configure
make_build_args="AM_LDFLAGS=-lX11"
makedepends="libXtst-devel"
short_desc="X virtual keyboard library"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-3"
homepage="https://www.yoctoproject.org/tools-resources/projects/matchbox"
distfiles="http://downloads.yoctoproject.org/releases/matchbox/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194
libfakekey-devel_package() {
depends="${sourcepkg}>=${version}_${revision} libXtst-devel"
short_desc+=" -- development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
}
}

3
srcpkgs/lm-sensors/template
View file

@ -1,9 +1,10 @@
# Template file for 'lm-sensors'
pkgname=lm-sensors
version=3.3.4
revision=2
revision=3
wrksrc="lm_sensors-${version}"
hostmakedepends="which flex perl"
depends="perl"
conf_files="/etc/sensors3.conf"
short_desc="Utilities to read temperature/voltage/fan sensors"
maintainer="Juan RP <xtraeme@gmail.com>"

17
srcpkgs/pm-utils/patches/02-logging-append.patch Normal file
View file

@ -0,0 +1,17 @@
Author: James Westby <james.westby@ubuntu.com>
Description: Do not clear the log file on each operation, but instead append to it.
This makes debugging of several suspends much easier.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
Bug-Ubuntu: https://launchpad.net/bugs/410352
--- pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200
+++ pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200
@@ -271,7 +271,7 @@
return 1
fi
export LOGGING=true
- exec > "$1" 2>&1
+ exec >> "$1" 2>&1
}
check_suspend() { [ -n "$SUSPEND_MODULE" ]; }

38
srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch Normal file
View file

@ -0,0 +1,38 @@
From: Florian Kriener <florian@kriener.org>
To: submit@bugs.debian.org
Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug)
Date: Sat, 25 Sep 2010 11:27:30 +0200
In the script intel-audio-powersave is this loop
for dev in /sys/module/snd_*/parameters/power_save; do
[ -w "$dev/parameters/power_save" ] || continue
printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
I think it should be
for dev in /sys/module/snd_*; do
[ -w "$dev/parameters/power_save" ] || continue
printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
This fixes the two bugs.
--- pm/power.d/intel-audio-powersave
+++ pm/power.d/intel-audio-powersave
@@ -20,9 +20,9 @@ EOF
audio_powersave() {
[ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
- for dev in /sys/module/snd_*/parameters/power_save; do
+ for dev in /sys/module/snd_*; do
[ -w "$dev/parameters/power_save" ] || continue
- printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
+ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
done
}

41
srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch Normal file
View file

@ -0,0 +1,41 @@
From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 31 Jan 2011 15:30:01 +0100
Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused
The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't
synchronous, i. e. it doesn't wait until the module usage count actually drops
to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some
models/older kernels you need to do that to fix suspend problems), as at that
point the module is still in use.
On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to
unload, so use 100 ms wait steps with a timeout of 2 seconds.
Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759
Bug-Ubuntu: https://launchpad.net/bugs/698331
---
pm/sleep.d/49bluetooth | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
--- pm/sleep.d/49bluetooth
+++ pm/sleep.d/49bluetooth
@@ -12,6 +12,15 @@ suspend_bluetooth()
if grep -q enabled /proc/acpi/ibm/bluetooth; then
savestate ibm_bluetooth enable
echo disable > /proc/acpi/ibm/bluetooth
+
+ # wait for up to 2 seconds for the module to actually get
+ # unused
+ TIMEOUT=20
+ while [ $TIMEOUT -ge 0 ]; do
+ [ `cat /sys/module/btusb/refcnt` = 0 ] && break
+ TIMEOUT=$((TIMEOUT-1))
+ sleep 0.1
+ done
else
savestate ibm_bluetooth disable
fi
--
1.7.2.3

24
srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch Normal file
View file

@ -0,0 +1,24 @@
Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware.
Author: Martin Pitt <martin.pitt@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/539467
--- pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100
+++ pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100
@@ -2,7 +2,7 @@
. "${PM_FUNCTIONS}"
-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true}
+SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false}
help() {
cat <<EOF
@@ -16,7 +16,7 @@
This hook has 1 parameter:
SATA_ALPM_ENABLE = whether to use SATA ALPM on battery.
-Defaults to "true".
+Defaults to "false".
EOF
}

22
srcpkgs/pm-utils/template Normal file
View file

@ -0,0 +1,22 @@
# Template file for 'pm-utils'
pkgname=pm-utils
version=1.4.1
revision=1
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
make_dirs="/etc/pm/sleep.d 0755 root root
/etc/pm/power.d 0755 root root
/etc/pm/config.d 0755 root root"
hostmakedepends="xmlto"
depends="procps-ng"
short_desc="Power Management Utilities"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="http://pm-utils.freedesktop.org/"
distfiles="http://pm-utils.freedesktop.org/releases/${pkgname}-${version}.tar.gz"
checksum=8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4370c0b
post_install() {
rm "${DESTDIR}/usr/lib/pm-utils/sleep.d/55NetworkManager" \
"${DESTDIR}/usr/lib/pm-utils/power.d/"{harddrive,disable_wol}
}

1
srcpkgs/thinkfan/files/thinkpad_acpi.conf Normal file
View file

@ -0,0 +1 @@
options thinkpad_acpi fan_control=1

28
srcpkgs/thinkfan/template Normal file
View file

@ -0,0 +1,28 @@
# Template file for 'thinkfan'
pkgname=thinkfan
version=0.9.2
revision=1
wrksrc=${pkgname}-${version}
create_wrksrc=yes
build_style=cmake
configure_args="-DUSE_ATASMART:BOOL=ON"
hostmakedepends="cmake"
makedepends="libatasmart-devel"
short_desc="A simple fan control program"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-3"
homepage="http://thinkfan.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=90daa0f2db221e1d5085d7f25cb6c63608d174db2987478c340e9523e652af79
do_install() {
vbin build/thinkfan
vman thinkfan.1
vsconf examples/thinkfan.conf.simple
vsconf examples/thinkfan.conf.complex
vdoc README
vdoc NEWS
vmkdir usr/lib/modprobe.d
vinstall ${FILESDIR}/thinkpad_acpi.conf 644 usr/lib/modprobe.d
}

15
srcpkgs/tp_smapi-dkms/files/dkms.conf Normal file
View file

@ -0,0 +1,15 @@
PACKAGE_VERSION=0.41
PACKAGE_NAME="tp_smapi-dkms"
AUTOINSTALL="yes"
MAKE="make KVER=${kernelver} HDAPS=1"
CLEAN="make clean"
BUILT_MODULE_NAME[0]="hdaps"
DEST_MODULE_LOCATION[0]="/updates"
BUILT_MODULE_NAME[1]="thinkpad_ec"
DEST_MODULE_LOCATION[1]="/extra"
BUILT_MODULE_NAME[2]="tp_smapi"
DEST_MODULE_LOCATION[2]="/extra"

24
srcpkgs/tp_smapi-dkms/template Normal file
View file

@ -0,0 +1,24 @@
# Template file for 'tp_smapi-dkms'
pkgname=tp_smapi-dkms
version=0.41
revision=1
wrksrc=tp_smapi-master
only_for_archs="i686 x86_64"
short_desc="IBM ThinkPad hardware functions driver"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2"
homepage="http://www.thinkwiki.org/wiki/Tp_smapi"
distfiles="https://github.com/x539/tp_smapi/archive/master.tar.gz"
checksum=7e4519e4f3acb42d84f9cca1cbb070b4c69ef150277fb6511d2124f4033380ba
triggers="dkms"
dkms_modules="tp_smapi ${version}"
depends="dkms"
do_install() {
vmkdir usr/src/tp_smapi-${version}
vcopy "*.c" usr/src/tp_smapi-${version}
vcopy "*.h" usr/src/tp_smapi-${version}
vcopy Makefile usr/src/tp_smapi-${version}
vcopy ${FILESDIR}/dkms.conf usr/src/tp_smapi-${version}
}