summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Saurel2017-04-05 14:59:23 +0200
committerGuilhem Saurel2017-04-05 14:59:23 +0200
commitdaebaef86605f4f9bac76514565c6934e8189b5d (patch)
treeee7f01afb27f664a1f3eb711282e0b7d64d00f28
parent8441340bf1f36ec08eb6f10249948afa5fd6d662 (diff)
downloadaur-daebaef86605f4f9bac76514565c6934e8189b5d.tar.gz
v1
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD47
-rw-r--r--soname.patch40
3 files changed, 22 insertions, 82 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43867d8fce5..b9689adb84a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
-# Generated by mksrcinfo v8
-# Sat Dec 26 17:46:40 UTC 2015
pkgbase = urdfdom
pkgdesc = The URDF (U-Robot Description Format) library provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
- pkgver = 0.3.0
- pkgrel = 8
+ pkgver = 1.0.0
+ pkgrel = 1
url = https://github.com/ros/urdfdom
- arch = any
+ arch = i686
+ arch = x86_64
license = BSD
- makedepends = git
makedepends = cmake
- depends = boost
depends = tinyxml
depends = console-bridge
depends = urdfdom-headers
- source = urdfdom::git+https://github.com/ros/urdfdom.git#tag=0.3.0
- source = soname.patch
- md5sums = SKIP
- md5sums = ec2aeff2e5cc0d4dba6010bf7a33e81a
+ source = https://github.com/ros/urdfdom/archive/1.0.0.tar.gz
+ md5sums = f51d7214d74470503447f28344d4e561
pkgname = urdfdom
diff --git a/PKGBUILD b/PKGBUILD
index dc9d82e5a5e..0da297e23ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,25 @@
-# Maintainer: Benjamin Chretien <chretien at lirmm dot fr>
+# Initial Contribution: Benjamin Chretien <chretien at lirmm dot fr>
+# Maintainer: Guilhem Saurel <gsaurel at laas dot fr>
+
pkgname=urdfdom
-pkgver=0.3.0
-pkgrel=8
+pkgver=1.0.0
+pkgrel=1
pkgdesc="The URDF (U-Robot Description Format) library provides core data structures and a simple XML parsers for populating the class data structures from an URDF file."
-arch=('any')
-url="https://github.com/ros/urdfdom"
+arch=('i686' 'x86_64')
+url="https://github.com/ros/$pkgname"
license=('BSD')
-depends=( 'boost' 'tinyxml' 'console-bridge' 'urdfdom-headers')
-makedepends=('git' 'cmake')
-
-_gitroot=https://github.com/ros
-_gitrepo=urdfdom
-
-_tag=${pkgver}
-_dir=${_gitrepo}
-source=("${_dir}"::"git+${_gitroot}/${_gitrepo}.git"#tag=${_tag}
- "soname.patch")
-md5sums=('SKIP'
- 'ec2aeff2e5cc0d4dba6010bf7a33e81a')
+depends=('tinyxml' 'console-bridge' 'urdfdom-headers')
+makedepends=('cmake')
+source=("https://github.com/ros/$pkgname/archive/$pkgver.tar.gz")
+md5sums=('f51d7214d74470503447f28344d4e561')
build() {
- cd ${srcdir}/${_dir}
- patch -p1 -i ${srcdir}/soname.patch
-
- # Create build directory
- rm -rf ${srcdir}/build && mkdir -p ${srcdir}/build
- cd ${srcdir}/build
-
- # Build project
- cmake ${srcdir}/${_dir} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX="/usr"
- make
+ cd "$pkgname-$pkgver"
+ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib .
+ make
}
package() {
- cd ${srcdir}/build
- make DESTDIR="$pkgdir/" install
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/soname.patch b/soname.patch
deleted file mode 100644
index 33c376b5cea..00000000000
--- a/soname.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e35d6f6156c6aa04ab6639ec57f49616b12b731a Mon Sep 17 00:00:00 2001
-From: Jose Luis Rivero <jrivero@osrfoundation.org>
-Date: Mon, 24 Mar 2014 21:34:46 +0100
-Subject: [PATCH] Fix soname versions
-
----
- urdf_parser/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
-index cd23331..7ce2429 100644
---- a/urdf_parser/CMakeLists.txt
-+++ b/urdf_parser/CMakeLists.txt
-@@ -2,19 +2,19 @@ include_directories(include)
-
- add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp)
- target_link_libraries(urdfdom_world ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
--set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.2)
-+set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.3)
-
- add_library(urdfdom_model SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp)
- target_link_libraries(urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
--set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.2)
-+set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.3)
-
- add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
- target_link_libraries(urdfdom_sensor urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
--set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.2)
-+set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.3)
-
- add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
- target_link_libraries(urdfdom_model_state ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
--set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.2)
-+set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.3)
-
- # --------------------------------
-
---
-1.9.3
-