| 1 |
jlec 10/06/25 17:21:42 |
| 2 |
|
| 3 |
Added: wxmacmolplt-7.4-flash.patch |
| 4 |
wxmacmolplt-7.4-glew.patch |
| 5 |
Log: |
| 6 |
Removed old, fixes for gl handling and flash support |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-flash.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wxmacmolplt-7.4-flash.patch |
| 16 |
=================================================================== |
| 17 |
--- src/swfexport.cpp.orig 2008-12-09 03:29:53.000000000 +0100 |
| 18 |
+++ src/swfexport.cpp 2010-06-25 14:29:41.788052169 +0200 |
| 19 |
@@ -204,11 +204,11 @@ |
| 20 |
movie->nextFrame(); |
| 21 |
movie->remove(di); |
| 22 |
movie->remove(textDI); |
| 23 |
- delete di; |
| 24 |
- delete textDI; |
| 25 |
+ //delete di; |
| 26 |
+ //delete textDI; |
| 27 |
if(includeEP) { |
| 28 |
movie->remove(di2); |
| 29 |
- delete di2; |
| 30 |
+ // delete di2; |
| 31 |
} |
| 32 |
} |
| 33 |
|
| 34 |
@@ -366,8 +366,8 @@ |
| 35 |
movie->nextFrame(); |
| 36 |
movie->remove(di); |
| 37 |
movie->remove(textDI); |
| 38 |
- delete di; |
| 39 |
- delete textDI; |
| 40 |
+ //delete di; |
| 41 |
+ //delete textDI; |
| 42 |
|
| 43 |
for (iatm=0; iatm<(lFrame->NumAtoms); iatm++) { |
| 44 |
lAtoms[iatm].Position.x += offsetFactor * (ModeOffset[iatm].x); |
| 45 |
|
| 46 |
|
| 47 |
1.1 sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.4-glew.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: wxmacmolplt-7.4-glew.patch |
| 53 |
=================================================================== |
| 54 |
diff --git a/configure.ac b/configure.ac |
| 55 |
index 5e88d06..311abfe 100644 |
| 56 |
--- a/configure.ac |
| 57 |
+++ b/configure.ac |
| 58 |
@@ -20,7 +20,7 @@ case "${host}" in |
| 59 |
;; |
| 60 |
*) |
| 61 |
HOST=LINUX |
| 62 |
- LIBGL="-lGL -lGLU" |
| 63 |
+ LIBGL=`pkg-config --libs glu glew` |
| 64 |
;; |
| 65 |
esac |
| 66 |
AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW]) |
| 67 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 68 |
index 4d47ea3..3cb6614 100644 |
| 69 |
--- a/src/Makefile.am |
| 70 |
+++ b/src/Makefile.am |
| 71 |
@@ -24,8 +24,6 @@ wxmacmolplt_SOURCES = \ |
| 72 |
frequenciesdialog.cpp frequenciesdialog.h \ |
| 73 |
GaussHermite.cpp GaussHermite.h \ |
| 74 |
Geometries.cpp Geometries.h \ |
| 75 |
- glew.cpp glew.h \ |
| 76 |
- glxew.h wglew.h \ |
| 77 |
glf.cpp glf.h \ |
| 78 |
GlobalExceptions.h \ |
| 79 |
Globals.h \ |
| 80 |
diff --git a/src/mmp_gl.h b/src/mmp_gl.h |
| 81 |
index daa1eb7..1345b90 100644 |
| 82 |
--- a/src/mmp_gl.h |
| 83 |
+++ b/src/mmp_gl.h |
| 84 |
@@ -1,7 +1,7 @@ |
| 85 |
#ifndef MMP_GL_H |
| 86 |
#define MMP_GL_H |
| 87 |
|
| 88 |
-#include "glew.h" |
| 89 |
+#include <GL/glew.h> |
| 90 |
#include <wx/wx.h> |
| 91 |
#include <wx/glcanvas.h> |
| 92 |
#include <string> |
Archives