diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-06-22 11:06:25 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-06-22 11:07:02 +0200 |
| commit | 8bc936db71b147be98b3d7a41dae7f84124bf6a8 (patch) | |
| tree | 51cb96e508b7503ae47b7b7f6478b2d198c105c4 /sci-chemistry/pymol/files | |
| parent | Upstream already included this patch (diff) | |
| download | sci-8bc936db71b147be98b3d7a41dae7f84124bf6a8.tar.gz sci-8bc936db71b147be98b3d7a41dae7f84124bf6a8.tar.bz2 sci-8bc936db71b147be98b3d7a41dae7f84124bf6a8.zip | |
Imported changes from tree
(Portage version: 2.2_rc67/git/Linux x86_64)
(Signed Manifest commit)
Diffstat (limited to 'sci-chemistry/pymol/files')
| -rw-r--r-- | sci-chemistry/pymol/files/1.3.0-vmd.patch | 33 | ||||
| -rw-r--r-- | sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch | 11 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sci-chemistry/pymol/files/1.3.0-vmd.patch b/sci-chemistry/pymol/files/1.3.0-vmd.patch new file mode 100644 index 000000000..0f34a02ea --- /dev/null +++ b/sci-chemistry/pymol/files/1.3.0-vmd.patch @@ -0,0 +1,33 @@ +Index: setup.py +=================================================================== +--- setup.py (revision 3908) ++++ setup.py (working copy) +@@ -130,8 +130,8 @@ + "/usr/include/freetype2", + # "/users/warren/ext/include", + # VMD plugin support +-# "contrib/uiuc/plugins/include", +-# "contrib/uiuc/plugins/molfile_plugin/src", ++ "contrib/uiuc/plugins/include", ++ "contrib/uiuc/plugins/molfile_plugin/src", + "modules/cealign/src", + "modules/cealign/src/tnt", ] + libs=["GL","GLU","glut","png","z","freetype", +@@ -151,7 +151,7 @@ + # Numeric Python support + # ("_PYMOL_NUMPY",None), + # VMD plugin support +-# ("_PYMOL_VMD_PLUGINS",None) ++ ("_PYMOL_VMD_PLUGINS",None) + ] + ext_comp_args=["-ffast-math","-funroll-loops","-O3"] + ext_link_args=[] +@@ -299,7 +299,7 @@ + "layer5/main.c" + # VMD plugin support + # switch the 0 to 1 to activate the additional source code +- ] + 0 * [ ++ ] + 1 * [ + # (incomplete support -- only TRJ, TRR, XTC, DCD so far...) + 'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c', + 'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp', diff --git a/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch new file mode 100644 index 000000000..7d0c35d83 --- /dev/null +++ b/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch @@ -0,0 +1,11 @@ +--- setup.py.old 2009-10-03 01:01:22.444881137 -0500 ++++ setup.py 2009-10-03 01:01:41.580752440 -0500 +@@ -139,7 +139,7 @@ + ("_PYMOL_FREETYPE",None), + ("_PYMOL_LIBPNG",None), + # OpenGL shaders +-# ("_PYMOL_OPENGL_SHADERS",None), ++ ("_PYMOL_OPENGL_SHADERS",None), + # Numeric Python support + # ("_PYMOL_NUMPY",None), + # VMD plugin support |