| 1 |
jlec 11/04/04 10:13:10 |
| 2 |
|
| 3 |
Added: 1.4-shaders.patch 1.4-vmd.patch |
| 4 |
Log: |
| 5 |
Version Bump |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/pymol/files/1.4-shaders.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4-shaders.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4-shaders.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.4-shaders.patch |
| 16 |
=================================================================== |
| 17 |
layer0/ShaderMgr.c | 16 ++++++++-------- |
| 18 |
layer1/Setting.c | 2 +- |
| 19 |
2 files changed, 9 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c |
| 22 |
index 929167f..ecb4130 100644 |
| 23 |
--- a/layer0/ShaderMgr.c |
| 24 |
+++ b/layer0/ShaderMgr.c |
| 25 |
@@ -386,7 +386,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I) |
| 26 |
char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 27 |
FILE* f; |
| 28 |
long size; |
| 29 |
- char* buffer = NULL, *p, *pymol_path, *shader_path, *fullFile; |
| 30 |
+ char* buffer = NULL, *p, *pymol_data, *shader_path, *fullFile; |
| 31 |
|
| 32 |
PRINTFB(G, FB_ShaderMgr, FB_Debugging) |
| 33 |
"CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName |
| 34 |
@@ -398,16 +398,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 35 |
return NULL; |
| 36 |
} |
| 37 |
|
| 38 |
- pymol_path = getenv("PYMOL_PATH"); |
| 39 |
- if (!pymol_path){ |
| 40 |
+ pymol_data = getenv("PYMOL_DATA"); |
| 41 |
+ if (!pymol_data){ |
| 42 |
PRINTFB(G, FB_ShaderMgr, FB_Warnings) |
| 43 |
- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files (%s) from disk\n", fileName ENDFB(G); |
| 44 |
+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files (%s) from disk\n", fileName ENDFB(G); |
| 45 |
return NULL; |
| 46 |
} |
| 47 |
/* make this a setting */ |
| 48 |
- shader_path = "/data/shaders/"; |
| 49 |
- fullFile = malloc( sizeof(char) * (strlen(pymol_path)+strlen(shader_path)+strlen(fileName)+1)); |
| 50 |
- fullFile = strcpy(fullFile, pymol_path); |
| 51 |
+ shader_path = "/shaders/"; |
| 52 |
+ fullFile = malloc( sizeof(char) * (strlen(pymol_data)+strlen(shader_path)+strlen(fileName)+1)); |
| 53 |
+ fullFile = strcpy(fullFile, pymol_data); |
| 54 |
fullFile = strcat(fullFile, shader_path); |
| 55 |
fullFile = strcat(fullFile, fileName); |
| 56 |
|
| 57 |
@@ -416,7 +416,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 58 |
|
| 59 |
if (!f) { |
| 60 |
PRINTFB(G, FB_ShaderMgr, FB_Errors) |
| 61 |
- " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_PATH='%s'\n", fullFile, pymol_path ENDFB(G); |
| 62 |
+ " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_DATA='%s'\n", fullFile, pymol_data ENDFB(G); |
| 63 |
return NULL; |
| 64 |
} else { |
| 65 |
PRINTFB(G, FB_ShaderMgr, FB_Blather) |
| 66 |
diff --git a/layer1/Setting.c b/layer1/Setting.c |
| 67 |
index 3aa0b8d..f9b5789 100644 |
| 68 |
--- a/layer1/Setting.c |
| 69 |
+++ b/layer1/Setting.c |
| 70 |
@@ -3956,7 +3956,7 @@ void SettingInitGlobal(PyMOLGlobals * G, int alloc, int reset_gui, int use_defau |
| 71 |
set_b(I, cSetting_line_use_shader, 1); |
| 72 |
set_b(I, cSetting_sphere_use_shader, 1); |
| 73 |
set_b(I, cSetting_use_shaders, 0); /* disable by default until optimized shaders present; doesn't effect vol */ |
| 74 |
- set_s(I, cSetting_shader_path, "data/shaders"); |
| 75 |
+ set_s(I, cSetting_shader_path, "shaders"); |
| 76 |
set_i(I, cSetting_volume_bit_depth, 8); |
| 77 |
set_color(I, cSetting_volume_color, "-1"); |
| 78 |
set_f(I, cSetting_volume_layers, 256); |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 sci-chemistry/pymol/files/1.4-vmd.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4-vmd.patch?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4-vmd.patch?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: 1.4-vmd.patch |
| 88 |
=================================================================== |
| 89 |
setup.py | 8 ++++---- |
| 90 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 91 |
|
| 92 |
diff --git a/setup.py b/setup.py |
| 93 |
index b0f4dad..4ec5145 100644 |
| 94 |
--- a/setup.py |
| 95 |
+++ b/setup.py |
| 96 |
@@ -132,8 +132,8 @@ else: # linux or other unix |
| 97 |
"/usr/include/freetype2", |
| 98 |
# "/users/warren/ext/include", |
| 99 |
# VMD plugin support |
| 100 |
-# "contrib/uiuc/plugins/include", |
| 101 |
-# "contrib/uiuc/plugins/molfile_plugin/src", |
| 102 |
+ "contrib/uiuc/plugins/include", |
| 103 |
+ "contrib/uiuc/plugins/molfile_plugin/src", |
| 104 |
"modules/cealign/src", |
| 105 |
"modules/cealign/src/tnt", ] |
| 106 |
libs=["GL","GLU","glut","png","z","freetype", "GLEW", |
| 107 |
@@ -153,7 +153,7 @@ else: # linux or other unix |
| 108 |
# Numeric Python support |
| 109 |
# ("_PYMOL_NUMPY",None), |
| 110 |
# VMD plugin support |
| 111 |
-# ("_PYMOL_VMD_PLUGINS",None) |
| 112 |
+ ("_PYMOL_VMD_PLUGINS",None), |
| 113 |
("NO_MMLIBS",None), |
| 114 |
] |
| 115 |
ext_comp_args=["-ffast-math","-funroll-loops","-O3"] |
| 116 |
@@ -307,7 +307,7 @@ setup ( # Distribution meta-data |
| 117 |
"layer5/main.c" |
| 118 |
# VMD plugin support |
| 119 |
# switch the 0 to 1 to activate the additional source code |
| 120 |
- ] + 0 * [ |
| 121 |
+ ] + 1 * [ |
| 122 |
# (incomplete support -- only TRJ, TRR, XTC, DCD so far...) |
| 123 |
'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c', |
| 124 |
'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp', |
Archives