rpms/meshlab/F-13 import.log, NONE, 1.1 meshlab-48x48.xpm, NONE, 1.1 meshlab-plugin-path.patch, NONE, 1.1 meshlab-shader-path.patch, NONE, 1.1 meshlab-sharedlib.patch, NONE, 1.1 meshlab-vcglib-namespace.patch, NONE, 1.1 meshlab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Eric Smith
brouhaha at fedoraproject.org
Thu May 13 22:42:28 UTC 2010
Author: brouhaha
Update of /cvs/pkgs/rpms/meshlab/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9913/F-13
Modified Files:
.cvsignore sources
Added Files:
import.log meshlab-48x48.xpm meshlab-plugin-path.patch
meshlab-shader-path.patch meshlab-sharedlib.patch
meshlab-vcglib-namespace.patch meshlab.spec
Log Message:
* Mon May 3 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-4
- in prep, remove bundled getopt library sources, to ensure
that we're using the system library instead
- include doc tag for poisson filter license.txt
- add BSD to license tag
- correct typo in comment in spec
--- NEW FILE import.log ---
meshlab-1_2_2-4_fc12:F-13:meshlab-1.2.2-4.fc12.src.rpm:1273790513
--- NEW FILE meshlab-48x48.xpm ---
/* XPM */
static char *meshlab__[] = {
/* columns rows colors chars-per-pixel */
"48 48 116 2",
" c #060606",
". c #0B0B0B",
"X c #0E120D",
"o c #101A0F",
"O c #141414",
"+ c #141C13",
"@ c #1B1C1B",
"# c #221F1F",
"$ c #182416",
"% c #1E201D",
"& c #212A1E",
"* c #23361F",
"= c #242424",
"- c #2C2B2B",
"; c #312E2E",
": c #253223",
"> c #303E2A",
", c #313131",
"< c #383535",
"1 c #323C31",
"2 c #3B3C3B",
"3 c #32492D",
"4 c #374434",
"5 c #374C30",
"6 c #3B4C36",
"7 c #345331",
"8 c #3E613A",
"9 c #45623F",
"0 c #444444",
"q c #4B4B4B",
"w c #4F544E",
"e c #535353",
"r c #5B5A5A",
"t c #645E5E",
"y c #53694B",
"u c #4A7347",
"i c #4E724C",
"p c #4D7C49",
"a c #53744D",
"s c #507E4C",
"d c #5A6059",
"f c #587652",
"g c #547950",
"h c #5B795A",
"j c #636363",
"k c #6C6C6C",
"l c #6B736B",
"z c #747474",
"x c #7B7B7B",
"c c #54824F",
"v c #558450",
"b c #578952",
"n c #5D8F58",
"m c #5D9258",
"M c #63975D",
"N c #62985C",
"B c #6F8268",
"V c #708B6F",
"C c #679C60",
"Z c #739566",
"A c #728B70",
"S c #799177",
"D c #7A9C70",
"F c #7A9279",
"G c #71A16A",
"H c #73A96B",
"J c #7EB476",
"K c #83937C",
"L c #84A775",
"P c #87A978",
"I c #83BA7B",
"U c #838383",
"Y c #8B8787",
"T c #8C8C8C",
"R c #948B8B",
"E c #849583",
"W c #8C9E8B",
"Q c #949494",
"! c #9B9B9B",
"~ c #8FA18E",
"^ c #90A08E",
"/ c #89BF80",
"( c #94BD86",
") c #92A291",
"_ c #9FA09F",
"` c #A3A3A3",
"' c #ABA4A4",
"] c #A5ACA4",
"[ c #ABABAB",
"{ c #A8B3A8",
"} c #B3B3B3",
"| c #BCB4B4",
" . c #BDBDBD",
".. c #8CC282",
"X. c #91C386",
"o. c #93C689",
"O. c #9CC58B",
"+. c #97C88B",
"@. c #9CCA8E",
"#. c #9BCB90",
"$. c #A1CC93",
"%. c #B7C1B7",
"&. c #BCC1BC",
"*. c #C3C3C3",
"=. c #CCC3C3",
"-. c #CCCCCC",
";. c #D4D4D4",
":. c #DAD6D6",
">. c #DCDCDC",
",. c #E1DFDF",
"<. c #E3E3E3",
"1. c #EAEAEA",
"2. c #F0EEEE",
"3. c #F4F4F4",
"4. c #F8F8F8",
"5. c None",
/* pixels */
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.<.<.<.<.<.<.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.>.>.<.<.<.<.<.<.<.<.<.<.<.>.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.>.>.>.<.<.<.<.<.<.<.>.>.>.>.>.>.>.:.;.;.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.>.>.>.<.<.<.<.<.<.>.>.>.>.>.:.:.:.;.;.;.;.-.-.*.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.>.>.<.<.<.<.<.<.<.>.>.>.>.:.;.;.;.;.;.-.-.-.-.*.*. .5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.<.<.<.<.<.<.<.<.<.>.>.>.>.:.;.;.-.-.-.-.-.-.*.*.*. . .} [ ! 5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.<.<.<.<.<.<.<.<.<.>.>.>.:.;.;.-.-.-.-.*.*.*.*.*. . . .[ U z k z 5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.<.<.<.1.1.1.<.<.<.>.>.:.;.;.;.-.-.*.*.*.*.*. . . . .! T r r 0 e < , 5.5.5.5.5.5.5.",
"5.5.5.5.5.5.<.<.1.1.1.1.1.<.<.>.>.:.;.;.-.*.*.*. . . . . .} [ Q z q 0 < 0 q r j k T 5.5.5.5.5.5.",
"5.5.5.5.5.5.<.<.1.1.1.1.1.<.>.>.:.;.-.-.*.*. . . . . .} ! Y z 0 2 e 0 q k U Q ! [ } 5.5.5.5.5.5.",
"5.5.5.5.5.<.<.1.1.1.1.1.<.<.>.:.;.;.-.*.*. . . .} } ` U r e 0 2 e k z z Q ` [ } | . .5.5.5.5.5.",
"5.5.5.5.<.<.<.1.1.1.1.<.<.>.:.;.-.-.*.*. . . .} k k j q e r z z U T Q ! ` ` ` ` ' [ [ } 5.5.5.5.",
"5.5.5.5.<.<.<.1.1.1.<.<.>.:.;.-.-.*.*. . .} ! x e k k j x Y U U T T T T T T T T Q Q ! ` 5.5.5.5.",
"5.5.5.>.<.<.<.1.1.<.<.<.:.;.-.-.*.*. . .[ T z j U x U Y T Y U x x x z z z z x x U U T Q ! 5.5.5.",
"5.5.5.>.<.<.<.1.<.<.<.>.;.-.*.*.*. . .[ Q Q Q ! Q U x r r j q e q q r r r j j j k z x U Y 5.5.5.",
"5.5.5.>.<.<.<.<.<.<.>.:.-.*.*. . . . .} [ ! U x j q 2 , < , , - = , < , 2 0 0 q e j k z j < 5.5.",
"5.5.:.>.<.<.<.<.<.<.>.;.-.*. . . . .} ` T j e q , = = = = @ @ O O @ @ @ = - - < 0 e r r 2 , 5.5.",
"5.5.:.>.<.<.<.<.<.>.;.-.*. . . . .[ Q k q < , = O O O . . . . . . . O @ = = - 2 , = = 5.5.",
"5.5.;.>.<.<.<.<.>.:.;.*. . . .} ` T j 2 - @ O . O @ & : : $ 2 q 0 < = O . . . . O @ @ = = - 5.5.",
"5.;.:.>.<.<.<.<.>.;.-.*. . .} ! x r , @ O = % X + > y f a 7 l ` ! Y k , . . O @ @ = - - 5.",
"5.;.:.>.<.<.<.<.>.;.-.*. .[ T k 0 = . % d ] w X o 5 L ( J v E 3.1.,.| r . . O @ @ - , 5.",
"5.;.:.<.<.1.<.>.:.-.*. .} Q k 0 @ O & 6 B K 4 o $ 9 ( #.I b W 4.4.1.=.t . . O O @ = - , < 5.",
"5.;.>.<.1.1.<.>.;.-.*. .! z q @ O + 3 a D P 9 * 3 Z $.o.J p { 4.4.1.=.e . . O - - , , , , < 5.",
"5.:.>.<.1.1.>.:.;.*. .[ x e = @ q 1 8 G X.$.O.( O.$.#./ C i <.4.4.<.| ; . O O O - , , , , , < 5.",
"5.>.<.1.1.<.>.;.-.*.} ! k < O < z x 9 M I o. at .@.$.+...H v W 3.4.3.:.R @ @ @ @ = - , , , , , < 5.",
"5.>.<.1.<.<.:.;.-. .} Q j = . 2 ! -.E u N I ....X.I H s A >.4.4.2.=.t O = - , 2 2 , , , , , , 5.",
"5.<.<.<.<.>.;.-.*. .[ T j 2 O - T ;.1.] h s b m n c g ^ <.4.4.3.>.R # = - , 2 e r < , , , , < 5.",
"5.5.<.<.>.:.;.-.*.} [ Q k q , @ = q Q *.&.) F V S ~ %.1.4.4.3.,.' < @ - , , r x z 2 , , , , 5.5.",
"5.5.<.>.>.;.-.*. .} ' Q z e 2 - = O O , r _ *.>.1.3.4.4.4.3.:.Y , @ , 0 0 q z T U 0 , , , , 5.5.",
"5.5.>.>.;.-.*.*. .} [ ! U k e 2 < , = O . . @ < r k x T Y j - @ - 2 2 e j U Q ` ! q , , , , 5.5.",
"5.5.5.:.;.-.*. . . .[ ` Q x k e q 0 0 2 - @ @ @ O O O O @ @ = 2 2 q 0 z U Q [ } ` q , , , , 5.5.",
"5.5.5.;.-.*. . . . .} ' ! T U z k j r r e - , - , < < 2 0 < < e j j x T [ } . .` q , , , 5.5.5.",
"5.5.5.-.*.*. . . . . .} ` ! Q T U x z z k r r 0 r q j e k j q r T x [ } . . . .! 0 , , , 5.5.5.",
"5.5.5.5.*. . . . . . . .} [ ` ! Q T Y U U x x k U k x x Y U U U ` [ . . . . . .Q 0 , , 5.5.5.5.",
"5.5.5.5. . . . . . . . . .} } [ ` ! ! Q Q Q Q Q ! Q ! ` ' [ } } . . . . . . . .T 2 , , 5.5.5.5.",
"5.5.5.5.5. . . . . . . . . . . .} } } [ [ [ [ [ } } } . . . . . . . . . . . . .U 2 , 5.5.5.5.5.",
"5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .} z < 5.5.5.5.5.5.",
"5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .[ r , 5.5.5.5.5.5.",
"5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .! 0 5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .Y 5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5. . . . . . . . .5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.",
"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5."
};
meshlab-plugin-path.patch:
interfaces.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE meshlab-plugin-path.patch ---
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlab/interfaces.h.plugin-path meshlab-snapshot-svn3524/meshlab/src/meshlab/interfaces.h
--- meshlab-snapshot-svn3524/meshlab/src/meshlab/interfaces.h.plugin-path 2010-02-02 18:38:30.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlab/interfaces.h 2010-02-02 18:39:29.000000000 -0800
@@ -199,7 +199,7 @@ public:
static QString getPluginDirPath()
{
- QDir pluginsDir(getBaseDirPath());
+ QDir pluginsDir(QString(PLUGIN_DIR));
if(!pluginsDir.exists("plugins"))
QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory.");
meshlab-shader-path.patch:
fgt/render_rfx/render_rfx.cpp | 2 +-
meshlabplugins/filter_ao/filter_ao.cpp | 2 +-
meshlabplugins/render_gdp/meshrender.cpp | 2 +-
meshlabplugins/render_gdp/shaderDialog.cpp | 4 ++--
meshlabplugins/render_splatpyramid/dialog.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE meshlab-shader-path.patch ---
diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/render_rfx/render_rfx.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/fgt/render_rfx/render_rfx.cpp
--- meshlab-snapshot-svn3524/meshlab/src/fgt/render_rfx/render_rfx.cpp.shader-path 2010-02-02 19:28:32.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/fgt/render_rfx/render_rfx.cpp 2010-02-02 19:29:03.000000000 -0800
@@ -54,7 +54,7 @@ QList<QAction*> RenderRFX::actions()
void RenderRFX::initActionList()
{
- QDir shadersDir = QDir(qApp->applicationDirPath());
+ QDir shadersDir = QDir("/usr/share/meshlab");
#if defined(Q_OS_WIN)
if (shadersDir.dirName() == "debug" ||
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp.shader-path 2010-02-02 19:12:32.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp 2010-02-02 19:13:24.000000000 -0800
@@ -818,7 +818,7 @@ void AmbientOcclusionPlugin::applyOcclus
void AmbientOcclusionPlugin::set_shaders(char *shaderName, GLuint &v, GLuint &f, GLuint &pr)
{
- QDir shadersDir = QDir(qApp->applicationDirPath());
+ QDir shadersDir = QDir("/usr/share/meshlab");
#if defined(Q_OS_WIN)
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp.shader-path 2010-02-02 19:23:58.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2010-02-02 19:24:20.000000000 -0800
@@ -110,7 +110,7 @@ void MeshShaderRenderPlugin::initActionL
qaNone->setCheckable(false);
actionList << qaNone;
- QDir shadersDir = QDir(qApp->applicationDirPath());
+ QDir shadersDir = QDir("/usr/share/meshlab");
#if defined(Q_OS_WIN)
if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release" || shadersDir.dirName() == "plugins" )
shadersDir.cdUp();
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp.shader-path 2010-02-02 19:27:14.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp 2010-02-02 19:27:52.000000000 -0800
@@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int
void ShaderDialog::browseTexturePath(int i) {
QFileDialog fd(0,"Choose new texture");
- QDir shadersDir = QDir(qApp->applicationDirPath());
+ QDir shadersDir = QDir("/usr/share/meshlab");
#if defined(Q_OS_WIN)
if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
shadersDir.cdUp();
@@ -372,4 +372,4 @@ void ShaderDialog::reloadTexture(int i)
glTexParameteri( shaderInfo->textureInfo[i].Target, GL_TEXTURE_WRAP_R, shaderInfo->textureInfo[i].WrapR );
glarea->updateGL();
-}
\ No newline at end of file
+}
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp.shader-path 2010-02-02 19:15:34.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp 2010-02-02 19:16:07.000000000 -0800
@@ -123,7 +123,7 @@ void Dialog::changeTexturePath(int i) {
void Dialog::browseTexturePath(int i) {
QFileDialog fd(0,"Choose new texture");
- QDir shadersDir = QDir(qApp->applicationDirPath());
+ QDir shadersDir = QDir("/usr/share/meshlab");
#if defined(Q_OS_WIN)
if (shadersDir.dirName() == "debug" || shadersDir.dirName() == "release")
shadersDir.cdUp();
meshlab-sharedlib.patch:
fgt/filter_func/filter_func.pro | 4 -
fgt/filter_qhull/filter_qhull.pro | 25 ----------
fgt/filter_qhull/qhull_tools.h | 16 +++---
meshlab/meshlab.pro | 13 +----
meshlabplugins/edit_phototexturing/edit_phototexturing.pro | 1
meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro | 5 --
meshlabplugins/filter_isoparametrization/param_collapse.h | 2
meshlabplugins/filter_isoparametrization/parametrizator.h | 4 -
meshlabplugins/io_3ds/io_3ds.pro | 4 -
meshlabplugins/io_epoch/io_epoch.pro | 4 -
meshlabserver/meshlabserver.pro | 12 +---
shared.pri | 7 +-
12 files changed, 32 insertions(+), 65 deletions(-)
--- NEW FILE meshlab-sharedlib.patch ---
diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro
--- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro.sharedlib 2009-05-20 08:27:47.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_func/filter_func.pro 2010-01-26 17:22:25.000000000 -0800
@@ -7,7 +7,7 @@ SOURCES = filter_func.cpp\
TARGET = filter_func
-INCLUDEPATH += ../../external/muparser_v130/include
+INCLUDEPATH +=
# Note: we need static libs so when building muparser lib use
# ./configure --enable-shared=no
@@ -15,5 +15,5 @@ INCLUDEPATH += ../../external/muparser_v
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
macx:LIBS += ../../external/lib/macx/libmuparser.a
-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a
+linux-g++:LIBS += -lmuparser
win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
\ No newline at end of file
diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro
--- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro.sharedlib 2009-03-05 16:09:52.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2010-01-26 17:22:25.000000000 -0800
@@ -12,29 +12,8 @@ SOURCES = filter_qhull.cpp \
../../meshlab/filterparameter.cpp
-HEADERS += ../../external/qhull-2003.1/src/geom.h \
- ../../external/qhull-2003.1/src/io.h \
- ../../external/qhull-2003.1/src/mem.h \
- ../../external/qhull-2003.1/src/merge.h \
- ../../external/qhull-2003.1/src/poly.h \
- ../../external/qhull-2003.1/src/qhull.h \
- ../../external/qhull-2003.1/src/qset.h \
- ../../external/qhull-2003.1/src/stat.h \
- ../../external/qhull-2003.1/src/user.h
+INCLUDEPATH += /usr/include/qhull
-SOURCES += ../../external/qhull-2003.1/src/geom.c \
- ../../external/qhull-2003.1/src/geom2.c \
- $$GLEWCODE \
- ../../external/qhull-2003.1/src/global.c \
- ../../external/qhull-2003.1/src/io.c \
- ../../external/qhull-2003.1/src/mem.c \
- ../../external/qhull-2003.1/src/merge.c \
- ../../external/qhull-2003.1/src/poly.c \
- ../../external/qhull-2003.1/src/poly2.c \
- ../../external/qhull-2003.1/src/qconvex.c \
- ../../external/qhull-2003.1/src/qhull.c \
- ../../external/qhull-2003.1/src/qset.c \
- ../../external/qhull-2003.1/src/stat.c \
- ../../external/qhull-2003.1/src/user.c
+LIBS += -lqhull
TARGET = filter_qhull
\ No newline at end of file
diff -up meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h
--- meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h.sharedlib 2009-05-30 09:08:03.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/fgt/filter_qhull/qhull_tools.h 2010-01-26 17:22:25.000000000 -0800
@@ -55,14 +55,14 @@ extern "C"
#endif
#include <stdio.h>
#include <stdlib.h>
-#include "../../external/qhull-2003.1/src/qhull.h"
-#include "../../external/qhull-2003.1/src/mem.h"
-#include "../../external/qhull-2003.1/src/qset.h"
-#include "../../external/qhull-2003.1/src/geom.h"
-#include "../../external/qhull-2003.1/src/merge.h"
-#include "../../external/qhull-2003.1/src/poly.h"
-#include "../../external/qhull-2003.1/src/io.h"
-#include "../../external/qhull-2003.1/src/stat.h"
+#include <qhull/qhull.h>
+#include <qhull/mem.h>
+#include <qhull/qset.h>
+#include <qhull/geom.h>
+#include <qhull/merge.h>
+#include <qhull/poly.h>
+#include <qhull/io.h>
+#include <qhull/stat.h>
#if defined(__cplusplus)
}
#endif
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro.sharedlib 2009-07-06 09:45:12.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/meshlab/meshlab.pro 2010-01-26 17:22:25.000000000 -0800
@@ -1,13 +1,11 @@
VCGDIR = ../../../vcglib
-GLEWDIR = ../external/glew-1.5.1
-GLEWCODE = $$GLEWDIR/src/glew.c
-DEFINES *= GLEW_STATIC
+LIBS += -lGLEW
CONFIG += debug_and_release precompile_header
# uncomment to try Eigen
# DEFINES += VCG_USE_EIGEN
# CONFIG += warn_off
-INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include
+INCLUDEPATH *= ../.. $$VCGDIR
DEPENDPATH += $$VCGDIR $$VCGDIR/vcg $$VCGDIR/wrap
PRECOMPILED_HEADER = mainwindow.h
@@ -51,8 +49,7 @@ SOURCES = main.cpp \
changetexturename.cpp \
stdpardialog.cpp \
$$VCGDIR/wrap/gui/trackball.cpp\
- $$VCGDIR/wrap/gui/trackmode.cpp \
- $$GLEWCODE
+ $$VCGDIR/wrap/gui/trackmode.cpp
FORMS = ui/layerDialog.ui \
ui/filterScriptDialog.ui \
@@ -102,9 +99,7 @@ mac:QMAKE_CXX=g++-4.2
# macx-g++:QMAKE_CXXFLAGS_RELEASE -= -Os
# macx-g++:QMAKE_CXXFLAGS_RELEASE += -O3
-DEFINES += GLEW_STATIC
-
-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
+INCLUDEPATH += . .. ../../../vcglib
CONFIG += stl
# uncomment in your local copy only in emergency cases.
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro.sharedlib 2009-05-18 08:12:15.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro 2010-01-26 17:22:25.000000000 -0800
@@ -30,7 +30,6 @@ SOURCES += edit_phototex_factory.cpp \
src/QuadTree/QuadTreeNode.cpp \
$$VCGDIR/wrap/gui/trackball.cpp\
$$VCGDIR/wrap/gui/trackmode.cpp \
- $$GLEWDIR/src/glew.c \
../../meshlab/filterparameter.cpp \
../../meshlab/stdpardialog.cpp
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib 2010-01-26 17:53:15.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2010-01-26 17:53:44.000000000 -0800
@@ -28,8 +28,7 @@ SOURCES = ./filter_isoparametrizat
$$GLEWCODE
TARGET = filter_isoparametrization
-INCLUDEPATH += ./ \
- ../../external/levmar-2.3/
+INCLUDEPATH += ./
win32-msvc2005:QMAKE_CXXFLAGS += /openmp
win32-msvc2008:QMAKE_CXXFLAGS += /openmp
@@ -40,7 +39,7 @@ win32-msvc.net:LIBS += ../../external/li
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib
win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
-linux-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
+linux-g++:LIBS += -llevmar
macx:LIBS += ../../external/lib/macx/liblevmar.a
QMAKE_CXXFLAGS += -fpermissive
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib 2010-01-26 17:51:30.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2010-01-26 17:51:56.000000000 -0800
@@ -12,7 +12,7 @@
#include <local_parametrization.h>
#include <mesh_operators.h>
#include <vcg/space/color4.h>
-#include <lm.h>
+#include <levmar.h>
#include <uv_grid.h>
#include "opt_patch.h"
#include "local_optimization.h"
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib 2010-01-26 17:51:37.000000000 -0800
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2010-01-26 17:52:11.000000000 -0800
@@ -30,7 +30,7 @@
#include <vcg/space/color4.h>
#include <dual_coord_optimization.h>
#include <float.h>
-#include <lm.h>
+#include <levmar.h>
#include <wrap/io_trimesh/export_ply.h>
//#include <EquilaterizeMesh.h>
@@ -914,4 +914,4 @@ public:
};
-#endif
\ No newline at end of file
+#endif
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib 2009-07-06 09:45:12.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2010-01-26 17:22:25.000000000 -0800
@@ -14,7 +14,7 @@ SOURCES = meshio.cpp \
TARGET = io_3ds
-INCLUDEPATH += ../../external/lib3ds-1.3.0/
+INCLUDEPATH += /usr/include/lib3ds/
# Notes on the paths of lib3ds files.
# Once you have compiled the library put the lib files in a dir named lib/XXX/
@@ -25,7 +25,7 @@ win32-msvc.net:LIBS += ../../external/li
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
+linux-g++:LIBS += -l3ds
# unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro.sharedlib 2009-09-01 01:33:26.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2010-01-26 17:22:25.000000000 -0800
@@ -31,12 +31,12 @@ QT += xml
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a
+linux-g++:LIBS += -lbz2
win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
+linux-g++:INCLUDEPATH +=
mac:LIBS += -lbz2
unix:LIBS += -lbz2
diff -up meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro
--- meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2009-05-20 07:51:45.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/meshlabserver/meshlabserver.pro 2010-01-26 17:22:25.000000000 -0800
@@ -1,5 +1,4 @@
-GLEWDIR = ../external/glew-1.5.1
-GLEWCODE = $$GLEWDIR/src/glew.c
+LIBS += -lGLEW
HEADERS = ../meshlab/interfaces.h \
../meshlab/meshmodel.h \
@@ -10,8 +9,7 @@ SOURCES = mainserver.cpp \
../meshlab/meshmodel.cpp \
../meshlab/filterscript.cpp \
../meshlab/filterparameter.cpp \
- ../meshlab/plugin_support.cpp \
- $$GLEWCODE
+ ../meshlab/plugin_support.cpp
# to add windows icon
RC_FILE = ../meshlab/meshlab.rc
@@ -22,11 +20,9 @@ QT += xml opengl
# the awful min/max macros of windows and the limits max
win32:DEFINES += NOMINMAX
-DEFINES += GLEW_STATIC
-
-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
+INCLUDEPATH += . .. ../../../vcglib
CONFIG += stl
CONFIG += console
# Mac specific Config required to avoid to make application bundles
-CONFIG -= app_bundle
\ No newline at end of file
+CONFIG -= app_bundle
diff -up meshlab-snapshot-svn3524/meshlab/src/shared.pri.sharedlib meshlab-snapshot-svn3524/meshlab/src/shared.pri
--- meshlab-snapshot-svn3524/meshlab/src/shared.pri.sharedlib 2009-07-07 08:12:05.000000000 -0700
+++ meshlab-snapshot-svn3524/meshlab/src/shared.pri 2010-01-26 17:22:25.000000000 -0800
@@ -6,15 +6,14 @@ CONFIG += plugin
QT += xml
VCGDIR = ../../../../vcglib
-GLEWDIR = ../../external/glew-1.5.1
-GLEWCODE = $$GLEWDIR/src/glew.c
-DEFINES *= GLEW_STATIC
+GLEWCODE =
+LIBS += -lGLEW
# uncomment to try Eigen
# DEFINES += VCG_USE_EIGEN
# CONFIG += warn_off
-INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include
+INCLUDEPATH *= ../.. $$VCGDIR /usr/include/GL
# Uncomment these if you want to experiment with newer gcc compilers
# (here using the one provided with macports)
meshlab-vcglib-namespace.patch:
hole.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE meshlab-vcglib-namespace.patch ---
diff -uNr meshlab-snapshot-svn3524.orig/vcglib/vcg/complex/trimesh/hole.h meshlab-snapshot-svn3524/vcglib/vcg/complex/trimesh/hole.h
--- meshlab-snapshot-svn3524.orig/vcglib/vcg/complex/trimesh/hole.h 2008-11-26 09:58:15.000000000 -0800
+++ meshlab-snapshot-svn3524/vcglib/vcg/complex/trimesh/hole.h 2010-01-22 14:04:28.000000000 -0800
@@ -201,7 +201,7 @@
assert(e0.IsBorder());
e1=e0;
e1.NextB();
- n=Normal<TrivialEar>(*this);
+ n=vcg::Normal<TrivialEar>(*this);
ComputeQuality();
ComputeAngle();
}
--- NEW FILE meshlab.spec ---
Summary: A system for processing and editing unstructured 3D triangular meshes
Name: meshlab
Version: 1.2.2
Release: 4%{?dist}
URL: http://meshlab.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/MeshLabSrc_v122.tar.gz
Source1: meshlab-48x48.xpm
# Fedora-specific patches to use shared libraries, and to put plugins and
# shaders in appropriate directories
Patch0: meshlab-sharedlib.patch
Patch1: meshlab-plugin-path.patch
Patch2: meshlab-shader-path.patch
# patch to fix C++ namespace conflict
# http://sourceforge.net/tracker/?func=detail&aid=2872526&group_id=149444&atid=774731
Patch3: meshlab-vcglib-namespace.patch
License: GPLv2+ and BSD
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
BuildRequires: glew-devel
BuildRequires: levmar-devel
BuildRequires: lib3ds-devel
BuildRequires: muParser-devel
BuildRequires: qhull-devel
BuildRequires: qt-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
%description
MeshLab is an open source, portable, and extensible system for the
processing and editing of unstructured 3D triangular meshes. The
system is aimed to help the processing of the typical not-so-small
unstructured models arising in 3D scanning, providing a set of tools
for editing, cleaning, healing, inspecting, rendering and converting
these kinds of meshes.
%prep
%setup -q -n meshlab-snapshot-svn3524
%patch -P 0 -p1 -b .sharedlib
%patch -P 1 -p1 -b .plugin-path
%patch -P 2 -p1 -b .shader-path
%patch -P 3 -p1 -b .vcglib-namespace
# Turn of execute permissions on source files to avoid rpmlint
# errors and warnings for the debuginfo package
find . \( -name *.h -o -name *.cpp -o -name *.inl \) -a -executable \
-exec chmod -x {} \;
# Remove bundled library sources, since we use the Fedora packaged
# libraries
rm -rf vcglib/wrap/system
%build
# Build instructions from the wiki:
# http://meshlab.sourceforge.net/wiki/index.php/Compiling_V122
# Note that the build instructions in README.linux are out of date.
cd meshlab/src
%{_qt4_qmake} -recursive meshlabv12.pro
make %{?_smp_mflags} CFLAGS="%{optflags}" \
DEFINES="-D__DISABLE_AUTO_STATS__ -DPLUGIN_DIR=\\\"%{_libdir}/%{name}\\\""
# process icon
convert %{SOURCE1} meshlab.png
# create desktop file
cat <<EOF >meshlab.desktop
[Desktop Entry]
Name=meshlab
GenericName=MeshLab 3D triangular mesh processing and editing
Exec=meshlab
Icon=meshlab
Terminal=false
Type=Application
Categories=Graphics;
EOF
# convert doc files from ISO-8859-1 to UTF-8 encoding:
cd ../docs
for f in contrib_Gangemi_Vannini.txt contrib_Buzzelli_Mazzanti.txt
do
iconv -fiso88591 -tutf8 $f >$f.new
touch -r $f $f.new
mv $f.new $f
done
%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{_bindir}
install -p -m 755 meshlab/src/meshlab/meshlab \
meshlab/src/meshlabserver/meshlabserver \
%{buildroot}%{_bindir}
install -d -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 meshlab/docs/meshlab.1 \
meshlab/docs/meshlabserver.1 \
%{buildroot}%{_mandir}/man1
install -d -m 755 %{buildroot}%{_libdir}/meshlab/plugins
install -p -m 755 meshlab/src/meshlab/plugins/*.so \
%{buildroot}%{_libdir}/meshlab/plugins
install -d -m 755 %{buildroot}%{_datadir}/meshlab/shaders
install -p -m 644 meshlab/src/meshlab/shaders/*.{frag,gdp,vert} \
%{buildroot}%{_datadir}/meshlab/shaders
install -d -m 755 %{buildroot}%{_datadir}/meshlab/shadersrm
install -p -m 644 meshlab/src/meshlab/shadersrm/*.rfx \
%{buildroot}%{_datadir}/meshlab/shadersrm
install -d -m 755 %{buildroot}%{_datadir}/meshlab/textures
install -d -m 755 %{buildroot}%{_datadir}/pixmaps
install -p -m 644 meshlab/src/meshlab.png \
%{buildroot}%{_datadir}/pixmaps
install -d -m 755 %{buildroot}%{_datadir}/applications
install -p -m 644 meshlab/src/meshlab.desktop \
%{buildroot}%{_datadir}/applications
desktop-file-validate %{buildroot}%{_datadir}/applications/meshlab.desktop
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/meshlab
%{_bindir}/meshlabserver
%{_libdir}/meshlab/
%{_datadir}/meshlab/
%{_mandir}/man1/*.1.*
%doc meshlab/docs/contrib_Buzzelli_Mazzanti.txt
%doc meshlab/docs/contrib_Gangemi_Vannini.txt
%doc meshlab/docs/contrib_Latronico_Venturi.txt
%doc meshlab/docs/contrib_Mochi_Portelli_Vacca.txt
%doc meshlab/docs/gpl.txt
%doc meshlab/docs/history.txt
%doc meshlab/docs/privacy.txt
%doc meshlab/docs/README.linux
%doc meshlab/docs/readme.txt
%doc meshlab/docs/ToDo.txt
%doc meshlab/src/meshlab/shaders/3Dlabs-license.txt
%doc meshlab/src/meshlab/shaders/LightworkDesign-license.txt
%doc meshlab/src/meshlabplugins/filter_poisson/license.txt
%{_datadir}/applications/meshlab.desktop
%{_datadir}/pixmaps/meshlab.png
%changelog
* Mon May 3 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-4
- in prep, remove bundled getopt library sources, to ensure
that we're using the system library instead
- include doc tag for poisson filter license.txt
- add BSD to license tag
- correct typo in comment in spec
* Wed Apr 7 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-3
- updates based on pre-review comments by Jussi Lehtola
* Tue Apr 6 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-2
- updates based on pre-review comments by Martin Gieseking
* Tue Feb 2 2010 Eric Smith <eric at brouhaha.com> - 1.2.2-1
- initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/meshlab/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 13 May 2010 22:30:35 -0000 1.1
+++ .cvsignore 13 May 2010 22:42:28 -0000 1.2
@@ -0,0 +1 @@
+MeshLabSrc_v122.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/meshlab/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 13 May 2010 22:30:35 -0000 1.1
+++ sources 13 May 2010 22:42:28 -0000 1.2
@@ -0,0 +1 @@
+f06107dd01cbe0d6519dbb759ae84c11 MeshLabSrc_v122.tar.gz
More information about the scm-commits
mailing list