Move openni-{primesenseor,sensorkinect} to openni-module-*

3 files changed, 28 insertions, 15 deletions

diff --git a/~lukeshu/openni-primesensor-git/PKGBUILD b/~lukeshu/openni-module-primesensor-git/PKGBUILD
index 81491b481..0ebfac2e5 100644
--- a/~lukeshu/openni-primesensor-git/PKGBUILD
+++ b/~lukeshu/openni-module-primesensor-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: pallegro from the AUR
 
-_pkgname=openni-primesensor
+_pkgname=openni-module-primesensor
 pkgname=${_pkgname}-git
 pkgver=20111115
 pkgrel=1
diff --git a/~lukeshu/openni-sensorkinect-git/PKGBUILD b/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
index d6c6eeee2..8c9b64571 100644
--- a/~lukeshu/openni-sensorkinect-git/PKGBUILD
+++ b/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
@@ -1,37 +1,50 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: pallegro from the AUR
 
-_pkgname=openni-sensorkinect
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
+pkgname=openni-module-sensorkinect
+pkgver=20111121
+pkgrel=2
 pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
 arch=('i686')
 url="https://github.com/avin2/SensorKinect"
 license=('GPL')
-depends=('openni')
+depends=('openni-unstable')
 makedepends=('git')
 provides=($_pkgname)
-conflicts=("$_pkgname" 'openni-primesenser')
+conflicts=('openni-primesensor')
 install="sensorkinect.install"
 source=()
 md5sums=()
 
 _gitroot="https://github.com/avin2/SensorKinect.git"
 _gitname="sensorkinect"
-_gitbranch="unstable"
-#_gitbranch="master"
+#_gitbranch="unstable"
+_gitbranch="master"
+
+_os='Linux'
+case "${CARCH}" in
+'x86_64') _arch=x86;;
+'i686')   _arch=x86;;
+'arm')    _arch=Arm;; # untested
+*)        _arch=UNSUPPORTED_ARCH;;
+esac
+_platform="${_os}-${_arch}"
 
 build() {
   cd "$srcdir"
   msg "Connecting to GIT server...."
 
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
+  if [ -d ${_gitname} ] ; then
+    cd ${_gitname}
+    git checkout master
+    git pull origin
     msg "The local files are updated."
   else
-    git clone -b $_gitbranch $_gitroot $_gitname
+    git clone ${_gitroot} ${_gitname}
+    cd ${_gitname}
   fi
+  git checkout ${_gitbranch}
+  cd ..
 
   msg "GIT checkout done or server timeout"
   msg "Starting make..."
@@ -41,19 +54,19 @@ build() {
   cd $srcdir/$_gitname-build
 
   # BUILD
-  cd Platform/Linux-x86/Build
+  cd Platform/${_platform}/Build
   make NI_CONF_DIR=/etc || return 1
 }
 
 package() {
   install -d -m755 ${pkgdir}/usr/{lib,bin}
 
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release
+  cd $srcdir/$_gitname-build/Platform/${_platform}/Bin/Release
   install XnSensorServer ${pkgdir}/usr/bin
   install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib
   chmod +s ${pkgdir}/usr/bin/XnSensorServer
 
-  cd $srcdir/$_gitname-build/Platform/Linux-x86/Install
+  cd $srcdir/$_gitname-build/Platform/${_platform}/Install
   install -d -m755 ${pkgdir}/etc/udev/rules.d
   install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
 
diff --git a/~lukeshu/openni-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
index 0928e3dd9..0928e3dd9 100644
--- a/~lukeshu/openni-sensorkinect-git/sensorkinect.install
+++ b/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install