updated orocos toolchain

2 files changed, 27 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3068b930cefb..a2be8492c57c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = orocos-ocl
-	pkgdesc = OROCOS Components for Control
-	pkgver = 1.10.2
+	pkgdesc = Open Robot Control Software is a tool to create real-time robotics applications using modular, run-time configurable software components (Orocos Component Library)
+	pkgver = 2.5.0
 	pkgrel = 1
-	url = http://www.orocos.org/ocl
+	url = http://www.orocos.org/rtt
 	arch = i686
 	arch = x86_64
+	groups = orocos-toolchain
 	license = GPL
 	makedepends = cmake
 	depends = orocos-rtt
-	depends = orocos-bfl
-	depends = orocos-kdl
-	source = http://people.mech.kuleuven.be/~orocos/pub/stable/ocl/v1.10.2/orocos-ocl-1.10.2-src.tar.bz2
-	md5sums = 6965c4b010beedbe591eb80f0d003ae2
+	depends = orocos-log4cpp
+	source = http://www.orocos.org/stable/toolchain/v2.5.0/orocos-toolchain-2.5.0-src.tar.bz2
+	md5sums = cb817efca78ae5659a3ca62a741e43bf
 
 pkgname = orocos-ocl
 
diff --git a/PKGBUILD b/PKGBUILD
index 0dde2fd6b237..bf7562864a6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,37 @@
 # Maintainer: Sven Schneider <archlinux.sandmann@googlemail.com>
 
 pkgname=orocos-ocl
-pkgver=1.10.2
+_pkgname=orocos-toolchain
+pkgver=2.5.0
 pkgrel=1
-pkgdesc="OROCOS Components for Control"
+pkgdesc="Open Robot Control Software is a tool to create real-time robotics applications using modular, run-time configurable software components (Orocos Component Library)"
 arch=('i686' 'x86_64')
-url="http://www.orocos.org/ocl"
+url="http://www.orocos.org/rtt"
 license=('GPL')
-depends=('orocos-rtt' 'orocos-bfl' 'orocos-kdl')
+groups=('orocos-toolchain')
+depends=('orocos-rtt' 'orocos-log4cpp')
 makedepends=('cmake')
-source=(http://people.mech.kuleuven.be/~orocos/pub/stable/ocl/v${pkgver}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('6965c4b010beedbe591eb80f0d003ae2')
+source=(http://www.orocos.org/stable/toolchain/v${pkgver}/${_pkgname}-${pkgver}-src.tar.bz2)
+md5sums=('cb817efca78ae5659a3ca62a741e43bf')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	# build ocl
+	cd "${srcdir}/${_pkgname}-${pkgver}/ocl"
+	
+	# this is a bit hacky: finding the orocos version of log4cpp with cmake does
+	# not work so we need to provide the complete information from here
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		-DLOG4CPP_INCLUDE_DIRS=/usr/include/orocos \
+		-DLOG4CPP_LIBRARIES=orocos-log4cpp \
+		-DLOG4CPP_LIBRARY_DIRS=/usr/lib \
+		-DLOG4CPP_LIBRARY=/usr/lib/liborocos-log4cpp.so .
 	
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .
 	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	
+	# install ocl
+	cd "${srcdir}/${_pkgname}-${pkgver}/ocl"
 	make DESTDIR=${pkgdir} install
 }