From 00d7d1f1b8496cfe48fa7c41070309304b1ae75d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 22 Nov 2011 00:07:29 -0500
Subject: Move openni-{primesenseor,sensorkinect} to openni-module-*

---
 ~lukeshu/openni-module-primesensor-git/PKGBUILD    | 65 ++++++++++++++++++
 ~lukeshu/openni-module-sensorkinect-git/PKGBUILD   | 78 ++++++++++++++++++++++
 .../sensorkinect.install                           | 15 +++++
 ~lukeshu/openni-primesensor-git/PKGBUILD           | 65 ------------------
 ~lukeshu/openni-sensorkinect-git/PKGBUILD          | 65 ------------------
 .../openni-sensorkinect-git/sensorkinect.install   | 15 -----
 6 files changed, 158 insertions(+), 145 deletions(-)
 create mode 100644 ~lukeshu/openni-module-primesensor-git/PKGBUILD
 create mode 100644 ~lukeshu/openni-module-sensorkinect-git/PKGBUILD
 create mode 100644 ~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
 delete mode 100644 ~lukeshu/openni-primesensor-git/PKGBUILD
 delete mode 100644 ~lukeshu/openni-sensorkinect-git/PKGBUILD
 delete mode 100644 ~lukeshu/openni-sensorkinect-git/sensorkinect.install

diff --git a/~lukeshu/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-module-primesensor-git/PKGBUILD
new file mode 100644
index 0000000..0ebfac2
--- /dev/null
+++ b/~lukeshu/openni-module-primesensor-git/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: pallegro from the AUR
+
+_pkgname=openni-module-primesensor
+pkgname=${_pkgname}-git
+pkgver=20111115
+pkgrel=1
+pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
+arch=('i686')
+url="http://www.primesense.com/"
+license=('GPL')
+depends=('openni')
+makedepends=('git')
+provides=($_pkgname)
+conflicts=($_pkgname)
+install="sensorkinect.install"
+source=()
+md5sums=()
+
+_gitroot="https://github.com/PrimeSense/Sensor.git"
+_gitname="primesensor"
+_gitbranch="unstable"
+#_gitbranch="master"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone -b $_gitbranch $_gitroot $_gitname
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd $srcdir/$_gitname-build
+
+  # BUILD
+  cd Platform/Linux-x86/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
+  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
+  install -d -m755 ${pkgdir}/etc/udev/rules.d
+  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
+
+  cd $srcdir/$_gitname-build/Data
+  install -d -m755 ${pkgdir}/etc/primesense
+  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
+
+  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
+}
diff --git a/~lukeshu/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
new file mode 100644
index 0000000..8c9b645
--- /dev/null
+++ b/~lukeshu/openni-module-sensorkinect-git/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: pallegro from the AUR
+
+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-unstable')
+makedepends=('git')
+provides=($_pkgname)
+conflicts=('openni-primesensor')
+install="sensorkinect.install"
+source=()
+md5sums=()
+
+_gitroot="https://github.com/avin2/SensorKinect.git"
+_gitname="sensorkinect"
+#_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 checkout master
+    git pull origin
+    msg "The local files are updated."
+  else
+    git clone ${_gitroot} ${_gitname}
+    cd ${_gitname}
+  fi
+  git checkout ${_gitbranch}
+  cd ..
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd $srcdir/$_gitname-build
+
+  # 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/${_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/${_platform}/Install
+  install -d -m755 ${pkgdir}/etc/udev/rules.d
+  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
+
+  cd $srcdir/$_gitname-build/Data
+  install -d -m755 ${pkgdir}/etc/primesense
+  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
+
+  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
+}
diff --git a/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
new file mode 100644
index 0000000..0928e3d
--- /dev/null
+++ b/~lukeshu/openni-module-sensorkinect-git/sensorkinect.install
@@ -0,0 +1,15 @@
+post_install() {
+	MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
+	for module in $MODULES
+	do 
+		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
+	done
+}
+
+pre_remove() {
+	MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
+	for module in $MODULES
+	do 
+		/usr/bin/niReg -u /usr/lib/$module
+	done
+}
diff --git a/~lukeshu/openni-primesensor-git/PKGBUILD b/~lukeshu/openni-primesensor-git/PKGBUILD
deleted file mode 100644
index 81491b4..0000000
--- a/~lukeshu/openni-primesensor-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-primesensor
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device"
-arch=('i686')
-url="http://www.primesense.com/"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=($_pkgname)
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/PrimeSense/Sensor.git"
-_gitname="primesensor"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/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
-  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
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-sensorkinect-git/PKGBUILD b/~lukeshu/openni-sensorkinect-git/PKGBUILD
deleted file mode 100644
index d6c6eee..0000000
--- a/~lukeshu/openni-sensorkinect-git/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: pallegro from the AUR
-
-_pkgname=openni-sensorkinect
-pkgname=${_pkgname}-git
-pkgver=20111115
-pkgrel=1
-pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device"
-arch=('i686')
-url="https://github.com/avin2/SensorKinect"
-license=('GPL')
-depends=('openni')
-makedepends=('git')
-provides=($_pkgname)
-conflicts=("$_pkgname" 'openni-primesenser')
-install="sensorkinect.install"
-source=()
-md5sums=()
-
-_gitroot="https://github.com/avin2/SensorKinect.git"
-_gitname="sensorkinect"
-_gitbranch="unstable"
-#_gitbranch="master"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone -b $_gitbranch $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd $srcdir/$_gitname-build
-
-  # BUILD
-  cd Platform/Linux-x86/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
-  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
-  install -d -m755 ${pkgdir}/etc/udev/rules.d
-  install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d
-
-  cd $srcdir/$_gitname-build/Data
-  install -d -m755 ${pkgdir}/etc/primesense
-  install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense
-
-  install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer 
-}
diff --git a/~lukeshu/openni-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-sensorkinect-git/sensorkinect.install
deleted file mode 100644
index 0928e3d..0000000
--- a/~lukeshu/openni-sensorkinect-git/sensorkinect.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg -r /usr/lib/$module /etc/primesense
-	done
-}
-
-pre_remove() {
-	MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so"
-	for module in $MODULES
-	do 
-		/usr/bin/niReg -u /usr/lib/$module
-	done
-}
-- 
cgit v1.2.3