Merge branch 'master' of ssh://gparabola/abslibre

1 files changed, 31 insertions, 24 deletions

diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD
index 32020d726..19d1575a1 100644
--- a/~lukeshu/openni-unstable/PKGBUILD
+++ b/~lukeshu/openni-unstable/PKGBUILD
@@ -21,24 +21,23 @@ pkgname=(
     openni$_suf-java-samples
     openni$_suf-java-samples-source
     )
-pkgver=1.3.4.6
-pkgrel=4
+pkgver=1.4.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openni.org/"
 license=('GPL')
 makedepends=('git' 'doxygen' 'graphviz')
+options+=('!strip')
 source=()
 md5sums=()
 
 __gitroot="git://github.com/OpenNI/OpenNI.git"
 _gitname="openni"
-#_gitbranch="unstable"
-#_gitbranch="master"
 _gitbranch="Unstable-$pkgver"
 
 _os='Linux'
 case "${CARCH}" in
-'x86_64') _arch=x86;;
+'x86_64') _arch=x64;;
 'i686')   _arch=x86;;
 'arm')    _arch=Arm;; # untested
 *)        _arch=UNSUPPORTED_ARCH;;
@@ -51,27 +50,32 @@ build() {
   cd "${srcdir}"
   msg "Connecting to GIT server...."
 
-  if [ -d ${_gitname} ] ; then
+  #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 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..."
+  msg "Starting build..."
 
-  rm -rf "${srcdir}/${_gitname}-build"
-  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
+  #rm -rf "${srcdir}/${_gitname}-build"
+  #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
   cd "${srcdir}/${_gitname}-build"
 
   # PATCH
   sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker"
+
+  for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do
+      echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile"
+  done
+
   echo '
 abs_core: $(ALL_MODULES) $(ALL_UTILS)
 abs_core_samples: $(CORE_SAMPLES)
@@ -87,7 +91,9 @@ abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES)
   make -j1 \
       abs_core abs_core_samples \
       abs_java abs_java_samples \
-      abs_mono abs_mono_samples || return 1
+      abs_mono abs_mono_samples
+  cd "../Bin/${_arch}-Release"
+  ln NiViewer Sample-NiViewer
 
   cd '../../../Source/DoxyGen'
   mkdir html
@@ -117,7 +123,7 @@ package_openni-unstable-docs() {
 package_openni-unstable-core() {
   pkgdesc="OpenNI core libraries"
   depends=('libusb' 'freeglut')
-  install="openni.install"
+  install="openni-core.install"
   provides=('openni-core')
   conflicts=('openni-core')
 
@@ -144,6 +150,8 @@ package_openni-unstable-core() {
   cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build"
   install -d "${pkgdir}/usr/share"
   cp -r Common "${pkgdir}/usr/share/common"
+
+  install -d "${pkgdir}/var/lib/ni"
 }
 
 package_openni-unstable-java() {
@@ -164,6 +172,7 @@ package_openni-unstable-java() {
 package_openni-unstable-mono() {
   pkgdesc="OpenNI mono wrapper"
   depends=("openni$_suf" 'mono')
+  install="openni-mono.install"
   provides=('openni-mono')
   conflicts=('openni-mono')
 
@@ -183,14 +192,16 @@ _install_sample_source() {
   install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample"
 }
 
-# Leave out NiViewer, it's set up wrong
 CORE_SAMPLES='
   AudioSample
   BackRecorder
   CRead
   ConvertXToONI
+  HandTracker
   RecordSynthetic
   SimpleCreate
+  UserSelection
+  Viewer
               SimpleRead SimpleViewer UserTracker'
 MONO_SAMPLES='SimpleRead SimpleViewer UserTracker'
 JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker'
@@ -204,9 +215,8 @@ package_openni-unstable-core-samples() {
 
   cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release"
   install -d "${pkgdir}/usr/bin"
-  install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer"
   for sample in $CORE_SAMPLES; do
-    install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
+    install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample"
   done
 }
 package_openni-unstable-core-samples-source() {
@@ -214,7 +224,6 @@ package_openni-unstable-core-samples-source() {
   depends=("openni$_suf-core")
   provides=('openni-core-samples-source')
   conflicts=('openni-core-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in Viewer $CORE_SAMPLES; do
@@ -246,7 +255,6 @@ package_openni-unstable-java-samples-source() {
   depends=("openni$_suf-java")
   provides=('openni-java-samples-source')
   conflicts=('openni-java-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in $JAVA_SAMPLES; do
@@ -278,7 +286,6 @@ package_openni-unstable-mono-samples-source() {
   depends=("openni$_suf-mono")
   provides=('openni-mono-samples-source')
   conflicts=('openni-mono-samples-source')
-  options+=('!strip')
 
   cd "${srcdir}/${_gitname}-build"
   for sample in $MONO_SAMPLES; do