xf86-input-cmt: install from prebuilt .deb package

 * Use .deb package from upstream maintainer's ppa
 * This is not a -git package

4 files changed, 59 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb7e0707d05a..07c5295d46f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,27 @@
 pkgbase = xf86-input-cmt
 	pkgdesc = Chromium OS multitouch input driver for Xorg X server
-	pkgver = 2.0.3
-	pkgrel = 9
+	pkgver = 2.0.5
+	pkgrel = 1
 	url = https://github.com/hugegreenbug/xf86-input-cmt
 	install = xf86-input-cmt.install
 	arch = i686
 	arch = x86_64
 	license = custom:chromiumos
-	makedepends = autoconf
-	makedepends = automake
-	makedepends = dmidecode
-	makedepends = git
-	makedepends = xorg-util-macros
-	makedepends = xorg-server-devel
 	depends = xf86-input-evdev
+	depends = xf86-input-cmt-setup
 	depends = libgestures
 	depends = libevdev
 	depends = libevdevc
-	provides = xf86-input-cmt=2.0.3
+	provides = xf86-input-cmt=2.0.5
 	conflicts = xf86-input-synaptics
-	source = xf86-input-cmt::git+https://github.com/hugegreenbug/xf86-input-cmt.git
-	md5sums = SKIP
+	options = !emptydirs
+	options = !strip
+	source = ChromiumOS_Licence.txt
+	md5sums = af314be4bf04a749665a07203b120f54
+	source_i686 = xf86-input-cmt_2.0.5-1ubuntu1_i386.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/xf86-input-cmt_2.0.5-1ubuntu1_i386.deb
+	md5sums_i686 = e5477e04e3922c21be92ee1086fec440
+	source_x86_64 = xf86-input-cmt_2.0.5-1ubuntu1_amd64.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/xf86-input-cmt_2.0.5-1ubuntu1_amd64.deb
+	md5sums_x86_64 = ea4cf785d988ccfc0957fd9423bbb779
 
 pkgname = xf86-input-cmt
 
diff --git a/ChromiumOS_Licence.txt b/ChromiumOS_Licence.txt
new file mode 100644
index 000000000000..69b485551f00
--- /dev/null
+++ b/ChromiumOS_Licence.txt
@@ -0,0 +1,27 @@
+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/PKGBUILD b/PKGBUILD
index 8d244fe13df1..5ef426df0a65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,43 +3,27 @@
 
 pkgname=xf86-input-cmt
 pkgdesc="Chromium OS multitouch input driver for Xorg X server"
-pkgver=2.0.3
-pkgrel=9
+pkgver=2.0.5
+pkgrel=1
 arch=(i686 x86_64)
 url="https://github.com/hugegreenbug/xf86-input-cmt"
 license=('custom:chromiumos')
-_gitname='xf86-input-cmt'
-depends=('xf86-input-evdev' 'libgestures' 'libevdev' 'libevdevc')
+depends=('xf86-input-evdev' 'xf86-input-cmt-setup' 'libgestures' 'libevdev' 'libevdevc')
 provides=("xf86-input-cmt=$pkgver")
 conflicts=('xf86-input-synaptics')
-makedepends=('autoconf' 'automake' 'dmidecode' 'git' 'xorg-util-macros' 'xorg-server-devel')
 install=${pkgname}.install
+options=('!emptydirs' '!strip')
 
-source=("$_gitname::git+https://github.com/hugegreenbug/xf86-input-cmt.git")
+source=('ChromiumOS_Licence.txt')
+source_x86_64=('xf86-input-cmt_2.0.5-1ubuntu1_amd64.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/xf86-input-cmt_2.0.5-1ubuntu1_amd64.deb')
+source_i686=('xf86-input-cmt_2.0.5-1ubuntu1_i386.deb::https://launchpad.net/~hugegreenbug/+archive/ubuntu/cmt2/+files/xf86-input-cmt_2.0.5-1ubuntu1_i386.deb')
 
-md5sums=('SKIP')
-
-prepare() {
-  cd "$srcdir/$_gitname"
-  sh apply_patches.sh
-}
-
-build() {
-  cd "$srcdir/$_gitname"
-
-  sh autogen.sh
-  ./configure --prefix=/usr
-  make
-}
+md5sums=('af314be4bf04a749665a07203b120f54')
+md5sums_x86_64=('ea4cf785d988ccfc0957fd9423bbb779')
+md5sums_i686=('e5477e04e3922c21be92ee1086fec440')
 
 package() {
-  make -C "$srcdir/$_gitname" DESTDIR="$pkgdir/" install
-
-  mkdir -p $pkgdir/usr/share/xf86-input-cmt/
-  cp -R $srcdir/$_gitname/xorg-conf/*  $pkgdir/usr/share/xf86-input-cmt/
-  cp -R $srcdir/$_gitname/README.md $pkgdir/usr/share/xf86-input-cmt/README
-
-  install -m 644 -D ${srcdir}/${_gitname}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  libtool --finish /usr/lib/xorg/modules/input
+  echo "Extracting package..." 
+  bsdtar -xf data.tar.xz -C "$pkgdir/"
+  install -Dm644 ChromiumOS_Licence.txt "$pkgdir"/usr/share/licenses/xf86-input-cmt/LICENCE   
 }
diff --git a/xf86-input-cmt.install b/xf86-input-cmt.install
index 9c531922404c..17ec9bc5eace 100644
--- a/xf86-input-cmt.install
+++ b/xf86-input-cmt.install
@@ -12,14 +12,13 @@ blue="${blue}$(tput setaf 4)"
 yellow="${bold}$(tput setaf 3)"
 
 post_install(){
-  curl https://raw.githubusercontent.com/joebonrichie/xf86-input-cmt-conf/master/cmt-post-install.sh | sudo sh
-  note "IMPORTANT:"
-  note "After reboot, if the touchpad does not work for any reason, run:"
-  note "# usermod -a -G input <user>"
-  note "and reboot"
-  note "Thanks to templrivanho for the fix.\n"
-
-  msg_blue "Finished"
+  msg_blue "To install the correct configuration files"
+  msg_blue "for your device, run:"
+  msg_blue "# cmt-post-install install"
+  msg_blue "To make sure you can use the cmt driver also run:"
+  msg_blue "# usermod -a -G input <user>"
+  msg_blue "Where <user> is the user(s) wanting to use the touchpad."
+  note "Finished, reboot to use the driver."
 }
 
 post_upgrade() {