[gentoo-commits] repo/gentoo:master commit in: media-libs/ganv/, media-libs/ganv/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/ganv/, media-libs/ganv/files/

[Ben de Groot]

commit:     c90c8667004a9efe613c36ec93ff8566b401c854
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 13:46:48 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 13:47:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90c8667

media-libs/ganv: fix compilation with USE=-fdgl

Upstream patch supplied by Karl Lindén. Adding him as proxy maintainer.

Bug: 556518

Package-Manager: portage-2.2.20.1

 media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch | 42 ++++++++++++++++++++++++++
 media-libs/ganv/ganv-1.4.2.ebuild              |  6 +++-
 media-libs/ganv/metadata.xml                   |  4 +++
 3 files changed, 51 insertions(+), 1 deletion(-)

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
new file mode 100644
index 0000000..17cc243
--- /dev/null
+++ b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
@@ -0,0 +1,42 @@
+Index: src/Canvas.cpp
+===================================================================
+--- src/Canvas.cpp	(revision 5479)
++++ src/Canvas.cpp	(revision 5480)
+@@ -760,6 +760,18 @@
+ }
+ #endif
+ 
++inline uint64_t
++get_monotonic_time()
++{
++#if GLIB_CHECK_VERSION(2, 28, 0)
++	return g_get_monotonic_time();
++#else
++	GTimeVal time;
++	g_get_current_time(&time);
++	return time.tv_sec + time.tv_usec;
++#endif
++}
++
+ #ifdef GANV_FDGL
+ 
+ inline Region
+@@ -788,18 +800,6 @@
+ 	b->impl->force = vec_sub(b->impl->force, f);
+ }
+ 
+-inline uint64_t
+-get_monotonic_time()
+-{
+-#if GLIB_CHECK_VERSION(2, 28, 0)
+-	return g_get_monotonic_time();
+-#else
+-	GTimeVal time;
+-	g_get_current_time(&time);
+-	return time.tv_sec + time.tv_usec;
+-#endif
+-}
+-
+ gboolean
+ GanvCanvasImpl::layout_iteration()
+ {

diff --git a/media-libs/ganv/ganv-1.4.2.ebuild b/media-libs/ganv/ganv-1.4.2.ebuild
index 11adbd7..d29a09d 100644
--- a/media-libs/ganv/ganv-1.4.2.ebuild
+++ b/media-libs/ganv/ganv-1.4.2.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-inherit waf-utils python-any-r1
+inherit eutils waf-utils python-any-r1
 
 DESCRIPTION="A GTK+ widget for interactive graph-like environments"
 HOMEPAGE="http://drobilla.net/software/ganv/"
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-fdgl.patch
+}
+
 src_configure() {
 	waf-utils_src_configure \
 		$(use graphviz || echo "--no-graphviz") \

diff --git a/media-libs/ganv/metadata.xml b/media-libs/ganv/metadata.xml
index bd43bef..8f0e433 100644
--- a/media-libs/ganv/metadata.xml
+++ b/media-libs/ganv/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer>
+    <email>karl.j.linden@gmail.com</email>
+    <name>Karl Lindén</name>
+  </maintainer>
   <herd>proaudio</herd>
   <use>
     <flag name="fdgl">Use experimental force-directed graph layout</flag>