Accepting request 878161 from KDE:Extra
- Add patch to fix build on ARM: * 0001-Use-opengl-es-on-Arm-Linux.patch OBS-URL: https://build.opensuse.org/request/show/878161 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krita?expand=0&rev=52
This commit is contained in:
commit
de36e32ca1
27
0001-Use-opengl-es-on-Arm-Linux.patch
Normal file
27
0001-Use-opengl-es-on-Arm-Linux.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 2d92ee5b01a0069cc33debdcb3c29dc817c2d6f3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Halla Rempt <halla@valdyas.org>
|
||||||
|
Date: Wed, 10 Mar 2021 12:49:34 +0100
|
||||||
|
Subject: [PATCH] Use opengl es on Arm Linux
|
||||||
|
|
||||||
|
BUG:421136
|
||||||
|
(cherry picked from commit c91d020b244f012e09203c14d80d8e8774362a57)
|
||||||
|
---
|
||||||
|
libs/ui/CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
|
||||||
|
index 87bea6e30e..4876489b8e 100644
|
||||||
|
--- a/libs/ui/CMakeLists.txt
|
||||||
|
+++ b/libs/ui/CMakeLists.txt
|
||||||
|
@@ -7,7 +7,7 @@ include_directories(SYSTEM
|
||||||
|
${OCIO_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
-if (ANDROID)
|
||||||
|
+if (ANDROID OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)" AND NOT APPLE))
|
||||||
|
add_definitions(-DQT_OPENGL_ES_3)
|
||||||
|
add_definitions(-DHAS_ONLY_OPENGL_ES)
|
||||||
|
include_directories (${Qt5AndroidExtras_INCLUDE_DIRS})
|
||||||
|
--
|
||||||
|
2.30.1
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 10 12:11:14 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
- Add patch to fix build on ARM:
|
||||||
|
* 0001-Use-opengl-es-on-Arm-Linux.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Mar 2 15:57:09 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
Tue Mar 2 15:57:09 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||||
|
|
||||||
|
@ -31,6 +31,8 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND
|
|||||||
Group: Productivity/Graphics/Bitmap Editors
|
Group: Productivity/Graphics/Bitmap Editors
|
||||||
URL: https://www.krita.org/
|
URL: https://www.krita.org/
|
||||||
Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz
|
Source0: https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch0: 0001-Use-opengl-es-on-Arm-Linux.patch
|
||||||
%ifnarch %{arm} aarch64
|
%ifnarch %{arm} aarch64
|
||||||
# causes build failure on ARM currently
|
# causes build failure on ARM currently
|
||||||
BuildRequires: OpenColorIO-devel
|
BuildRequires: OpenColorIO-devel
|
||||||
|
Loading…
x
Reference in New Issue
Block a user