From 423e97df503aa577e16b66db1cc54479088f0fe9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Nov 2011 22:28:24 -0500 Subject: use the -git suffix for packages in openni-git --- ~lukeshu/openni-git/PKGBUILD | 99 ++++++++++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 36 deletions(-) diff --git a/~lukeshu/openni-git/PKGBUILD b/~lukeshu/openni-git/PKGBUILD index 6a384ae..95d2052 100644 --- a/~lukeshu/openni-git/PKGBUILD +++ b/~lukeshu/openni-git/PKGBUILD @@ -3,24 +3,26 @@ # Contributor: bugix # Contributor: Lubosz Sarnecki +# unfortunately we can't use $_suf in function names, but sed makes it ok +_suf='-git' pkgname=( - openni - openni-docs + openni$_suf + openni$_suf-docs - openni-core - openni-core-samples - openni-core-samples-source + openni$_suf-core + openni$_suf-core-samples + openni$_suf-core-samples-source - openni-mono - openni-mono-samples - openni-mono-samples-source + openni$_suf-mono + openni$_suf-mono-samples + openni$_suf-mono-samples-source - openni-java - openni-java-samples - openni-java-samples-source + openni$_suf-java + openni$_suf-java-samples + openni$_suf-java-samples-source ) pkgver=20111121 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.openni.org/" license=('GPL') @@ -48,7 +50,7 @@ build() { if [ -d ${_gitname} ] ; then cd ${_gitname} - git checkout ${_gitbranch} + git checkout master git pull origin msg "The local files are updated." else @@ -90,25 +92,31 @@ abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp } -package_openni() { +package_openni-git() { pkgdesc="Open Natural Interface framework" - depends=('openni-core') - optdepends=('openni-docs: programmer documentation') + depends=("openni$_suf-core") + optdepends=("openni$_suf-docs: programmer documentation") + provides=('openni') + conflicts=('openni') } -package_openni-docs() { +package_openni-git-docs() { pkgdesc="OpenNI programmer documentation" arch=('any') + provides=('openni-docs') + conflicts=('openni-docs') cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" install -d "${pkgdir}/usr/share/openni" cp -r html "${pkgdir}/usr/share/openni" } -package_openni-core() { +package_openni-git-core() { pkgdesc="OpenNI core libraries" depends=('libusb' 'freeglut') install="openni.install" + provides=('openni-core') + conflicts=('openni-core') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" @@ -135,9 +143,11 @@ package_openni-core() { cp -r Common "${pkgdir}/usr/share/common" } -package_openni-java() { +package_openni-git-java() { pkgdesc="OpenNI java wrapper" - depends=('openni' 'java-environment') + depends=("openni$_suf" 'java-environment') + provides=('openni-java') + conflicts=('openni-java') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" @@ -148,9 +158,11 @@ package_openni-java() { install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" } -package_openni-mono() { +package_openni-git-mono() { pkgdesc="OpenNI mono wrapper" - depends=('openni' 'mono') + depends=("openni$_suf" 'mono') + provides=('openni-mono') + conflicts=('openni-mono') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" @@ -180,10 +192,12 @@ CORE_SAMPLES=' MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' -package_openni-core-samples() { +package_openni-git-core-samples() { pkgdesc="OpenNI sample programs" - depends=('openni-core') + depends=("openni$_suf-core") optdepends=('openni-core-samples-source: source code for the samples') + provides=('openni-core-samples') + conflicts=('openni-core-samples') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" install -d "${pkgdir}/usr/bin" @@ -192,9 +206,12 @@ package_openni-core-samples() { install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" done } -package_openni-core-samples-source() { +package_openni-git-core-samples-source() { pkgdesc="OpenNI sample programs source code" - depends=('openni-core') + 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 @@ -202,11 +219,13 @@ package_openni-core-samples-source() { done } -package_openni-java-samples() { +package_openni-git-java-samples() { pkgdesc="OpenNI java wrapper sample programs" - depends=('openni-java') - optdepends=('openni-java-samples-source: source code for the samples') + depends=("openni$_suf-java") + optdepends=("openni$_suf-java-samples-source: source code for the samples") arch=('any') + provides=('openni-java-samples') + conflicts=('openni-java-samples') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" install -d "${pkgdir}/usr/bin" @@ -219,9 +238,12 @@ java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" done } -package_openni-java-samples-source() { +package_openni-git-java-samples-source() { pkgdesc="OpenNI java wrapper sample programs source code" - depends=('openni-java') + 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 @@ -229,10 +251,12 @@ package_openni-java-samples-source() { done } -package_openni-mono-samples() { +package_openni-git-mono-samples() { pkgdesc="OpenNI java wrapper sample programs" - depends=('openni-mono') - optdepends=('openni-mono-samples-source: source code for the samples') + depends=("openni$_suf-mono") + optdepends=("openni$_suf-mono-samples-source: source code for the samples") + provides=('openni-mono-samples') + conflicts=('openni-mono-samples') cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" install -d "${pkgdir}/usr/bin" @@ -246,9 +270,12 @@ mono $sample.net.exe $@ chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" done } -package_openni-mono-samples-source() { +package_openni-git-mono-samples-source() { pkgdesc="OpenNI mono wrapper sample programs source code" - depends=('openni-mono') + 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 -- cgit v1.2.3