summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Nagel2018-02-27 15:33:48 +0100
committerGeorg Nagel2018-02-27 15:33:48 +0100
commit5ca517f000eb25eef1b30b5385cc39c430fcf1a4 (patch)
tree434c583667c21f0c37b7e89f1a079f8ca432da8d
parent98d4aa07dcadb586bcda4a7ca0430e99e6d0217e (diff)
downloadaur-5ca517f000eb25eef1b30b5385cc39c430fcf1a4.tar.gz
moved to python3
some cleanup
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD33
2 files changed, 25 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d055e2a153a4..f6b769eff5de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ola-git
pkgdesc = The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux
- pkgver = 0.9.8.r571.g3028d51
+ pkgver = 0.10.6.r1195.g79c4fd762
pkgrel = 1
url = https://www.openlighting.org/ola/
arch = i686
@@ -11,8 +11,6 @@ pkgbase = ola-git
depends = libmicrohttpd
depends = cppunit
depends = protobuf
- depends = python2-protobuf
- depends = python2
optdepends = liblo
optdepends = avahi
optdepends = libusb
@@ -21,6 +19,8 @@ pkgbase = ola-git
optdepends = openslp
optdepends = flex
optdepends = bison
+ optdepends = python
+ optdepends = python-protobuf
provides = ola
conflicts = ola
source = git+https://github.com/OpenLightingProject/ola.git
diff --git a/PKGBUILD b/PKGBUILD
index 5b316b36e09a..648c09b0dfde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,48 @@
# Maintainer: Georg Nagel <g.schlmm at gmail dot com>
pkgname=ola-git
-pkgver=0.9.8.r571.g3028d51
+pkgver=0.10.6.r1195.g79c4fd762
pkgrel=1
+
+python="python"
+# uncomment for python2 libs
+# python="python2"
+
pkgdesc="The Open Lighting Architecture (OLA) provides a plugin framework for distributing DMX512 control signals on Mac and Linux"
arch=('i686' 'x86_64')
url="https://www.openlighting.org/ola/"
license=('LGPL2.1' 'GPL2')
-provides=('ola')
+
makedepends=('git')
-depends=('libmicrohttpd' 'cppunit' 'protobuf' 'python2-protobuf' 'python2')
-optdepends=('liblo' 'avahi' 'libusb' 'libusb-compat' 'libftdi-compat' 'openslp' 'flex' 'bison')
+depends=('libmicrohttpd' 'cppunit' 'protobuf')
+optdepends=('liblo' 'avahi' 'libusb' 'libusb-compat' 'libftdi-compat' 'openslp' 'flex' 'bison' "${python}" "${python}-protobuf")
+
+provides=('ola')
conflicts=('ola')
+
source=("git+https://github.com/OpenLightingProject/ola.git")
-# uncomment for 0.10.0
-#source=("git+https://github.com/OpenLightingProject/ola.git#tag=0.10.0")
+# uncomment for 0.10.6
+# source=("git+https://github.com/OpenLightingProject/ola.git#tag=0.10.6")
sha256sums=('SKIP')
_gitname="ola"
pkgver() {
- cd "${srcdir}/${_gitname}"
+ cd $_gitname
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "${srcdir}/${_gitname}"
+ cd $_gitname
autoreconf -i
- # since protobuf isnt ported to python 3 we have to choose python 2
- PYTHON=python2 ./configure --prefix=/usr --enable-python-libs --disable-unittests --disable-fatal-warnings
+ PYTHON=$python ./configure \
+ --prefix=/usr \
+ --enable-python-libs \
+ --disable-unittests
make
}
package() {
- make -C "${srcdir}/${_gitname}" DESTDIR="${pkgdir}" install
+ cd $_gitname
+ make DESTDIR="${pkgdir}" install
}