Update!

2 files changed, 93 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1403fb53e563..96ce9fc01e46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,33 +7,33 @@ pkgbase = ros-melodic-tf2-ros
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-rosgraph
-	makedepends = ros-melodic-std-msgs
+	makedepends = ros-melodic-message-filters
 	makedepends = ros-melodic-actionlib-msgs
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-xmlrpcpp
 	makedepends = ros-melodic-tf2-py
-	makedepends = ros-melodic-tf2-msgs
-	makedepends = ros-melodic-actionlib
-	makedepends = ros-melodic-message-filters
+	makedepends = ros-melodic-rosgraph
+	makedepends = ros-melodic-xmlrpcpp
+	makedepends = ros-melodic-geometry-msgs
 	makedepends = ros-melodic-catkin
 	makedepends = ros-melodic-rospy
+	makedepends = ros-melodic-roscpp
+	makedepends = ros-melodic-actionlib
+	makedepends = ros-melodic-tf2-msgs
 	makedepends = ros-melodic-tf2
-	makedepends = ros-melodic-geometry-msgs
-	depends = ros-melodic-rosgraph
-	depends = ros-melodic-std-msgs
+	makedepends = ros-melodic-std-msgs
+	depends = ros-melodic-message-filters
 	depends = ros-melodic-actionlib-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-xmlrpcpp
 	depends = ros-melodic-tf2-py
-	depends = ros-melodic-tf2-msgs
-	depends = ros-melodic-actionlib
-	depends = ros-melodic-message-filters
+	depends = ros-melodic-rosgraph
+	depends = ros-melodic-xmlrpcpp
+	depends = ros-melodic-geometry-msgs
 	depends = ros-melodic-rospy
+	depends = ros-melodic-roscpp
+	depends = ros-melodic-actionlib
+	depends = ros-melodic-tf2-msgs
 	depends = ros-melodic-tf2
-	depends = ros-melodic-geometry-msgs
-	source = ros-melodic-tf2-ros-0.6.3-0.tar.gz::https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_ros/0.6.3-0.tar.gz
-	sha256sums = a92f3b3c050dd41cf658a5f1c0630aa834a888f7f696f25241682319c4ab35b9
+	depends = ros-melodic-std-msgs
+	source = ros-melodic-tf2-ros::git+https://github.com/ros-gbp/geometry2-release.git
+	sha256sums = SKIP
 
 pkgname = ros-melodic-tf2-ros
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f715e1ee778..9f2dab00920f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
 pkgdesc="ROS - This package contains the ROS bindings for the tf2 library, for both Python and C++."
 url='http://www.ros.org/wiki/tf2_ros'
 
@@ -10,73 +10,88 @@ arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-rosgraph
-  ros-melodic-std-msgs
-  ros-melodic-actionlib-msgs
-  ros-melodic-roscpp
-  ros-melodic-xmlrpcpp
-  ros-melodic-tf2-py
-  ros-melodic-tf2-msgs
-  ros-melodic-actionlib
-  ros-melodic-message-filters
-  ros-melodic-catkin
-  ros-melodic-rospy
-  ros-melodic-tf2
-  ros-melodic-geometry-msgs)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
+ros_makedepends=(
+	ros-melodic-message-filters
+	ros-melodic-actionlib-msgs
+	ros-melodic-tf2-py
+	ros-melodic-rosgraph
+	ros-melodic-xmlrpcpp
+	ros-melodic-geometry-msgs
+	ros-melodic-catkin
+	ros-melodic-rospy
+	ros-melodic-roscpp
+	ros-melodic-actionlib
+	ros-melodic-tf2-msgs
+	ros-melodic-tf2
+	ros-melodic-std-msgs
+)
 
-ros_depends=(ros-melodic-rosgraph
-  ros-melodic-std-msgs
-  ros-melodic-actionlib-msgs
-  ros-melodic-roscpp
-  ros-melodic-xmlrpcpp
-  ros-melodic-tf2-py
-  ros-melodic-tf2-msgs
-  ros-melodic-actionlib
-  ros-melodic-message-filters
-  ros-melodic-rospy
-  ros-melodic-tf2
-  ros-melodic-geometry-msgs)
-depends=(${ros_depends[@]})
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/tf2_ros/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/geometry2-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-message-filters
+	ros-melodic-actionlib-msgs
+	ros-melodic-tf2-py
+	ros-melodic-rosgraph
+	ros-melodic-xmlrpcpp
+	ros-melodic-geometry-msgs
+	ros-melodic-rospy
+	ros-melodic-roscpp
+	ros-melodic-actionlib
+	ros-melodic-tf2-msgs
+	ros-melodic-tf2
+	ros-melodic-std-msgs
+)
 
-# Tarball version (faster download)
-_dir="geometry2-release-release-melodic-tf2_ros-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/geometry2-release/archive/release/melodic/tf2_ros/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('a92f3b3c050dd41cf658a5f1c0630aa834a888f7f696f25241682319c4ab35b9')
+depends=(
+	${ros_depends[@]}
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/geometry2-release.git")
+sha256sums=('SKIP')
+
+prepare() {
+	cd ${srcdir}/${_dir}
+	git checkout upstream
+	_pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
+
+	if [ -d ${_pkgname} ]; then
+		git subtree split -P ${_pkgname} --branch ${_pkgname}
+		git checkout ${_pkgname}
+	fi
+}
 
 build() {
-  # Use ROS environment variables
-  source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	# Use ROS environment variables.
+	source /usr/share/ros-build-tools/clear-ros-env.sh
+	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
 
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+	# Create the build directory.
+	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+	cd ${srcdir}/build
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+	# Fix Python2/Python3 conflicts.
+	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
-  # Build project
-  cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+	# Build the project.
+	cmake ${srcdir}/${_dir} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
+		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
+		-DPYTHON_BASENAME=.cpython-37m \
+		-DSETUPTOOLS_DEB_LAYOUT=OFF
+	make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}/" install
 }