| 1 |
commit: c90c8667004a9efe613c36ec93ff8566b401c854 |
| 2 |
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 13:46:48 2015 +0000 |
| 4 |
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 13:47:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90c8667 |
| 7 |
|
| 8 |
media-libs/ganv: fix compilation with USE=-fdgl |
| 9 |
|
| 10 |
Upstream patch supplied by Karl Lindén. Adding him as proxy maintainer. |
| 11 |
|
| 12 |
Bug: 556518 |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.20.1 |
| 15 |
|
| 16 |
media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch | 42 ++++++++++++++++++++++++++ |
| 17 |
media-libs/ganv/ganv-1.4.2.ebuild | 6 +++- |
| 18 |
media-libs/ganv/metadata.xml | 4 +++ |
| 19 |
3 files changed, 51 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..17cc243 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch |
| 26 |
@@ -0,0 +1,42 @@ |
| 27 |
+Index: src/Canvas.cpp |
| 28 |
+=================================================================== |
| 29 |
+--- src/Canvas.cpp (revision 5479) |
| 30 |
++++ src/Canvas.cpp (revision 5480) |
| 31 |
+@@ -760,6 +760,18 @@ |
| 32 |
+ } |
| 33 |
+ #endif |
| 34 |
+ |
| 35 |
++inline uint64_t |
| 36 |
++get_monotonic_time() |
| 37 |
++{ |
| 38 |
++#if GLIB_CHECK_VERSION(2, 28, 0) |
| 39 |
++ return g_get_monotonic_time(); |
| 40 |
++#else |
| 41 |
++ GTimeVal time; |
| 42 |
++ g_get_current_time(&time); |
| 43 |
++ return time.tv_sec + time.tv_usec; |
| 44 |
++#endif |
| 45 |
++} |
| 46 |
++ |
| 47 |
+ #ifdef GANV_FDGL |
| 48 |
+ |
| 49 |
+ inline Region |
| 50 |
+@@ -788,18 +800,6 @@ |
| 51 |
+ b->impl->force = vec_sub(b->impl->force, f); |
| 52 |
+ } |
| 53 |
+ |
| 54 |
+-inline uint64_t |
| 55 |
+-get_monotonic_time() |
| 56 |
+-{ |
| 57 |
+-#if GLIB_CHECK_VERSION(2, 28, 0) |
| 58 |
+- return g_get_monotonic_time(); |
| 59 |
+-#else |
| 60 |
+- GTimeVal time; |
| 61 |
+- g_get_current_time(&time); |
| 62 |
+- return time.tv_sec + time.tv_usec; |
| 63 |
+-#endif |
| 64 |
+-} |
| 65 |
+- |
| 66 |
+ gboolean |
| 67 |
+ GanvCanvasImpl::layout_iteration() |
| 68 |
+ { |
| 69 |
|
| 70 |
diff --git a/media-libs/ganv/ganv-1.4.2.ebuild b/media-libs/ganv/ganv-1.4.2.ebuild |
| 71 |
index 11adbd7..d29a09d 100644 |
| 72 |
--- a/media-libs/ganv/ganv-1.4.2.ebuild |
| 73 |
+++ b/media-libs/ganv/ganv-1.4.2.ebuild |
| 74 |
@@ -5,7 +5,7 @@ |
| 75 |
EAPI=5 |
| 76 |
PYTHON_COMPAT=( python2_7 ) |
| 77 |
PYTHON_REQ_USE='threads(+)' |
| 78 |
-inherit waf-utils python-any-r1 |
| 79 |
+inherit eutils waf-utils python-any-r1 |
| 80 |
|
| 81 |
DESCRIPTION="A GTK+ widget for interactive graph-like environments" |
| 82 |
HOMEPAGE="http://drobilla.net/software/ganv/" |
| 83 |
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND} |
| 84 |
|
| 85 |
DOCS=( AUTHORS NEWS README ) |
| 86 |
|
| 87 |
+src_prepare() { |
| 88 |
+ epatch "${FILESDIR}"/${P}-no-fdgl.patch |
| 89 |
+} |
| 90 |
+ |
| 91 |
src_configure() { |
| 92 |
waf-utils_src_configure \ |
| 93 |
$(use graphviz || echo "--no-graphviz") \ |
| 94 |
|
| 95 |
diff --git a/media-libs/ganv/metadata.xml b/media-libs/ganv/metadata.xml |
| 96 |
index bd43bef..8f0e433 100644 |
| 97 |
--- a/media-libs/ganv/metadata.xml |
| 98 |
+++ b/media-libs/ganv/metadata.xml |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
<?xml version="1.0" encoding="UTF-8"?> |
| 101 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 102 |
<pkgmetadata> |
| 103 |
+ <maintainer> |
| 104 |
+ <email>karl.j.linden@×××××.com</email> |
| 105 |
+ <name>Karl Lindén</name> |
| 106 |
+ </maintainer> |
| 107 |
<herd>proaudio</herd> |
| 108 |
<use> |
| 109 |
<flag name="fdgl">Use experimental force-directed graph layout</flag> |
Archives