| 1 |
commit: f401d22a5a13922643163b88948f56ad019ae05b |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 8 12:51:19 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 8 12:51:19 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f401d22a |
| 7 |
|
| 8 |
sci-chemistry/mgltools-opengltk: Add missing dep on media-libs/glew and fix underlinking problem |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/mgltools-opengltk/ChangeLog | 6 ++++++ |
| 14 |
.../files/mgltools-opengltk-1.5.6_rc2-glew.patch | 16 ++++++++++++++++ |
| 15 |
.../mgltools-opengltk-1.5.6_rc2-unbundle.patch | 2 +- |
| 16 |
.../mgltools-opengltk-1.5.6_rc2.ebuild | 5 ++++- |
| 17 |
4 files changed, 27 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-chemistry/mgltools-opengltk/ChangeLog b/sci-chemistry/mgltools-opengltk/ChangeLog |
| 20 |
index 3e660f7..1805fc8 100644 |
| 21 |
--- a/sci-chemistry/mgltools-opengltk/ChangeLog |
| 22 |
+++ b/sci-chemistry/mgltools-opengltk/ChangeLog |
| 23 |
@@ -2,6 +2,12 @@ |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 08 Jun 2012; Justin Lecher <jlec@g.o> |
| 28 |
+ mgltools-opengltk-1.5.6_rc2.ebuild, |
| 29 |
+ +files/mgltools-opengltk-1.5.6_rc2-glew.patch, |
| 30 |
+ files/mgltools-opengltk-1.5.6_rc2-unbundle.patch: |
| 31 |
+ Add missing dep on media-libs/glew and fix underlinking problem |
| 32 |
+ |
| 33 |
27 Apr 2012; Justin Lecher <jlec@g.o> |
| 34 |
mgltools-opengltk-1.5.4-r2.ebuild, mgltools-opengltk-1.5.6_rc2.ebuild: |
| 35 |
Add 2.7-pypy-* to RESTRICT_PYTHON_ABIS |
| 36 |
|
| 37 |
diff --git a/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-glew.patch b/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-glew.patch |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..8e62dbb |
| 40 |
--- /dev/null |
| 41 |
+++ b/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-glew.patch |
| 42 |
@@ -0,0 +1,16 @@ |
| 43 |
+ setup.py | 2 +- |
| 44 |
+ 1 files changed, 1 insertions(+), 1 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/setup.py b/setup.py |
| 47 |
+index 21f893f..ca5ec85 100644 |
| 48 |
+--- a/setup.py |
| 49 |
++++ b/setup.py |
| 50 |
+@@ -615,7 +615,7 @@ elif platform == 'win32': |
| 51 |
+ macros = [('WIN32', None)] |
| 52 |
+ else: |
| 53 |
+ extra_link_args = '' |
| 54 |
+- libraries = '' |
| 55 |
++ libraries = gl_libs |
| 56 |
+ macros = [] |
| 57 |
+ |
| 58 |
+ glextlib_ext = MyExtension("extent._glextlib", |
| 59 |
|
| 60 |
diff --git a/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-unbundle.patch b/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-unbundle.patch |
| 61 |
index f082a9d..3b03fc0 100644 |
| 62 |
--- a/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-unbundle.patch |
| 63 |
+++ b/sci-chemistry/mgltools-opengltk/files/mgltools-opengltk-1.5.6_rc2-unbundle.patch |
| 64 |
@@ -22,7 +22,7 @@ index 0191ba2..bda3e41 100644 |
| 65 |
- library_dirs = glx_libdirs, |
| 66 |
- libraries = ['X11'] + gl_libs, |
| 67 |
+ library_dirs = glx_libdirs + ['@GENTOO_PORTAGE_EPREFIX@/usr/lib64/Togl2.0/'], |
| 68 |
-+ libraries = ['X11', 'GLEW'] + gl_libs, |
| 69 |
++ libraries = ['X11', 'GLEW', 'GLEWmx'] + gl_libs, |
| 70 |
headers = { |
| 71 |
'name': path.join("GL","glx.h"), |
| 72 |
'dir': h_dir, |
| 73 |
|
| 74 |
diff --git a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6_rc2.ebuild b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6_rc2.ebuild |
| 75 |
index a4cc04a..20d78ba 100644 |
| 76 |
--- a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6_rc2.ebuild |
| 77 |
+++ b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6_rc2.ebuild |
| 78 |
@@ -30,6 +30,7 @@ RDEPEND=" |
| 79 |
dev-python/numpy |
| 80 |
dev-tcltk/tkdnd |
| 81 |
dev-tcltk/togl |
| 82 |
+ media-libs/glew |
| 83 |
virtual/opengl" |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
dev-lang/swig" |
| 86 |
@@ -44,7 +45,9 @@ src_unpack() { |
| 87 |
src_prepare() { |
| 88 |
local tcl_ver="$(best_version dev-lang/tcl | cut -d- -f3 | cut -d. -f1,2)" |
| 89 |
|
| 90 |
- epatch "${FILESDIR}"/${P}-unbundle.patch |
| 91 |
+ epatch \ |
| 92 |
+ "${FILESDIR}"/${P}-unbundle.patch \ |
| 93 |
+ "${FILESDIR}"/${P}-glew.patch |
| 94 |
|
| 95 |
eprefixify setup.py |
Archives