summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2018-11-24 17:35:32 +0100
committerhaawda2018-11-24 17:35:32 +0100
commit8bfa18bba2b71608bf31544bf2896302e5c71a48 (patch)
treeaa76598f3eb9c7f960310aa3e7ea291694d8c797
parent0a28d170c57e9ba8526ffc469aacaa11a941126b (diff)
downloadaur-8bfa18bba2b71608bf31544bf2896302e5c71a48.tar.gz
opencv update breaks creation of emaples, turning it off
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a368afec5412..312d9fdab06c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Sep 26 19:24:40 UTC 2018
pkgbase = marble-git
pkgdesc = Desktop Globe. (GIT version)
- pkgver = 18.07.80.10.g4476573c2
+ pkgver = 18.07.80.34.g65b3ac2b4
pkgrel = 1
url = https://www.kde.org/applications/system/marble
arch = i686
@@ -71,6 +69,6 @@ pkgname = marble-common-git
depends = libastro-git
depends = marble-git
depends = marble-data-git
- provides = marble-common=18.07.80.10.g4476573c2
+ provides = marble-common=18.07.80.34.g65b3ac2b4
conflicts = marble-common
diff --git a/PKGBUILD b/PKGBUILD
index dc9d8a984d28..7ab6e3e5c279 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('marble-git'
'libastro-git'
'marble-data-git'
'marble-common-git')
-pkgver=18.07.80.10.g4476573c2
+pkgver=18.07.80.34.g65b3ac2b4
pkgrel=1
pkgdesc="Desktop Globe. (GIT version)"
arch=('i686' 'x86_64')
@@ -33,6 +33,9 @@ prepare() {
-e '/Quick/d' \
-e '/touch/d' \
-i marble/src/apps/CMakeLists.txt
+ # fix an example
+ #sed -e 's/CV_RGB2BGR/CV_RGB/' \
+ # -i 's/marble/examples/cpp/animation-video/main.cpp
}
build() {
@@ -43,7 +46,7 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DQT_PLUGINS_DIR=lib/qt/plugins \
-DBUILD_TESTING=OFF \
- -DBUILD_MARBLE_EXAMPLES=ON \
+ -DBUILD_MARBLE_EXAMPLES=OFF \
-DBUILD_MARBLE_TOOLS=ON \
-DBUILD_MARBLE_TESTS=OFF \
-DMOBILE=OFF