From: Jan Rękorajski Date: Sun, 19 Apr 2015 11:28:00 +0000 (+0200) Subject: - fix building with linux 4.0 X-Git-Tag: auto/th/nvidiabl-0.87-6 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=f849b5852981c0b80bfa7ca0836ae332214e8fae;p=packages%2Fnvidiabl.git - fix building with linux 4.0 - rel 6 --- diff --git a/linux-4.0.patch b/linux-4.0.patch new file mode 100644 index 0000000..dd3c938 --- /dev/null +++ b/linux-4.0.patch @@ -0,0 +1,14 @@ +--- nvidiabl-0.87/nvidiabl-module.c~ 2015-04-19 13:27:17.493140224 +0200 ++++ nvidiabl-0.87/nvidiabl-module.c 2015-04-19 13:26:41.479808163 +0200 +@@ -214,7 +214,11 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) + + for (iii = 0 ; iii < sizeof(backlight_type_ids) ; iii++) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (strncasecmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { ++#else + if (strnicmp(bl_type, backlight_type_ids[iii].id, sizeof(bl_type)) == 0) { ++#endif + props.type = backlight_type_ids[iii].type; + printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id); + } diff --git a/nvidiabl.spec b/nvidiabl.spec index c17a8a7..e2549f0 100644 --- a/nvidiabl.spec +++ b/nvidiabl.spec @@ -19,7 +19,7 @@ exit 1 %define _duplicate_files_terminate_build 0 -%define rel 5 +%define rel 6 %define pname nvidiabl Summary: Linux driver for nVidia display back-lights Summary(pl.UTF-8): Sterownik dla Linuksa do podświetlania wyświetlacza dla kart firmy nVidia @@ -31,6 +31,7 @@ Group: Base/Kernel Source0: https://github.com/guillaumezin/nvidiabl/archive/v%{version}.tar.gz?/%{pname}-%{version}.tgz Source1: modprobe.conf Patch0: nvidiabl-dkmsconf.patch +Patch1: linux-4.0.patch # Source0-md5: e9418d3e500172d79680e44ad0f85743 URL: https://github.com/guillaumezin/nvidiabl BuildRequires: rpmbuild(macros) >= 1.701 @@ -145,6 +146,7 @@ zalecany.\ %prep %setup -qn %{pname}-%{version} %patch0 -p1 +%patch1 -p1 %build %{?with_kernel:%{expand:%build_kernel_packages}}