From a00bbbb2c01824e553d7ffb2bf6e287704cf87ba Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 17 Apr 2018 13:06:26 -0400 Subject: app-laptop/tp_smapi: new version 0.43. Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- app-laptop/tp_smapi/Manifest | 1 + .../files/linux-4.15-timer_setup-fix.patch | 43 ------------ app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild | 76 ---------------------- app-laptop/tp_smapi/tp_smapi-0.43.ebuild | 74 +++++++++++++++++++++ 4 files changed, 75 insertions(+), 119 deletions(-) delete mode 100644 app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch delete mode 100644 app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild create mode 100644 app-laptop/tp_smapi/tp_smapi-0.43.ebuild (limited to 'app-laptop/tp_smapi') diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest index 3da37c47df5f..d2f981db017d 100644 --- a/app-laptop/tp_smapi/Manifest +++ b/app-laptop/tp_smapi/Manifest @@ -1 +1,2 @@ DIST tp_smapi-0.42.tgz 39867 BLAKE2B 0f7285fe99766437d964780f3c9d88480a19ed07de155e1794b5c48f318846fbde4eb759e825af9f5da89fb20aee5e217f32e873a70c7d85f63e3a44b385b0f7 SHA512 1004b7ef961a9908c2144b26ea60b6dddabd83d60c11421a03e3b810f5b635415ef52656d6980915512d68f809f7bc3d662328f25d111537bd7e175d252cf83b +DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7 diff --git a/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch b/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch deleted file mode 100644 index 88c5580db181..000000000000 --- a/app-laptop/tp_smapi/files/linux-4.15-timer_setup-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 76c5120f7be4880cf2c6801f872327e4e70c449f Mon Sep 17 00:00:00 2001 -From: Jan Nordholz -Date: Mon, 4 Dec 2017 03:27:11 +0100 -Subject: [PATCH] Adapt HDAPS driver to use the new timer_setup() interface. - -Linux 4.15 removed the ancient init_timer() API and changed the signature -of the timer handler function. - -Signed-off-by: Jan Nordholz -Closes: #31 ---- - hdaps.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/hdaps.c b/hdaps.c -index 0763c3a..76930a3 100644 ---- a/hdaps.c -+++ b/hdaps.c -@@ -469,7 +469,11 @@ static void hdaps_calibrate(void) - /* Timer handler for updating the input device. Runs in softirq context, - * so avoid lenghty or blocking operations. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - static void hdaps_mousedev_poll(unsigned long unused) -+#else -+static void hdaps_mousedev_poll(struct timer_list *unused) -+#endif - { - int ret; - -@@ -779,8 +783,12 @@ static int __init hdaps_init(void) - hdaps_invert = 0; /* default */ - - /* Init timer before platform_driver_register, in case of suspend */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0) - init_timer(&hdaps_timer); - hdaps_timer.function = hdaps_mousedev_poll; -+#else -+ timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0); -+#endif - ret = platform_driver_register(&hdaps_driver); - if (ret) - goto out; diff --git a/app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild b/app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild deleted file mode 100644 index e09bd1f674de..000000000000 --- a/app-laptop/tp_smapi/tp_smapi-0.42-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic linux-mod - -DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" -HOMEPAGE="https://github.com/evgeni/${PN}" -SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="hdaps" - -# We need dmideode if the kernel does not support -# DMI_DEV_TYPE_OEM_STRING in dmi.h. -DEPEND="sys-apps/dmidecode" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/linux-4.15-timer_setup-fix.patch" ) - -# This code is factored out of both pkg_pretend() and pkg_setup() -# because the PMS states that ebuilds may not call phase functions -# directly (see the "List of functions" section). This was bug #596616 -# and #596622. -tp_smapi_pkg_pretend() { - linux-mod_pkg_setup - - MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)" - BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}" - BUILD_TARGETS="default" - - if use hdaps; then - CONFIG_CHECK="~INPUT_UINPUT" - WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better" - # Why call this twice? - linux-info_pkg_setup - - MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)" - BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1" - - CONFIG_CHECK="~!SENSORS_HDAPS" - ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)" - linux-info_pkg_setup - fi -} - -pkg_pretend() { - tp_smapi_pkg_pretend -} - -pkg_setup() { - # run again as pkg_pretend is not var safe - tp_smapi_pkg_pretend -} - -src_compile() { - # Kernel Makefiles may pull in -mpreferred-stack-boundary=3 - # which requires that SSE disabled or compilation will fail. - # So we need to ensure that appended user CLAGS do not re-enable SSE - # https://bugs.gentoo.org/show_bug.cgi?id=492964 - replace-flags '-msse*' '' - replace-flags '-mssse3' '' - - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - einstalldocs - newinitd "${FILESDIR}/${PN}-0.40-initd" smapi - newconfd "${FILESDIR}/${PN}-0.40-confd" smapi -} diff --git a/app-laptop/tp_smapi/tp_smapi-0.43.ebuild b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild new file mode 100644 index 000000000000..011865482566 --- /dev/null +++ b/app-laptop/tp_smapi/tp_smapi-0.43.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic linux-mod + +DESCRIPTION="IBM ThinkPad SMAPI BIOS driver" +HOMEPAGE="https://github.com/evgeni/${PN}" +SRC_URI="${HOMEPAGE}/releases/download/tp-smapi/${PV}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="hdaps" + +# We need dmideode if the kernel does not support +# DMI_DEV_TYPE_OEM_STRING in dmi.h. +DEPEND="sys-apps/dmidecode" +RDEPEND="${DEPEND}" + +# This code is factored out of both pkg_pretend() and pkg_setup() +# because the PMS states that ebuilds may not call phase functions +# directly (see the "List of functions" section). This was bug #596616 +# and #596622. +tp_smapi_pkg_pretend() { + linux-mod_pkg_setup + + MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)" + BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}" + BUILD_TARGETS="default" + + if use hdaps; then + CONFIG_CHECK="~INPUT_UINPUT" + WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better" + # Why call this twice? + linux-info_pkg_setup + + MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)" + BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1" + + CONFIG_CHECK="~!SENSORS_HDAPS" + ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)" + linux-info_pkg_setup + fi +} + +pkg_pretend() { + tp_smapi_pkg_pretend +} + +pkg_setup() { + # run again as pkg_pretend is not var safe + tp_smapi_pkg_pretend +} + +src_compile() { + # Kernel Makefiles may pull in -mpreferred-stack-boundary=3 + # which requires that SSE disabled or compilation will fail. + # So we need to ensure that appended user CLAGS do not re-enable SSE + # https://bugs.gentoo.org/show_bug.cgi?id=492964 + replace-flags '-msse*' '' + replace-flags '-mssse3' '' + + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + einstalldocs + newinitd "${FILESDIR}/${PN}-0.40-initd" smapi + newconfd "${FILESDIR}/${PN}-0.40-confd" smapi +} -- cgit v1.2.3-65-gdbad