| 1 |
commit: 756d482a75f4c7d7b22f8d83d0fbf3ee42f8f6ef |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 07:58:28 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 07:58:28 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=756d482a |
| 7 |
|
| 8 |
Fixed patches for current HEAD |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/pymol/ChangeLog | 3 ++ |
| 14 |
sci-chemistry/pymol/files/pymol-9999-shaders.patch | 32 ++++++++----------- |
| 15 |
2 files changed, 17 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog |
| 18 |
index 256d96c..d4ba19a 100644 |
| 19 |
--- a/sci-chemistry/pymol/ChangeLog |
| 20 |
+++ b/sci-chemistry/pymol/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 28 Apr 2011; Justin Lecher <jlec@g.o> files/pymol-9999-shaders.patch: |
| 26 |
+ Fixed patches for current HEAD |
| 27 |
+ |
| 28 |
04 Apr 2011; Justin Lecher <jlec@g.o> +files/9999-vmd.patch, |
| 29 |
pymol-9999.ebuild, files/pymol-9999-shaders.patch, metadata.xml: |
| 30 |
Fix to latest head |
| 31 |
|
| 32 |
diff --git a/sci-chemistry/pymol/files/pymol-9999-shaders.patch b/sci-chemistry/pymol/files/pymol-9999-shaders.patch |
| 33 |
index 853ebff..2caac2d 100644 |
| 34 |
--- a/sci-chemistry/pymol/files/pymol-9999-shaders.patch |
| 35 |
+++ b/sci-chemistry/pymol/files/pymol-9999-shaders.patch |
| 36 |
@@ -1,12 +1,8 @@ |
| 37 |
- layer0/ShaderMgr.c | 16 ++++++++-------- |
| 38 |
- layer1/Setting.c | 2 +- |
| 39 |
- 2 files changed, 9 insertions(+), 9 deletions(-) |
| 40 |
- |
| 41 |
-diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c |
| 42 |
-index 929167f..ecb4130 100644 |
| 43 |
---- a/layer0/ShaderMgr.c |
| 44 |
-+++ b/layer0/ShaderMgr.c |
| 45 |
-@@ -386,7 +386,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I) |
| 46 |
+Index: layer0/ShaderMgr.c |
| 47 |
+=================================================================== |
| 48 |
+--- layer0/ShaderMgr.c (revision 3945) |
| 49 |
++++ layer0/ShaderMgr.c (working copy) |
| 50 |
+@@ -400,7 +400,7 @@ |
| 51 |
char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 52 |
FILE* f; |
| 53 |
long size; |
| 54 |
@@ -15,7 +11,7 @@ index 929167f..ecb4130 100644 |
| 55 |
|
| 56 |
PRINTFB(G, FB_ShaderMgr, FB_Debugging) |
| 57 |
"CShaderMgr_ReadShaderFromDisk: fileName='%s'\n", fileName |
| 58 |
-@@ -398,16 +398,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 59 |
+@@ -412,16 +412,16 @@ |
| 60 |
return NULL; |
| 61 |
} |
| 62 |
|
| 63 |
@@ -24,8 +20,8 @@ index 929167f..ecb4130 100644 |
| 64 |
+ pymol_data = getenv("PYMOL_DATA"); |
| 65 |
+ if (!pymol_data){ |
| 66 |
PRINTFB(G, FB_ShaderMgr, FB_Warnings) |
| 67 |
-- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files (%s) from disk\n", fileName ENDFB(G); |
| 68 |
-+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files (%s) from disk\n", fileName ENDFB(G); |
| 69 |
+- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n", fileName ENDFB(G); |
| 70 |
++ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n", fileName ENDFB(G); |
| 71 |
return NULL; |
| 72 |
} |
| 73 |
/* make this a setting */ |
| 74 |
@@ -38,7 +34,7 @@ index 929167f..ecb4130 100644 |
| 75 |
fullFile = strcat(fullFile, shader_path); |
| 76 |
fullFile = strcat(fullFile, fileName); |
| 77 |
|
| 78 |
-@@ -416,7 +416,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { |
| 79 |
+@@ -430,7 +430,7 @@ |
| 80 |
|
| 81 |
if (!f) { |
| 82 |
PRINTFB(G, FB_ShaderMgr, FB_Errors) |
| 83 |
@@ -47,11 +43,11 @@ index 929167f..ecb4130 100644 |
| 84 |
return NULL; |
| 85 |
} else { |
| 86 |
PRINTFB(G, FB_ShaderMgr, FB_Blather) |
| 87 |
-diff --git a/layer1/Setting.c b/layer1/Setting.c |
| 88 |
-index 3aa0b8d..f9b5789 100644 |
| 89 |
---- a/layer1/Setting.c |
| 90 |
-+++ b/layer1/Setting.c |
| 91 |
-@@ -3956,7 +3956,7 @@ void SettingInitGlobal(PyMOLGlobals * G, int alloc, int reset_gui, int use_defau |
| 92 |
+Index: layer1/Setting.c |
| 93 |
+=================================================================== |
| 94 |
+--- layer1/Setting.c (revision 3945) |
| 95 |
++++ layer1/Setting.c (working copy) |
| 96 |
+@@ -3990,7 +3990,7 @@ |
| 97 |
set_b(I, cSetting_line_use_shader, 1); |
| 98 |
set_b(I, cSetting_sphere_use_shader, 1); |
| 99 |
set_b(I, cSetting_use_shaders, 0); /* disable by default until optimized shaders present; doesn't effect vol */ |
Archives