Update!

2 files changed, 149 insertions, 135 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bc5277bcb71..0360e449d4eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,74 +1,74 @@
 pkgbase = ros-melodic-rviz
 	pkgdesc = ROS - 3D visualization tool for ROS.
 	pkgver = 1.13.1
-	pkgrel = 3
+	pkgrel = 1
 	url = http://ros.org/wiki/rviz
 	arch = any
 	license = BSD, Creative Commons
 	makedepends = cmake
 	makedepends = ros-build-tools
+	makedepends = ros-melodic-cmake-modules
+	makedepends = ros-melodic-rospy
+	makedepends = ros-melodic-roscpp
 	makedepends = ros-melodic-map-msgs
-	makedepends = ros-melodic-roslib
-	makedepends = ros-melodic-catkin
+	makedepends = ros-melodic-interactive-markers
 	makedepends = ros-melodic-std-srvs
-	makedepends = ros-melodic-rosconsole
-	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-laser-geometry
-	makedepends = ros-melodic-pluginlib
+	makedepends = ros-melodic-catkin
 	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-visualization-msgs
-	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-image-transport
-	makedepends = ros-melodic-rosbag
 	makedepends = ros-melodic-urdf
+	makedepends = ros-melodic-rosbag
+	makedepends = ros-melodic-roslib
+	makedepends = ros-melodic-rosconsole
 	makedepends = ros-melodic-nav-msgs
-	makedepends = ros-melodic-sensor-msgs
+	makedepends = ros-melodic-image-transport
+	makedepends = ros-melodic-tf
+	makedepends = ros-melodic-laser-geometry
 	makedepends = ros-melodic-resource-retriever
-	makedepends = ros-melodic-interactive-markers
-	makedepends = ros-melodic-roscpp
+	makedepends = ros-melodic-std-msgs
+	makedepends = ros-melodic-sensor-msgs
 	makedepends = ros-melodic-message-filters
+	makedepends = ros-melodic-visualization-msgs
+	makedepends = ros-melodic-pluginlib
 	makedepends = ros-melodic-python-qt-binding
-	makedepends = ros-melodic-rospy
+	makedepends = yaml-cpp
+	makedepends = mesa
 	makedepends = qt5-base
-	makedepends = tinyxml2
-	makedepends = ogre
 	makedepends = urdfdom-headers
 	makedepends = assimp
+	makedepends = ogre-1.9
 	makedepends = eigen3
-	makedepends = mesa
-	makedepends = yaml-cpp
+	makedepends = tinyxml2
+	depends = ros-melodic-rospy
+	depends = ros-melodic-roscpp
 	depends = ros-melodic-map-msgs
-	depends = ros-melodic-roslib
+	depends = ros-melodic-interactive-markers
 	depends = ros-melodic-std-srvs
-	depends = ros-melodic-rosconsole
-	depends = ros-melodic-tf
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-laser-geometry
-	depends = ros-melodic-pluginlib
 	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-visualization-msgs
-	depends = ros-melodic-media-export
-	depends = ros-melodic-image-transport
-	depends = ros-melodic-rosbag
 	depends = ros-melodic-urdf
+	depends = ros-melodic-rosbag
+	depends = ros-melodic-roslib
+	depends = ros-melodic-rosconsole
 	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-sensor-msgs
+	depends = ros-melodic-image-transport
+	depends = ros-melodic-tf
+	depends = ros-melodic-laser-geometry
 	depends = ros-melodic-resource-retriever
-	depends = ros-melodic-interactive-markers
-	depends = ros-melodic-roscpp
+	depends = ros-melodic-std-msgs
+	depends = ros-melodic-sensor-msgs
 	depends = ros-melodic-message-filters
+	depends = ros-melodic-visualization-msgs
+	depends = ros-melodic-pluginlib
+	depends = ros-melodic-media-export
 	depends = ros-melodic-python-qt-binding
-	depends = ros-melodic-rospy
+	depends = yaml-cpp
+	depends = mesa
 	depends = qt5-base
-	depends = tinyxml2
-	depends = ogre
 	depends = urdfdom-headers
 	depends = assimp
+	depends = ogre-1.9
 	depends = eigen3
-	depends = mesa
-	depends = yaml-cpp
-	source = ros-melodic-rviz::git+https://github.com/fizyr-forks/rviz.git#branch=ogre1.11
+	depends = tinyxml2
+	source = ros-melodic-rviz::git+https://github.com/ros-gbp/rviz-release.git
 	sha256sums = SKIP
 
 pkgname = ros-melodic-rviz
diff --git a/PKGBUILD b/PKGBUILD
index 21dbf5a649ca..a0d994daa6da 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 - 3D visualization tool for ROS."
 url='http://ros.org/wiki/rviz'
 
@@ -7,113 +7,127 @@ pkgname='ros-melodic-rviz'
 pkgver='1.13.1'
 _pkgver_patch=0
 arch=('any')
