summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-26 22:40:43 +0000
committerDaniel Bermond2018-10-26 22:59:29 +0000
commit9d295a679d1ab971a64a055ab5b8193b87c66d00 (patch)
tree442e489c2d9c949bad5d0c29a390a220a472e4a5
parentf310aebe0e341434cb8686ade1335caa06ee895f (diff)
downloadaur-9d295a679d1ab971a64a055ab5b8193b87c66d00.tar.gz
Cosmetic changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD35
-rw-r--r--openni.install20
3 files changed, 28 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 39658fe9f60..227ac866939 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Sep 24 17:29:17 UTC 2017
pkgbase = openni
pkgdesc = Framework for sensor-based Natural Interaction
pkgver = 1.5.7.10
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/OpenNI/OpenNI/
install = openni.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 0c0d3b83140..0dc12259f9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer : Daniel Bermond < gmail-com: danielbermond >
# Contributor: Benjamin Chretien <chretien at lirmm dot fr>
# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
# Contributor: bugix
@@ -6,7 +6,7 @@
pkgname=openni
pkgver=1.5.7.10
-pkgrel=5
+pkgrel=6
pkgdesc='Framework for sensor-based Natural Interaction'
arch=('i686' 'x86_64')
url='https://github.com/OpenNI/OpenNI/'
@@ -60,39 +60,34 @@ build() {
}
package() {
- if [ "$CARCH" = 'x86_64' ]
- then
- _architecture='x64'
-
- elif [ "$CARCH" = 'i686' ]
- then
- _architecture='x86'
- fi
+ [ "$CARCH" = 'x86_64' ] && local _architecture='x64'
+ [ "$CARCH" = 'i686' ] && local _architecture='x86'
# directories creation
- mkdir -p "${pkgdir}/usr/"{bin,include/ni/{Linux-Arm,Linux-x86}}
- mkdir -p "${pkgdir}/usr/"{lib/pkgconfig,share/{doc/"${pkgname}",licenses/"${pkgname}"}}
- mkdir -p "${pkgdir}/etc/openni" # config (populated at build time)
- mkdir -p "${pkgdir}/var/lib/ni" # config (populated at install time)
+ mkdir -p "${pkgdir}/usr/include/ni/"{Linux-Arm,Linux-x86}
+ mkdir -p "${pkgdir}/usr/"{lib,share/doc/"${pkgname}"}
# binaries and libraries
cd "${_srcprefix}-${pkgver}/Platform/Linux/Bin/${_architecture}-Release"
- install -D -m755 niLicense niReg NiViewer "${pkgdir}/usr/bin"
+ install -D -m755 niLicense niReg NiViewer -t "${pkgdir}/usr/bin"
install -D -m755 *.so "${pkgdir}/usr/lib"
- # includes
+ # headers
cd "${srcdir}/${_srcprefix}-${pkgver}/Include"
install -D -m644 *.h "${pkgdir}/usr/include/ni"
install -D -m644 Linux-Arm/* "${pkgdir}/usr/include/ni/Linux-Arm"
install -D -m644 Linux-x86/* "${pkgdir}/usr/include/ni/Linux-x86"
# config
+ ## /etc/openni is populated at build time
+ ## /var/lib/ni is populated at install time
cd "${srcdir}/${_srcprefix}-${pkgver}/Data"
- install -D -m644 SamplesConfig.xml "${pkgdir}/etc/openni"
+ install -D -m644 SamplesConfig.xml -t "${pkgdir}/etc/openni"
+ mkdir -p "${pkgdir}/var/lib/ni"
# pkg-config file
cd "$srcdir"
- install -D -m644 libopenni.pc "${pkgdir}/usr/lib/pkgconfig"
+ install -D -m644 libopenni.pc -t "${pkgdir}/usr/lib/pkgconfig"
# documentation
cd "${_srcprefix}-${pkgver}/Documentation"
@@ -100,6 +95,6 @@ package() {
# license
cd "${srcdir}/${_srcprefix}-${pkgver}"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"
- install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -D -m644 NOTICE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
diff --git a/openni.install b/openni.install
index 3ef4704430a..b568d093eec 100644
--- a/openni.install
+++ b/openni.install
@@ -1,13 +1,17 @@
post_install() {
- MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
- for module in $MODULES
- do
- /usr/bin/niReg /usr/lib/$module
- done
-
- echo "Don't forget to install a hardware driver such as openni-primesense-sensor or sensorkinect"
+ local _module
+ local _MODULES
+
+ _MODULES='libnimMockNodes.so libnimCodecs.so libnimRecorder.so'
+
+ for _module in $_MODULES
+ do
+ /usr/bin/niReg "/usr/lib/${module}"
+ done
+
+ printf '%s\n' "Don't forget to install a hardware driver such as openni-primesense-sensor or sensorkinect"
}
pre_remove() {
- rm /var/lib/ni/modules.xml
+ rm /var/lib/ni/modules.xml
}