diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-07-22 09:19:08 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-07-22 09:19:08 +0200 |
commit | d5fe6f9794ab6175d9b31e6f98af156ca81a42f4 (patch) | |
tree | 8cebe4b37f9355f74634b68ea8192e69ddaccffd /sci-chemistry/pymol/files | |
parent | [dev-lang/path64] Add fortran,openmp,debugger to IUSE (diff) | |
download | sci-d5fe6f9794ab6175d9b31e6f98af156ca81a42f4.tar.gz sci-d5fe6f9794ab6175d9b31e6f98af156ca81a42f4.tar.bz2 sci-d5fe6f9794ab6175d9b31e6f98af156ca81a42f4.zip |
Grap some fedora stuff, fix shadrers patch for current head
(Portage version: 2.2.0_alpha46/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/pymol/files')
-rw-r--r-- | sci-chemistry/pymol/files/pymol-9999-setup.py.patch | 24 | ||||
-rw-r--r-- | sci-chemistry/pymol/files/pymol-9999-shaders.patch | 32 |
2 files changed, 42 insertions, 14 deletions
diff --git a/sci-chemistry/pymol/files/pymol-9999-setup.py.patch b/sci-chemistry/pymol/files/pymol-9999-setup.py.patch new file mode 100644 index 000000000..1267b967c --- /dev/null +++ b/sci-chemistry/pymol/files/pymol-9999-setup.py.patch @@ -0,0 +1,24 @@ + setup.py | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/setup.py b/setup.py +index b0f4dad..8c82722 100644 +--- a/setup.py ++++ b/setup.py +@@ -156,7 +156,7 @@ else: # linux or other unix + # ("_PYMOL_VMD_PLUGINS",None) + ("NO_MMLIBS",None), + ] +- ext_comp_args=["-ffast-math","-funroll-loops","-O3"] ++ ext_comp_args=[] + ext_link_args=[] + + setup ( # Distribution meta-data +@@ -174,6 +174,7 @@ setup ( # Distribution meta-data + 'pmg_tk/skins', + 'pmg_tk/skins/normal', + 'pmg_wx', ++ 'pymol2', + 'pymol', + 'pymol/contrib', + 'pymol/opengl', diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-chemistry/pymol/files/pymol-9999-shaders.patch index 2caac2dc4..a20bfe319 100644 --- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch +++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch @@ -1,8 +1,12 @@ -Index: layer0/ShaderMgr.c -=================================================================== ---- layer0/ShaderMgr.c (revision 3945) -+++ layer0/ShaderMgr.c (working copy) -@@ -400,7 +400,7 @@ + layer0/ShaderMgr.c | 16 ++++++++-------- + layer1/Setting.c | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c +index 4658b96..092aac8 100644 +--- a/layer0/ShaderMgr.c ++++ b/layer0/ShaderMgr.c +@@ -416,7 +416,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I) char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { FILE* f; long size; @@ -11,7 +15,7 @@ Index: layer0/ShaderMgr.c PRINTFB(G, FB_ShaderMgr, FB_Debugging) "CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName -@@ -412,16 +412,16 @@ +@@ -428,16 +428,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { return NULL; } @@ -20,8 +24,8 @@ Index: layer0/ShaderMgr.c + pymol_data = getenv("PYMOL_DATA"); + if (!pymol_data){ PRINTFB(G, FB_ShaderMgr, FB_Warnings) -- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n", fileName ENDFB(G); -+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n", fileName ENDFB(G); +- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n" ENDFB(G); ++ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n" ENDFB(G); return NULL; } /* make this a setting */ @@ -34,7 +38,7 @@ Index: layer0/ShaderMgr.c fullFile = strcat(fullFile, shader_path); fullFile = strcat(fullFile, fileName); -@@ -430,7 +430,7 @@ +@@ -446,7 +446,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { if (!f) { PRINTFB(G, FB_ShaderMgr, FB_Errors) @@ -43,11 +47,11 @@ Index: layer0/ShaderMgr.c return NULL; } else { PRINTFB(G, FB_ShaderMgr, FB_Blather) -Index: layer1/Setting.c -=================================================================== ---- layer1/Setting.c (revision 3945) -+++ layer1/Setting.c (working copy) -@@ -3990,7 +3990,7 @@ +diff --git a/layer1/Setting.c b/layer1/Setting.c +index 29b6bc5..2a70835 100644 +--- a/layer1/Setting.c ++++ b/layer1/Setting.c +@@ -3991,7 +3991,7 @@ void SettingInitGlobal(PyMOLGlobals * G, int alloc, int reset_gui, int use_defau set_b(I, cSetting_line_use_shader, 1); set_b(I, cSetting_sphere_use_shader, 1); set_b(I, cSetting_use_shaders, 0); /* disable by default until optimized shaders present; doesn't effect vol */ |