| 1 |
jlec 11/05/06 07:59:31 |
| 2 |
|
| 3 |
Added: 1.4.1-shaders.patch 1.4.1-data-path.patch |
| 4 |
Log: |
| 5 |
Version Bump, notified by euscan; cleaned old |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/pymol/files/1.4.1-shaders.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4.1-shaders.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4.1-shaders.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.4.1-shaders.patch |
| 16 |
=================================================================== |
| 17 |
Index: layer0/ShaderMgr.c |
| 18 |
=================================================================== |
| 19 |
--- layer0/ShaderMgr.c (revision 3945) |
| 20 |
+++ layer0/ShaderMgr.c (working copy) |
| 21 |
@@ -400,7 +400,7 @@ |
| 22 |
char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 23 |
FILE* f; |
| 24 |
long size; |
| 25 |
- char* buffer = NULL, *p, *pymol_path, *shader_path, *fullFile; |
| 26 |
+ char* buffer = NULL, *p, *pymol_data, *shader_path, *fullFile; |
| 27 |
|
| 28 |
PRINTFB(G, FB_ShaderMgr, FB_Debugging) |
| 29 |
"CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName |
| 30 |
@@ -412,16 +412,16 @@ |
| 31 |
return NULL; |
| 32 |
} |
| 33 |
|
| 34 |
- pymol_path = getenv("PYMOL_PATH"); |
| 35 |
- if (!pymol_path){ |
| 36 |
+ pymol_data = getenv("PYMOL_DATA"); |
| 37 |
+ if (!pymol_data){ |
| 38 |
PRINTFB(G, FB_ShaderMgr, FB_Warnings) |
| 39 |
- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n", fileName ENDFB(G); |
| 40 |
+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n", fileName ENDFB(G); |
| 41 |
return NULL; |
| 42 |
} |
| 43 |
/* make this a setting */ |
| 44 |
- shader_path = "/data/shaders/"; |
| 45 |
- fullFile = malloc( sizeof(char) * (strlen(pymol_path)+strlen(shader_path)+strlen(fileName)+1)); |
| 46 |
- fullFile = strcpy(fullFile, pymol_path); |
| 47 |
+ shader_path = "/shaders/"; |
| 48 |
+ fullFile = malloc( sizeof(char) * (strlen(pymol_data)+strlen(shader_path)+strlen(fileName)+1)); |
| 49 |
+ fullFile = strcpy(fullFile, pymol_data); |
| 50 |
fullFile = strcat(fullFile, shader_path); |
| 51 |
fullFile = strcat(fullFile, fileName); |
| 52 |
|
| 53 |
@@ -430,7 +430,7 @@ |
| 54 |
|
| 55 |
if (!f) { |
| 56 |
PRINTFB(G, FB_ShaderMgr, FB_Errors) |
| 57 |
- " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_PATH='%s'\n", fullFile, pymol_path ENDFB(G); |
| 58 |
+ " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_DATA='%s'\n", fullFile, pymol_data ENDFB(G); |
| 59 |
return NULL; |
| 60 |
} else { |
| 61 |
PRINTFB(G, FB_ShaderMgr, FB_Blather) |
| 62 |
Index: layer1/Setting.c |
| 63 |
=================================================================== |
| 64 |
--- layer1/Setting.c (revision 3945) |
| 65 |
+++ layer1/Setting.c (working copy) |
| 66 |
@@ -3990,7 +3990,7 @@ |
| 67 |
set_b(I, cSetting_line_use_shader, 1); |
| 68 |
set_b(I, cSetting_sphere_use_shader, 1); |
| 69 |
set_b(I, cSetting_use_shaders, 0); /* disable by default until optimized shaders present; doesn't effect vol */ |
| 70 |
- set_s(I, cSetting_shader_path, "data/shaders"); |
| 71 |
+ set_s(I, cSetting_shader_path, "shaders"); |
| 72 |
set_i(I, cSetting_volume_bit_depth, 8); |
| 73 |
set_color(I, cSetting_volume_color, "-1"); |
| 74 |
set_f(I, cSetting_volume_layers, 256); |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 sci-chemistry/pymol/files/1.4.1-data-path.patch |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4.1-data-path.patch?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pymol/files/1.4.1-data-path.patch?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: 1.4.1-data-path.patch |
| 84 |
=================================================================== |
| 85 |
modules/chempy/__init__.py | 2 +- |
| 86 |
modules/chempy/tinker/__init__.py | 2 +- |
| 87 |
modules/pymol/commanding.py | 6 +++--- |
| 88 |
modules/pymol/importing.py | 2 +- |
| 89 |
modules/pymol/wizard/mutagenesis.py | 4 ++-- |
| 90 |
5 files changed, 8 insertions(+), 8 deletions(-) |
| 91 |
|
| 92 |
diff --git a/modules/chempy/__init__.py b/modules/chempy/__init__.py |
| 93 |
index 998e8f8..02fe156 100644 |
| 94 |
--- a/modules/chempy/__init__.py |
| 95 |
+++ b/modules/chempy/__init__.py |
| 96 |
@@ -229,7 +229,7 @@ if os.environ.has_key('CHEMPY_DATA'): # |
| 97 |
elif os.environ.has_key('PYMOL_DATA'): |
| 98 |
path = os.environ['PYMOL_DATA'] + '/chempy/' |
| 99 |
elif os.environ.has_key('PYMOL_PATH'): |
| 100 |
- path = os.environ['PYMOL_PATH'] + '/data/chempy/' |
| 101 |
+ path = os.environ['PYMOL_PATH'] + '/chempy/' |
| 102 |
elif os.environ.has_key('FREEMOL_MODULES'): |
| 103 |
path = os.environ['FREEMOL_MODULES'] + '/chempy/' |
| 104 |
else: |
| 105 |
diff --git a/modules/chempy/tinker/__init__.py b/modules/chempy/tinker/__init__.py |
| 106 |
index a2d8eb1..1e48f81 100644 |
| 107 |
--- a/modules/chempy/tinker/__init__.py |
| 108 |
+++ b/modules/chempy/tinker/__init__.py |
| 109 |
@@ -147,7 +147,7 @@ else: |
| 110 |
|
| 111 |
if os.environ.has_key('PYMOL_PATH'): |
| 112 |
pymol_path = os.environ['PYMOL_PATH'] |
| 113 |
- test_path = pymol_path + '/data/chempy/tinker/' |
| 114 |
+ test_path = pymol_path + '/chempy/tinker/' |
| 115 |
if os.path.exists(test_path): |
| 116 |
params_path = test_path |
| 117 |
|
| 118 |
diff --git a/modules/pymol/commanding.py b/modules/pymol/commanding.py |
| 119 |
index 5a202d0..5cb27a6 100644 |
| 120 |
--- a/modules/pymol/commanding.py |
| 121 |
+++ b/modules/pymol/commanding.py |
| 122 |
@@ -219,11 +219,11 @@ USAGE |
| 123 |
_self.unlock(0,_self) |
| 124 |
r = DEFAULT_SUCCESS |
| 125 |
if show_splash==1: # generic / open-source |
| 126 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png") |
| 127 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png") |
| 128 |
elif show_splash==2: # evaluation builds |
| 129 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png") |
| 130 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png") |
| 131 |
else: # incentive builds |
| 132 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png") |
| 133 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png") |
| 134 |
if os.path.exists(png_path): |
| 135 |
_self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path) |
| 136 |
else: |
| 137 |
diff --git a/modules/pymol/importing.py b/modules/pymol/importing.py |
| 138 |
index 1ccf986..72ae9f3 100644 |
| 139 |
--- a/modules/pymol/importing.py |
| 140 |
+++ b/modules/pymol/importing.py |
| 141 |
@@ -191,7 +191,7 @@ SEE ALSO |
| 142 |
''' |
| 143 |
r = DEFAULT_ERROR |
| 144 |
|
| 145 |
- tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png", |
| 146 |
+ tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png", |
| 147 |
'pymol' : 'pymol', |
| 148 |
'rgb' : 'rgb', |
| 149 |
'greyscale': 'greyscale' } |
| 150 |
diff --git a/modules/pymol/wizard/mutagenesis.py b/modules/pymol/wizard/mutagenesis.py |
| 151 |
index 8a5250d..6c1b26c 100644 |
| 152 |
--- a/modules/pymol/wizard/mutagenesis.py |
| 153 |
+++ b/modules/pymol/wizard/mutagenesis.py |
| 154 |
@@ -53,7 +53,7 @@ class Mutagenesis(Wizard): |
| 155 |
self.dep = default_dep |
| 156 |
|
| 157 |
self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ |
| 158 |
- "/data/chempy/sidechains/sc_bb_ind.pkl") |
| 159 |
+ "/chempy/sidechains/sc_bb_ind.pkl") |
| 160 |
self.load_library() |
| 161 |
self.status = 0 # 0 no selection, 1 mutagenizing |
| 162 |
self.bump_check = 1 |
| 163 |
@@ -218,7 +218,7 @@ class Mutagenesis(Wizard): |
| 164 |
if self.dep == 'dep': |
| 165 |
if not hasattr(self,'dep_library'): |
| 166 |
self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ |
| 167 |
- "/data/chempy/sidechains/sc_bb_dep.pkl") |
| 168 |
+ "/chempy/sidechains/sc_bb_dep.pkl") |
| 169 |
|
| 170 |
def set_mode(self,mode): |
| 171 |
cmd=self.cmd |
Archives