Version 0.88-3 include nvidiablctl in package

3 files changed, 27 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c46f7eca68b6..a410f9bbb047 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidiabl
 	pkgdesc = Backlight driver for NVidia graphics adapters
 	pkgver = 0.88
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/guillaumezin/nvidiabl
 	install = nvidiabl.install
 	arch = x86_64
@@ -9,12 +9,12 @@ pkgbase = nvidiabl
 	license = GPL
 	makedepends = linux-headers
 	makedepends = unzip
-	optdepends = nvidiablctl: adjust backlight easily
 	conflicts = nvidia-bl
+	conflicts = nvidiablctl
 	source = https://github.com/guillaumezin/nvidiabl/archive/master.zip
-	source = nvidiabl-module.c.patch
+	source = nvidiabl-master.patch
 	md5sums = 5fdda33fedcb78320c1581e84b395d39
-	md5sums = 20fb3f129307b3c7289610c98b94520e
+	md5sums = 79e5699da970908d6ec8dba114df87cb
 
 pkgname = nvidiabl
 
diff --git a/PKGBUILD b/PKGBUILD
index 1a4586de1936..a37b120c915b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=nvidiabl
 pkgver=0.88
-pkgrel=2
+pkgrel=3
 pkgdesc="Backlight driver for NVidia graphics adapters"
 
 arch=('x86_64' 
@@ -15,29 +15,31 @@ license=('GPL')
 
 makedepends=('linux-headers'
              'unzip')
-optdepends=('nvidiablctl: adjust backlight easily')
-conflicts=(nvidia-bl)
+conflicts=('nvidia-bl' 'nvidiablctl')
 
 install=nvidiabl.install
 source=(https://github.com/guillaumezin/nvidiabl/archive/master.zip 
-        nvidiabl-module.c.patch)
+        nvidiabl-master.patch)
 md5sums=('5fdda33fedcb78320c1581e84b395d39'
-         '20fb3f129307b3c7289610c98b94520e')
+         '79e5699da970908d6ec8dba114df87cb')
 
 prepare() {
-  cd "$srcdir/nvidiabl-master/"
-  patch -p1 -i $srcdir/nvidiabl-module.c.patch
+  cd "${srcdir}/nvidiabl-master/"
+  patch -p1 -i "${srcdir}/nvidiabl-master.patch"
 }
 
 build() {
-  cd "$srcdir/nvidiabl-master/"
+  cd "${srcdir}/nvidiabl-master/"
   make
 }
 
 package() {
-  cd "$srcdir/nvidiabl-master/"
+  cd "${srcdir}/nvidiabl-master/"
   _extramodules="extramodules-$(uname -r | cut -f-2 -d'.')-$(uname -r|sed -e 's/.*-//g')"
   _MODPATH="${pkgdir}/usr/lib/modules/${_extramodules}/"
-  install -d $_MODPATH
-  install -m 644 -c nvidiabl.ko _$MODPATH
+  install -d "${_MODPATH}"
+  install -d "${pkgdir}/usr/bin/"
+
+  install -m 644 "${srcdir}/nvidiabl-master/nvidiabl.ko" "${_MODPATH}"
+  install -m 644 scripts/usr/local/sbin/nvidiablctl "${pkgdir}/usr/bin/"
 }
diff --git a/nvidiabl-module.c.patch b/nvidiabl-master.patch
index c417c1d39d36..e12143017ff6 100644
--- a/nvidiabl-module.c.patch
+++ b/nvidiabl-master.patch
@@ -1,6 +1,6 @@
 diff -aur nvidiabl-master.source/nvidiabl-module.c nvidiabl-master.patch/nvidiabl-module.c
 --- nvidiabl-master.source/nvidiabl-module.c	2014-04-08 07:16:19.000000000 +1000
-+++ nvidiabl-master.patch/nvidiabl-module.c	2015-05-22 18:13:50.407373072 +1000
++++ nvidiabl-master.patch/nvidiabl-module.c	2015-06-10 17:57:51.575688758 +1000
 @@ -214,7 +214,7 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
  	
@@ -10,3 +10,12 @@ diff -aur nvidiabl-master.source/nvidiabl-module.c nvidiabl-master.patch/nvidiab
  			props.type = backlight_type_ids[iii].type;
  			printk(KERN_INFO "nvidiabl: backlight type is %s\n", backlight_type_ids[iii].id);
  		}
+diff -aur nvidiabl-master.source/scripts/usr/local/sbin/nvidiablctl nvidiabl-master.patch/scripts/usr/local/sbin/nvidiablctl
+--- nvidiabl-master.source/scripts/usr/local/sbin/nvidiablctl	2014-04-08 07:16:19.000000000 +1000
++++ nvidiabl-master.patch/scripts/usr/local/sbin/nvidiablctl	2015-06-10 17:58:58.903272233 +1000
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! /usr/bin/bash
+ #
+ # nvidiablctl v0.2
+ #