1 |
commit: dabd3e0a64af370f970c6855d1c9b8bad0c5cfd8 |
2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
3 |
AuthorDate: Sat Nov 28 18:19:15 2015 +0000 |
4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
5 |
CommitDate: Sat Nov 28 18:19:15 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=dabd3e0a |
7 |
|
8 |
sci-visualization/forge: Drop old |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
sci-visualization/forge/ChangeLog | 4 ++ |
13 |
.../forge/files/forge-3.1-find-glm.patch | 32 --------------- |
14 |
sci-visualization/forge/forge-3.1.ebuild | 47 ---------------------- |
15 |
3 files changed, 4 insertions(+), 79 deletions(-) |
16 |
|
17 |
diff --git a/sci-visualization/forge/ChangeLog b/sci-visualization/forge/ChangeLog |
18 |
index abee051..1a510cb 100644 |
19 |
--- a/sci-visualization/forge/ChangeLog |
20 |
+++ b/sci-visualization/forge/ChangeLog |
21 |
@@ -2,6 +2,10 @@ |
22 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Id$ |
24 |
|
25 |
+ 28 Nov 2015; Marius Brehler <marbre@××××××××××××××.de> |
26 |
+ -files/forge-3.1-find-glm.patch, -forge-3.1.ebuild: |
27 |
+ sci-visualization/forge: Drop old |
28 |
+ |
29 |
*forge-3.2.0 (24 Nov 2015) |
30 |
|
31 |
24 Nov 2015; Marius Brehler <marbre@××××××××××××××.de> +forge-3.2.0.ebuild: |
32 |
|
33 |
diff --git a/sci-visualization/forge/files/forge-3.1-find-glm.patch b/sci-visualization/forge/files/forge-3.1-find-glm.patch |
34 |
deleted file mode 100644 |
35 |
index d353539..0000000 |
36 |
--- a/sci-visualization/forge/files/forge-3.1-find-glm.patch |
37 |
+++ /dev/null |
38 |
@@ -1,32 +0,0 @@ |
39 |
-From 25f7da5af693288f56897f772fbb6f89ab710197 Mon Sep 17 00:00:00 2001 |
40 |
-From: Marius Brehler <marius.brehler@×××××××××××.de> |
41 |
-Date: Wed, 16 Sep 2015 17:37:56 +0200 |
42 |
-Subject: [PATCH] find_package GLM or glm (>=glm-0.9.7.0). Fixes #49. |
43 |
- |
44 |
---- |
45 |
- src/CMakeLists.txt | 9 ++++++++- |
46 |
- 1 file changed, 8 insertions(+), 1 deletion(-) |
47 |
- |
48 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
49 |
-index 5681e32..87cb3b0 100755 |
50 |
---- a/src/CMakeLists.txt |
51 |
-+++ b/src/CMakeLists.txt |
52 |
-@@ -1,7 +1,14 @@ |
53 |
- CMAKE_MINIMUM_REQUIRED(VERSION 2.8) |
54 |
- |
55 |
- IF(USE_SYSTEM_GLM) |
56 |
-- FIND_PACKAGE(GLM REQUIRED) |
57 |
-+ # Prior to GLM 0.9.7.0, the package is found by the FindGLM.cmake module. |
58 |
-+ # This was removed with GLM 0.9.7.0, instead a glm-config.cmake configuration |
59 |
-+ # file is provided. Therefore, both FIND_PACKAGE calls are necessary. |
60 |
-+ FIND_PACKAGE(GLM QUIET) |
61 |
-+ FIND_PACKAGE(glm QUIET) |
62 |
-+ IF(NOT glm_FOUND AND NOT GLM_FOUND) |
63 |
-+ MESSAGE(FATAL_ERROR "GLM Not Found") |
64 |
-+ ENDIF() |
65 |
- ELSE(USE_SYSTEM_GLM) |
66 |
- INCLUDE("${CMAKE_MODULE_PATH}/build_glm.cmake") |
67 |
- ENDIF(USE_SYSTEM_GLM) |
68 |
--- |
69 |
-2.4.6 |
70 |
- |
71 |
|
72 |
diff --git a/sci-visualization/forge/forge-3.1.ebuild b/sci-visualization/forge/forge-3.1.ebuild |
73 |
deleted file mode 100644 |
74 |
index e01494d..0000000 |
75 |
--- a/sci-visualization/forge/forge-3.1.ebuild |
76 |
+++ /dev/null |
77 |
@@ -1,47 +0,0 @@ |
78 |
-# Copyright 1999-2015 Gentoo Foundation |
79 |
-# Distributed under the terms of the GNU General Public License v2 |
80 |
-# $Id$ |
81 |
- |
82 |
-EAPI=5 |
83 |
- |
84 |
-inherit cmake-utils |
85 |
- |
86 |
-DESCRIPTION="High Performance Visualizations for ArrayFire" |
87 |
-HOMEPAGE="http://www.arrayfire.com/" |
88 |
-SRC_URI="https://github.com/arrayfire/${PN}/archive/af${PV}.tar.gz -> ${P}.tar.gz" |
89 |
-KEYWORDS="~amd64" |
90 |
- |
91 |
-LICENSE="BSD" |
92 |
-SLOT="0" |
93 |
-IUSE="examples" |
94 |
- |
95 |
-RDEPEND=" |
96 |
- media-libs/glew |
97 |
- >=media-libs/glfw-3.1.1 |
98 |
- media-libs/freetype:2 |
99 |
- media-libs/fontconfig:1.0 |
100 |
- >=media-libs/glm-0.9.7.1 |
101 |
- virtual/opengl |
102 |
- " |
103 |
-DEPEND="${RDEPEND}" |
104 |
- |
105 |
-S="${WORKDIR}/${PN}-af${PV}" |
106 |
- |
107 |
-PATCHES=( "${FILESDIR}/${P}"-find-glm.patch ) |
108 |
- |
109 |
-pkg_pretend() { |
110 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
111 |
- if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) ; then |
112 |
- die "Compilation with gcc older than 4.7 is not supported." |
113 |
- fi |
114 |
- fi |
115 |
-} |
116 |
- |
117 |
-src_configure() { |
118 |
- local mycmakeargs=( |
119 |
- $(cmake-utils_use_build examples EXAMPLES) |
120 |
- -DUSE_SYSTEM_GLM=ON |
121 |
- -DUSE_SYSTEM_FREETYPE=ON |
122 |
- ) |
123 |
- cmake-utils_src_configure |
124 |
-} |