From 4b769835ef6c982eef1a19803cc9f93bbb34cf93fa37b39af09f41d669d57e89 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 10 Mar 2021 12:12:07 +0000 Subject: [PATCH] - Add patch to fix build on ARM: * 0001-Use-opengl-es-on-Arm-Linux.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=139 --- 0001-Use-opengl-es-on-Arm-Linux.patch | 27 +++++++++++++++++++++++++++ krita.changes | 6 ++++++ krita.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 0001-Use-opengl-es-on-Arm-Linux.patch diff --git a/0001-Use-opengl-es-on-Arm-Linux.patch b/0001-Use-opengl-es-on-Arm-Linux.patch new file mode 100644 index 0000000..e53d117 --- /dev/null +++ b/0001-Use-opengl-es-on-Arm-Linux.patch @@ -0,0 +1,27 @@ +From 2d92ee5b01a0069cc33debdcb3c29dc817c2d6f3 Mon Sep 17 00:00:00 2001 +From: Halla Rempt +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 + diff --git a/krita.changes b/krita.changes index 51f08c7..f660934 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 10 12:11:14 UTC 2021 - Christophe Giboudeaux + +- 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 diff --git a/krita.spec b/krita.spec index 13e3039..ef71110 100644 --- a/krita.spec +++ b/krita.spec @@ -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 URL: https://www.krita.org/ 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 # causes build failure on ARM currently BuildRequires: OpenColorIO-devel