From 7158736d9274d7d3a4442a1b9c0d42e104c592d1 Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Tue, 6 Sep 2016 14:37:10 -0500
Subject: libre/kipi-plugins: disable OpenGL support on armv7h

---
 .../0001-optionally-enable-OpenGL.patch            | 34 ++++++++++++++++++++++
 libre/kipi-plugins/PKGBUILD                        | 20 ++++++++++---
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 libre/kipi-plugins/0001-optionally-enable-OpenGL.patch

(limited to 'libre/kipi-plugins')

diff --git a/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch b/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch
new file mode 100644
index 000000000..8527b9cce
--- /dev/null
+++ b/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch
@@ -0,0 +1,34 @@
+From 72f50a2d29648248e03eb871f896f0c940e44c78 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Tue, 5 Jul 2016 18:47:56 -0600
+Subject: [PATCH] optionally enable OpenGL
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47f6b10..7615b7f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -104,6 +104,7 @@ option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer suppor
+ option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                       OFF)
+ option(ENABLE_MEDIAPLAYER           "Build digiKam with QtMultimedia support (default=OFF)"                            OFF)
+ option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                     ON)
++option(ENABLE_OPENGL                "Build digiKam with OpenGL support (default=ON)"                                   ON)
+ 
+ # Mysql support options (experimental):
+ option(ENABLE_MYSQLSUPPORT          "Build digiKam with MySQL dabatase support (default=OFF)"                          OFF)
+@@ -284,7 +285,7 @@ else()
+ endif()
+ 
+ # decide if Presentation tool can be built with OpenGL
+-if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND)
++if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL)
+     set(HAVE_OPENGL TRUE)
+ elseif()
+     set(HAVE_OPENGL FALSE)
+-- 
+2.8.3
+
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index b252ffdd7..7c01c28ad 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/kipi-plugins/PKGBUILD
@@ -18,16 +18,18 @@ replaces=("${pkgname}-libre")
 conflicts=("${pkgname}-libre")
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
              'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
-             'kfilemetadata' 'akonadi-contact' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+             'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
              'knotifyconfig' 'libmediawiki' 'libkvkontakte')
 source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
         "digikam-5.1-fix-build.patch"
         kdebug-367675.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=463667c8&o=plain"
-        "libre.patch")
+        "libre.patch"
+        '0001-optionally-enable-OpenGL.patch')
 sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
           '5b6644c8b5534a1712f46fc84948de9a0039a601'
           'd669d6f248d6c7dec6728037992fdf8d4e14c1d9'
-          'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f')
+          'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f'
+          '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
 
 prepare() {
   mkdir -p build
@@ -40,11 +42,20 @@ prepare() {
   # Fix digikamhelperdir
   cd core
   patch -p1 -i "$srcdir"/kdebug-367675.patch
+
+  # OpenGL switch
+  if [[ "$CARCH" = arm* ]]; then
+    patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
+  fi
 }
 
 build() {
   cd build
 
+  if [[ "$CARCH" = arm* ]]; then
+    local cmake_extra="-DENABLE_OPENGL=OFF"
+  fi
+
   cmake ../${pkgbase}-${_pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -55,7 +66,8 @@ build() {
     -DENABLE_MEDIAPLAYER=ON \
     -DENABLE_AKONADICONTACTSUPPORT=ON \
     -DENABLE_MYSQLSUPPORT=ON \
-    -DENABLE_OPENCV3=ON
+    -DENABLE_OPENCV3=ON \
+    $cmake_extra
   make
 }
 
-- 
cgit v1.2.3