-pkgrel=3
+pkgrel=1
 license=('BSD, Creative Commons')
 
-ros_makedepends=(ros-melodic-map-msgs
-  ros-melodic-roslib
-  ros-melodic-catkin
-  ros-melodic-std-srvs
-  ros-melodic-rosconsole
-  ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-laser-geometry
-  ros-melodic-pluginlib
-  ros-melodic-geometry-msgs
-  ros-melodic-visualization-msgs
-  ros-melodic-cmake-modules
-  ros-melodic-image-transport
-  ros-melodic-rosbag
-  ros-melodic-urdf
-  ros-melodic-nav-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-resource-retriever
-  ros-melodic-interactive-markers
-  ros-melodic-roscpp
-  ros-melodic-message-filters
-  ros-melodic-python-qt-binding
-  ros-melodic-rospy)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  qt5-base
-  tinyxml2
-  ogre
-  urdfdom-headers
-  assimp
-  eigen3
-  mesa
-  yaml-cpp)
+ros_makedepends=(
+	ros-melodic-cmake-modules
+	ros-melodic-rospy
+	ros-melodic-roscpp
+	ros-melodic-map-msgs
+	ros-melodic-interactive-markers
+	ros-melodic-std-srvs
+	ros-melodic-catkin
+	ros-melodic-geometry-msgs
+	ros-melodic-urdf
+	ros-melodic-rosbag
+	ros-melodic-roslib
+	ros-melodic-rosconsole
+	ros-melodic-nav-msgs
+	ros-melodic-image-transport
+	ros-melodic-tf
+	ros-melodic-laser-geometry
+	ros-melodic-resource-retriever
+	ros-melodic-std-msgs
+	ros-melodic-sensor-msgs
+	ros-melodic-message-filters
+	ros-melodic-visualization-msgs
+	ros-melodic-pluginlib
+	ros-melodic-python-qt-binding
+)
 
-ros_depends=(ros-melodic-map-msgs
-  ros-melodic-roslib
-  ros-melodic-std-srvs
-  ros-melodic-rosconsole
-  ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-laser-geometry
-  ros-melodic-pluginlib
-  ros-melodic-geometry-msgs
-  ros-melodic-visualization-msgs
-  ros-melodic-media-export
-  ros-melodic-image-transport
-  ros-melodic-rosbag
-  ros-melodic-urdf
-  ros-melodic-nav-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-resource-retriever
-  ros-melodic-interactive-markers
-  ros-melodic-roscpp
-  ros-melodic-message-filters
-  ros-melodic-python-qt-binding
-  ros-melodic-rospy)
-depends=(${ros_depends[@]}
-  qt5-base
-  tinyxml2
-  ogre
-  urdfdom-headers
-  assimp
-  eigen3
-  mesa
-  yaml-cpp)
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+	yaml-cpp
+	mesa
+	qt5-base
+	urdfdom-headers
+	assimp
+	ogre-1.9
+	eigen3
+	tinyxml2
+)
+
+ros_depends=(
+	ros-melodic-rospy
+	ros-melodic-roscpp
+	ros-melodic-map-msgs
+	ros-melodic-interactive-markers
+	ros-melodic-std-srvs
+	ros-melodic-geometry-msgs
+	ros-melodic-urdf
+	ros-melodic-rosbag
+	ros-melodic-roslib
+	ros-melodic-rosconsole
+	ros-melodic-nav-msgs
+	ros-melodic-image-transport
+	ros-melodic-tf
+	ros-melodic-laser-geometry
+	ros-melodic-resource-retriever
+	ros-melodic-std-msgs
+	ros-melodic-sensor-msgs
+	ros-melodic-message-filters
+	ros-melodic-visualization-msgs
+	ros-melodic-pluginlib
+	ros-melodic-media-export
+	ros-melodic-python-qt-binding
+)
+
+depends=(
+	${ros_depends[@]}
+	yaml-cpp
+	mesa
+	qt5-base
+	urdfdom-headers
+	assimp
+	ogre-1.9
+	eigen3
+	tinyxml2
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/rviz/${pkgver}-${_pkgver_patch}
 _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/rviz-release.git"#tag=${_tag})
-source=("${_dir}"::"git+https://github.com/fizyr-forks/rviz.git#branch=ogre1.11")
+source=("${_dir}"::"git+https://github.com/ros-gbp/rviz-release.git")
 sha256sums=('SKIP')
 
-# Tarball version (faster download)
-# _dir="rviz-release-release-melodic-rviz-${pkgver}-${_pkgver_patch}"
-# source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/melodic/rviz/${pkgver}-${_pkgver_patch}.tar.gz")
-# sha256sums=('2c457a91f490ceb954760c23f8cc8d8edab3089cae59fa3b335191d96802ae0d')
+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
 }