From 223d43723466bac44548f3ab6db8570e3d1e7450 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 18 Jul 2018 09:40:16 +0200 Subject: [PATCH] stellarium: drop only_for_archs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #1076 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/stellarium/patches/cmake-gles.patch | 27 +++++++++++++++++++++ srcpkgs/stellarium/template | 1 - 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/stellarium/patches/cmake-gles.patch diff --git a/srcpkgs/stellarium/patches/cmake-gles.patch b/srcpkgs/stellarium/patches/cmake-gles.patch new file mode 100644 index 00000000000..436097938b6 --- /dev/null +++ b/srcpkgs/stellarium/patches/cmake-gles.patch @@ -0,0 +1,27 @@ +--- CMakeLists.txt.orig 2018-07-01 08:04:19.000000000 +0200 ++++ CMakeLists.txt 2018-07-17 08:52:24.193931980 +0200 +@@ -418,24 +418,6 @@ + ADD_DEFINITIONS(-DUSE_OLD_QGLWIDGET) + ENDIF() + +-# Since Qt 5.4, linking to OpenGL is basically not required anymore, +-# because the QtGui module re-implements the GL functions, and perhaps even +-# dispatches the calls to a dynamically selected GL library. +-# +-# The only exception where this does not work with CMake is for +-# ES2-only/ANGLE-only builds, which are seemingly not included in +-# official Qt downloads, but may be required as a custom build +-# for some embedded systems. Interestingly, this works with qmake, +-# but CMake needs an explicit link definition. +-# See also this bug: https://bugreports.qt.io/browse/QTBUG-29132 +- +-# Check if we have a GLES-only build +-# On dynamic builds, this property is also "GL" +-IF(${Qt5Gui_OPENGL_IMPLEMENTATION} MATCHES "GLES") +- MESSAGE(STATUS "Building an OpenGL ES build (${Qt5Gui_OPENGL_IMPLEMENTATION})") +- SET(STEL_GLES_LIBS Qt5::Gui_EGL Qt5::Gui_GLESv2) +-ENDIF() +- + + # Tell CMake to run moc when necessary: + SET(CMAKE_AUTOMOC ON) diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index 6c167d4c39e..fbe81e15718 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="http://www.stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" checksum=38d34538f3dc87943bc2977aeb1c099339b0ea1da63a3565e36409e165e6536e -only_for_archs="i686 i686-musl x86_64 x86_64-musl"