summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoenke2019-12-13 01:41:32 +0100
committersoenke2019-12-13 01:41:32 +0100
commitfc9abc744338a7090917d86e27472fcf42d53c78 (patch)
tree09ac8e825fea01afac431d13bc41c86a7ef818a7
parentc254009aa858223971c4ea3bded5f20390ea44cb (diff)
downloadaur-mrpt.tar.gz
updated to 1.5.8 and added patches if boath opencv and opencv2-opt are installed
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--opencv_and_opencv2-opt.patch21
-rw-r--r--prevent_gtk3_linking.patch35
4 files changed, 73 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d58ea4e721c..c8b017b91ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mrpt
pkgdesc = Provides an extensive set of libraries, algorithms, and applications employed in a number of mobile robotics research areas.
- pkgver = 1.5.6
+ pkgver = 1.5.8
pkgrel = 1
url = http://www.mrpt.org
install = mrpt.install
@@ -22,12 +22,16 @@ pkgbase = mrpt
optdepends = libusb: Kinect support
optdepends = pcl
optdepends = assimp
- source = mrpt-1.5.6::git+https://github.com/MRPT/mrpt.git#tag=1.5.6
+ source = mrpt-1.5.8::git+https://github.com/MRPT/mrpt.git#tag=1.5.8
source = https://raw.githubusercontent.com/majorx234/mrpt_patch/master/mrpt_CmakeLists.patch
source = https://raw.githubusercontent.com/majorx234/FindNumPy.cmake/master/FindNumPy.cmake
+ source = opencv_and_opencv2-opt.patch
+ source = prevent_gtk3_linking.patch
sha256sums = SKIP
sha256sums = ec4f93431c098ef2515f6bb10358cb17dd3c804ebb295285792ad62f0826ab32
sha256sums = e8cbe6841595d594659d9a16464af2386efd0dce2947e8f348e2c47fad1d022f
+ sha256sums = SKIP
+ sha256sums = SKIP
pkgname = mrpt
diff --git a/PKGBUILD b/PKGBUILD
index 3b3183d0e0b..3b03a8029b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=mrpt
-pkgver=1.5.6
+pkgver=1.5.8
pkgrel=1
pkgdesc="Provides an extensive set of libraries, algorithms, and applications employed in a number of mobile robotics research areas."
arch=('i686' 'x86_64' 'armv7h')
@@ -16,15 +16,22 @@ _dir=${pkgname}-${pkgver}
_tag=${pkgver}
source=("${_dir}"::"git+https://github.com/MRPT/mrpt.git"#tag=${_tag}
"https://raw.githubusercontent.com/majorx234/mrpt_patch/master/mrpt_CmakeLists.patch"
- "https://raw.githubusercontent.com/majorx234/FindNumPy.cmake/master/FindNumPy.cmake")
+ "https://raw.githubusercontent.com/majorx234/FindNumPy.cmake/master/FindNumPy.cmake"
+ "opencv_and_opencv2-opt.patch"
+ "prevent_gtk3_linking.patch")
+
sha256sums=('SKIP'
'ec4f93431c098ef2515f6bb10358cb17dd3c804ebb295285792ad62f0826ab32'
- 'e8cbe6841595d594659d9a16464af2386efd0dce2947e8f348e2c47fad1d022f')
-
+ 'e8cbe6841595d594659d9a16464af2386efd0dce2947e8f348e2c47fad1d022f'
+ 'SKIP'
+ 'SKIP')
+
prepare() {
cp ${srcdir}/FindNumPy.cmake ${srcdir}/$pkgname-$pkgver/cmakemodules/
cd "${srcdir}/$pkgname-$pkgver"
patch -Np1 -i "${srcdir}/mrpt_CmakeLists.patch"
+ patch -Np1 -i "${srcdir}/opencv_and_opencv2-opt.patch"
+ patch -Np1 -i "${srcdir}/prevent_gtk3_linking.patch"
}
build() {
diff --git a/opencv_and_opencv2-opt.patch b/opencv_and_opencv2-opt.patch
new file mode 100644
index 00000000000..912986b6d70
--- /dev/null
+++ b/opencv_and_opencv2-opt.patch
@@ -0,0 +1,21 @@
+--- a/cmakemodules/script_opencv.cmake
++++ b/cmakemodules/script_opencv.cmake
+@@ -11,7 +11,7 @@
+ # Use CMAKE module if opencv's not been detected yet:
+ IF(NOT CMAKE_MRPT_HAS_OPENCV)
+ # 1st: Try to find OpenCV config file (NO_MODULE: Don't find a module, but OpenCVConfig.cmake):
+- FIND_PACKAGE(OpenCV QUIET NO_MODULE)
++ FIND_PACKAGE(OpenCV 2 QUIET NO_MODULE)
+ IF(OpenCV_FOUND)
+ SET(MRPT_OPENCV_VERSION ${OpenCV_VERSION})
+ SET(OpenCV_LIBRARIES ${OpenCV_LIBS})
+@@ -48,7 +48,7 @@
+
+ IF(NOT CMAKE_MRPT_HAS_OPENCV)
+ # 3rd: OK, let's use the module:
+- FIND_PACKAGE(OpenCV)
++ FIND_PACKAGE(OpenCV 2)
+ IF(OpenCV_FOUND)
+ # MRPT_OPENCV_VERSION
+ IF($ENV{VERBOSE})
+
diff --git a/prevent_gtk3_linking.patch b/prevent_gtk3_linking.patch
new file mode 100644
index 00000000000..d99d3b000ad
--- /dev/null
+++ b/prevent_gtk3_linking.patch
@@ -0,0 +1,35 @@
+--- a/cmakemodules/script_wxwidgets.cmake
++++ b/cmakemodules/script_wxwidgets.cmake
+@@ -17,20 +17,20 @@
+ ENDIF(UNIX)
+
+ # Select wx toolkit options, like GTK2 vs GTK3, etc.
+ if(UNIX)
+ # If available, prefer gtk3:
+- execute_process(
+- COMMAND wx-config --selected-config --toolkit=gtk3
+- RESULT_VARIABLE ret
+- OUTPUT_QUIET
+- )
+- if(ret EQUAL "0")
+- message(STATUS "wxWidgets: Found gtk3 version, using it.")
+- set(wxWidgets_CONFIG_OPTIONS_DEFAULT "--toolkit=gtk3")
+- else()
+- message(STATUS "wxWidgets: No gtk3 version found, falling back to default (likely gtk2)")
+- endif()
+- unset(ret)
++# execute_process(
++# COMMAND wx-config --selected-config --toolkit=gtk3
++# RESULT_VARIABLE ret
++# OUTPUT_QUIET
++# )
++# if(ret EQUAL "0")
++# message(STATUS "wxWidgets: Found gtk3 version, using it.")
++# set(wxWidgets_CONFIG_OPTIONS_DEFAULT "--toolkit=gtk3")
++# else()
++# message(STATUS "wxWidgets: No gtk3 version found, falling back to default (likely gtk2)")
++# endif()
++# unset(ret)
+
+ set(wxWidgets_CONFIG_OPTIONS "${wxWidgets_CONFIG_OPTIONS_DEFAULT}" ON STRING "wxWidgets toolkit options")
+ endif()