debian/0000755000000000000000000000000012272236527007176 5ustar debian/README.source0000644000000000000000000000422712266255022011354 0ustar Notes on this Debian source package =================================== Source package format --------------------- These Debianized sources are in the standard '3.0 (quilt)' dpkg source format. The patches in 'debian/patches' are generated from the git repository of the package (see the Vcs-Git field in debian/control) by diffing the 'upstream' branch with the corresponding patch branch ('p/*'). Making a change to the package sources does not require working with the git repository. The package can be changed in a normal way by either adding a new patch to 'debian/patches' or by changing the sources directly and letting dpkg-source build the additional patch during source package creation. Working with the packaging git repository ----------------------------------------- If you want to incorporate your patch to the git repository of this package, here are some hints. Some scripts to automate the patch and series file generation and other tasks can be found at http://gitorious.org/gdp The 'master' branch of the git repository always contains the complete patched sources, ready to be built by 'debuild' or a similar command. Commits modifying the upstream sources should go directly to the master branch, but should also be cherry picked to a specific patch branch, in order to be included in a separate patch file in the final source package. Note that the patch branches do not form a patch stack, all of them should be branched from unmodified upstream sources. The patches to be generated and the order of patch application are determined by DEP-3 header information files in 'debian/metapatches'. The patches are created and applied in lexicographic ordering of the patch header files, so if a specific ordering of the patch files is needed, these files should be named like 'NN_name', where NN is a number, to force the ordering. The header field 'X-git-branch' in the metapatch file points to the git branch used to generate the patch file. Upstream modifying commits not included in any of the patch branches will be placed by dpkg-source to the catchall patch 'debian/patches/debian-changes-{version}', but having this patch in a released version is discouraged. debian/changelog0000644000000000000000000002164712272234406011054 0ustar meshlab (1.3.2+dfsg1-2+rpi1) jessie-staging; urgency=low * Reduce optimisation to O1 to avoid ICE -- Peter Michael Green Sun, 27 Oct 2013 11:20:19 +0000 meshlab (1.3.2+dfsg1-2) unstable; urgency=low * Install plugin XML files under src/distrib/plugins. * Update Standards-Version to 3.9.5. -- Teemu Ikonen Thu, 07 Nov 2013 16:32:03 +0100 meshlab (1.3.2+dfsg1-1) unstable; urgency=low * New upstream version (closes: #693649) * Repackaged dfsg-sources remove copies of glew-1.7.0, OpenCTM-1.0.3, Eigen3, etc. See debian/copyright for details. * Add libGLU to LIBS in meshlab.pro. Fixes an FTBFS in Ubuntu. Thanks to Ilya Barygin for the fix. Closes: #678312. * New patches: - overflow: Fix overflowing array index in VCGlib, also fixes E-array-bounds error in Debian build log scanner - openctm: Use Debian OpenCTM - format-security: Fix compilation errors with -Werror=format-security - crash-on-save: Fix crash on project save. Patch from upstream SVN commit [r6114] (closes: #718583). * Add a lintian-override file. Override hardening-no-fortify-functions in meshlab plugins. * Add shared-mime-info data for media types supported by meshlab. Also, add the supported types meshlab.mime mailcap file and meshlab.desktop file, to enable file manager open file support. (closes LP: #1077620) * watch: Fix dversionmangle regex * copyright: Update * control: - Upgrade to standards-version 3.9.4 - Build-dep on libopenctm-dev, libeigen3-dev - Add Recommends to chemical-mime-data to get more supported media types * rules: - Clean clean target. - get CXXFLAGS from dpkg-buildflags for QMAKE_CXXFLAGS. - Remove jhead makefile in clean target. -- Teemu Ikonen Tue, 08 Oct 2013 00:34:58 +0200 meshlab (1.3.0a+dfsg1-3) unstable; urgency=low * rules: - Add get-orig-source target. - Add build-arch and build-indep targets as recommended by lintian. - Use dpkg-buildflags to give flags to qmake. * copyright: - Use the latest machine readable copyright format. - Point to versioned GPLv2 in common-licenses (fixes a lintian warning). - Remove copyright info for removed gdb macros. * control: Upgrade to standards-version 3.9.3. * Upgrade to debhelper version 9. * New patches: - 14_structuresynth: Include glu.h where needed in included structure-synth code. - 15_gcc47: Fix FTBFS with GCC-4.7 (closes: #667276). Thanks to Matej Vela for the patch. -- Teemu Ikonen Thu, 14 Jun 2012 15:59:55 +0200 meshlab (1.3.0a+dfsg1-2) unstable; urgency=low * rules: Use linux-g++ as qmake spec (fixes FTBFS with qt4 > 4.7). * New patches: - 12_ply_numeric: Set LC_NUMERIC to "C" in main(). Thanks to Luka Frelih for the patch. Closes: #623361. - 13_cstddef: Include on files using offsetoff (closes: #625053). -- Teemu Ikonen Thu, 12 May 2011 12:17:16 +0200 meshlab (1.3.0a+dfsg1-1) unstable; urgency=low * New upstream version (closes: #618522) * Repackage the upstream sources to get rid of some files with questionable licensing information and useless libraries, see the copyright file for details. * Builds with GCC-4.5 (closes: #565034) * Fix watch-file to work with new upstream names and dfsg source (closes: #582477) * Require debhelper version 8 or above. * control: - Update standards-version to 3.9.1, cleanup. - Remove build-dep to libgl-dev to fix a lintian warning about a build-dep to a virtual package. - Remove build-dep to asciidoc, add build-dep to libeigen2-dev. * rules: - Remove manpage-related code. - Build the necessary code from meshlab/src/external. Also clean it. - Override dh_shlibdeps to include /usr/lib/meshlab in search path. - Don't install shader licenses. * install: Install binaries from meshlab/src/distrib. * copyright: Update to the latest DEP5 format, document changes due to source repackaging and add the copyright info for the files added in this upstream release. * Hardcode shadersDir and pluginDir in upstream source to locations in the Debian binary package. * Use source format '3.0 (quilt)'. * Split changes affecting upstream code to branches in the git repository at git.d.o. Add DEP3 patch metadata headers to debian/metapatches and generate patches from git branches with gdp (http://gitorious.org/gdp). Current patches: - 01_muparser: Use Debian muparser. - 02_qhull: Use Debian qhull. - 03_lib3ds: Use Debian lib3ds. - 04_libbz2: Use Debian libbz2. - 05_glew: Use Debian GLEW. - 06_eigen: Use Debian Eigen. - 07_disable-updates: Disable checking for updates on startup. - 08_externals: Only build necessary external sources. - 09_rpath: Use /usr/lib/meshlab as RPATH in binaries. - 10_shadersdir: Hardcode shadersDir to the correct path in Debian - 11_pluginsdir: Hardcode pluginsDir to the correct path in Debian * Add a README.source file documenting the patch generation. -- Teemu Ikonen Mon, 28 Mar 2011 17:54:11 +0200 meshlab (1.2.2-3) UNRELEASED; urgency=low * control: Add Build-dep to libgl-dev * Disable checking for updates on startup (LP: #652145) * io_u3d.cpp: Use correct IDTFConverter path under Linux. * export_u3d.h: Add hyperref package to LaTeX output, makes pdflatex compilation work correctly in Debian. -- Teemu Ikonen Thu, 03 Mar 2011 11:28:01 +0100 meshlab (1.2.2-2) unstable; urgency=low * Add a watch file * Call a2x with -L switch to avoid use of xmllint (closes: #556824) -- Teemu Ikonen Wed, 18 Nov 2009 18:36:11 +0100 meshlab (1.2.2-1) unstable; urgency=low * New upstream version * Do not build filter_isoparametrization because liblevmar dependency is not (yet) in Debian * Fix compilation with gcc-4.4, thanks to Jonathan Liu for the patch (closes: #539544) * rules: Add compiler variables to the qmake call (for testing with new GCC versions) * io_3ds.pro: Make LIBS and INCLUDEPATH point to Debian version of lib3ds * io_epoch.pro: Make LIBS point to Debian version of libbz2 * control: - Move Homepage URL to the source package section - Update to standards-version 3.8.3 -- Teemu Ikonen Thu, 08 Oct 2009 16:40:41 +0200 meshlab (1.2.1-1) unstable; urgency=low * New Upstream Version * Patch upstream source to build with Debian versions of GLEW, qhull, lib3ds, libbz2, muparser * rules: - Add build-deps to libqhull-dev, libmuparser-dev - Build asciidoc manpages from meshlab/docs with a2x * install: Do not install textures * copyright: Update -- Teemu Ikonen Wed, 27 May 2009 18:07:15 +0200 meshlab (1.2.0-1) UNRELEASED; urgency=low * New upstream version * Add a debian/manpages file * Add xpm icons * Add a .desktop file * Fix plugin and shader paths to Debian standards * control: - Build-dep and compat to debhelper v7 - Upgrade to standards-version 3.8.1 * install: - Install rendermonkey shaders - Install plugins to /usr/lib/meshlab/plugins - Install .desktop file and icons * rules: clean up and simplify with dh -- Teemu Ikonen Thu, 30 Apr 2009 16:08:53 +0200 meshlab (1.1.1-2) UNRELEASED; urgency=low * Add manpages for meshlab and meshlabserver * Add build-dep to asciidoc, xsltproc, docbook-xsl, libqt4-opengl-dev * copyright: convert to machine readable format * control: change section to graphics. Add Vcs-Browser and Vcs-Git fields pointing to git.debian.org * rules: call distclean instead of clean in the clean target, simplify * Upload to unstable (closes: #426581) -- Teemu Ikonen Thu, 15 May 2008 22:39:13 +0300 meshlab (1.1.1-1) UNRELEASED; urgency=low * New upstream version -- Teemu Ikonen Mon, 14 Apr 2008 17:27:20 +0200 meshlab (1.1.1~b20080308-0) UNRELEASED; urgency=low * Import new upstream beta release * Disable checking for updates and usage statistics reporting -- Teemu Ikonen Mon, 17 Mar 2008 12:35:05 +0100 meshlab (1.1.0-1) UNRELEASED; urgency=low * New upstream version * Reorganize source tree to match the upstream release tarball: meshlab sources are under meshlab/ and vcg library under sf/ * Change call to qmake to qmake-qt4 in debian/rules * Add versioned dependency to lib3ds-dev (>= 1.3.0) * Build with Debian libGLEW * Fix .install to match files in new version * Hardcode plugin and shader directories for Debian build * Upstream-type fixes: - Create ui_painttoolbox.h during build - Fix private variable access in render_rm -- Teemu Ikonen Fri, 01 Feb 2008 15:31:32 +0100 meshlab (1.1.0~b~cvs20070528-1) UNRELEASED; urgency=low * Initial release -- Teemu Ikonen Sat, 2 Jun 2007 20:29:02 +0200 debian/meshlab.mime0000644000000000000000000000410712266255022011456 0ustar model/mesh; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY" application/x-3ds; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.3ds image/x-3ds; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.3ds model/x-ply; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.ply application/sla; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.stl model/x-quad-object; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.qobj model/x-geomview-off; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.off application/x-cyclone-ptx; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.ptx application/x-vmi; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.vmi application/x-bre; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.bre model/vnd.collada+xml; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.dae model/openctm; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.ctm application/x-expe-binary; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.pts application/x-expe-ascii; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.apts application/x-xyz; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.xyz application/x-gts; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.gts chemical/x-pdb; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.pdb application/x-tri; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.tri application/x-asc; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.asc model/x3d+xml; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.x3d model/x3d+vrml; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.x3dv model/vrml; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.wrl model/u3d; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.u3d model/idtf; /usr/bin/meshlab; test=/usr/bin/test -n "$DISPLAY"; nametemplate=%.idtf debian/watch0000644000000000000000000000024412266255022010221 0ustar version=3 opts="uversionmangle=s/^(.)(.)([^\.]*)/\\1.\\2.\\3/,dversionmangle=s/[+.]dfsg\d+//" \ http://sf.net/meshlab/MeshLabSrc_AllInc_v(\d\d\d.*)\.t[ar\.]*gz debian/meshlab_48x48.xpm0000644000000000000000000001515412266255022012216 0ustar /* 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.@.@.$.+...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." }; debian/install0000644000000000000000000000101712266255022010560 0ustar meshlab/src/distrib/meshlab usr/bin/ meshlab/src/distrib/meshlabserver usr/bin/ meshlab/src/distrib/plugins/*.so usr/lib/meshlab/plugins meshlab/src/distrib/plugins/*.xml usr/lib/meshlab/plugins meshlab/src/distrib/shaders/* usr/share/meshlab/shaders meshlab/src/distrib/lib*.so.* usr/lib/meshlab debian/meshlab.desktop usr/share/applications debian/meshlab_32x32.xpm usr/share/pixmaps debian/meshlab_48x48.xpm usr/share/pixmaps debian/meshlab_32x32.xpm0000644000000000000000000000463312266255022012200 0ustar /* XPM */ static char *meshlab__[] = { /* columns rows colors chars-per-pixel */ "32 32 80 1", " c #060606", ". c #0B0B0B", "X c #10100F", "o c #131312", "O c #151B14", "+ c #1D1D1D", "@ c #142012", "# c #21331D", "$ c #242424", "% c #2A2A2A", "& c #313131", "* c #3A3636", "= c #3B3B3B", "- c #334A2C", "; c #354C31", ": c #335130", "> c #46583E", ", c #424242", "< c #474E47", "1 c #4B4B4B", "2 c #534D4D", "3 c #535353", "4 c #525A50", "5 c #5B5B5B", "6 c #615C5C", "7 c #4E6A48", "8 c #487044", "9 c #4C7448", "0 c #507E4C", "q c #547A52", "w c #5C7E5A", "e c #636363", "r c #6B6B6B", "t c #627C60", "y c #727272", "u c #7D7575", "i c #767A76", "p c #7B7B7B", "a c #52814E", "s c #5A8C54", "d c #61945B", "f c #649A5E", "g c #6D8C63", "h c #718E65", "j c #789A6A", "k c #7F937E", "l c #7CB473", "z c #81B878", "x c #88BE7E", "c c #818181", "v c #8B8B8B", "b c #939393", "n c #949A92", "m c #9B9B9B", "M c #8CBF82", "N c #A4A4A4", "B c #ACACAC", "V c #AAB5A9", "C c #B4B4B4", "Z c #B7B9B7", "A c #BDBDBD", "S c #C2B9B9", "D c #91C586", "F c #93C489", "G c #9AC28A", "H c #9BCB8F", "J c #A0CB90", "K c #B5C0B5", "L c #BDC6BD", "P c #C3C3C3", "I c #C7CDC7", "U c #CBCBCB", "Y c #D4D3D3", "T c #DCDCDC", "R c #E0DCDC", "E c #E3E3E3", "W c #EAEAEA", "Q c #F5F5F4", "! c #F8F8F8", "~ c None", /* pixels */ "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~~~~~~~~~TEEEEEEE~~~~~~~~~~~~", "~~~~~~~~~TTEEEEETTTTTYY~~~~~~~~~", "~~~~~~~TTEEEEETTTYYYYUUPP~~~~~~~", "~~~~~~EEEEEETTTYYUUUPPPABb~~~~~~", "~~~~~EEWWEETTYYUPPPPAANp53,~~~~~", "~~~~EWWWWETYYUPAAAABbr1*1ryb~~~~", "~~~EEWWWETYYUPAACCv5,1rrbNCZZ~~~", "~~~EWWWETYYUPAZBer1eicbbmmNNB~~~", "~~TEWWEETYUPACvrppvvccppppcvbm~~", "~~TEEEETYIPAAmmbvr131,1335erpc~~", "~YTEEETYIAAACmr3=$%$+O++%&=3e1&~", "~YTEEETUAAABc1&$ooX.o.. .o+%&$%~", "~YTEETYPAZmr&O+oO>7:iby*. .+$%~", "~YEEETUPZb5$o4no@jFdVQTu .o$%~", "~TEWEYUAm5+O;gh#-GDsL!Eu..+%&&&~", "~TWWTYPBy$&<8MJGJHzqW!T2oO+&&&&~", "~EWETUAm5.3ZtfxDFlaK!QS+$%*&&&&~", "~EETYPCb5$&BEk9a0wL!!R6+%,e,&&&~", "~ETYUPCmr=$o%pZITQ!!Y6+==ev3&&&~", "~~TYPACmc5,*$oo$,351$%=3rbB5&&&~", "~~YIAAZNbcr531&%%&***5rpNCA5&&~~", "~~UPAAACNmvciye3eeer5cbCAAA3&&~~", "~~~AAAAAZBNmbbbvbbmNNCAAAAZ1&~~~", "~~~AAAAAAAZZCCCCCZAAAAAAAAC=&~~~", "~~~~AAAAAAAAAAAAAAAAAAAAAAN&~~~~", "~~~~~AAAAAAAAAAAAAAAAAAAAAc~~~~~", "~~~~~~AAAAAAAAAAAAAAAAAAAA~~~~~~", "~~~~~~~AAAAAAAAAAAAAAAAAA~~~~~~~", "~~~~~~~~~AAAAAAAAAAAAAA~~~~~~~~~", "~~~~~~~~~~~AAAAAAAAAA~~~~~~~~~~~", "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" }; debian/rules0000755000000000000000000000733312272234406010256 0ustar #!/usr/bin/make -f # -*- makefile -*- QMAKE_DPKG_BUILDFLAGS=\ QMAKE_CFLAGS_RELEASE="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -O1" \ QMAKE_CFLAGS_DEBUG="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -O1" \ QMAKE_CXXFLAGS_RELEASE="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -O1" \ QMAKE_CXXFLAGS_DEBUG="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -O1" \ QMAKE_LFLAGS_RELEASE="$(shell dpkg-buildflags --get LDFLAGS)" \ QMAKE_LFLAGS_DEBUG="$(shell dpkg-buildflags --get LDFLAGS)" DEBVERSION := 1.3.2+dfsg1 TARBALL = MeshLabSrc_AllInc_v132.tgz TDIR = meshlab-$(DEBVERSION) get-orig-source: mkdir $(TDIR) wget http://qa.debian.org/watch/sf.php/meshlab/$(TARBALL) tar -C $(TDIR) -zxf $(TARBALL) rm -rf $(TDIR)/meshlab/src/distrib/render_template rm -rf $(TDIR)/meshlab/src/distrib/sample # Remove external libraries which are in Debian or not used rm -rf $(TDIR)/meshlab/src/external/ann_1.1.1 rm -rf $(TDIR)/meshlab/src/external/bzip2-1.0.5 rm -rf $(TDIR)/meshlab/src/external/glew-1.5.1 rm -rf $(TDIR)/meshlab/src/external/glew-1.7.0 rm -rf $(TDIR)/meshlab/src/external/inc rm -rf $(TDIR)/meshlab/src/external/lib3ds-1.3.0 rm -rf $(TDIR)/meshlab/src/external/muparser_v130 rm -rf $(TDIR)/meshlab/src/external/muparser_v132 rm -rf $(TDIR)/meshlab/src/external/ode-0.11.1 rm -rf $(TDIR)/meshlab/src/external/OpenCTM-1.0.3 rm -rf $(TDIR)/meshlab/src/external/openkinect rm -rf $(TDIR)/meshlab/src/external/qhull-2003.1 rm -rf $(TDIR)/meshlab/src/external/tsai-30b3 # Remove unused plugins rm -rf $(TDIR)/meshlab/src/meshlabplugins/edit_ocme # Remove experimental and unsupported plugins, please # file bugs if you need one of these rm -rf $(TDIR)/meshlab/src/plugins_experimental rm -rf $(TDIR)/meshlab/src/plugins_unsupported # Eigen is already in Debian. rm -rf $(TDIR)/vcglib/vcg/Eigen rm -rf $(TDIR)/vcglib/eigenlib rm -rf $(TDIR)/vcglib/wrap/system/time # tar -zcf meshlab_$(DEBVERSION).orig.tar.gz $(TDIR) configure: configure-stamp configure-stamp: dh_testdir cd meshlab/src/external ; qmake -spec linux-g++ -recursive external.pro $(QMAKE_DPKG_BUILDFLAGS) cd meshlab/src ; qmake -spec linux-g++ -recursive meshlab_full.pro $(QMAKE_DPKG_BUILDFLAGS) touch $@ build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: configure-stamp dh_testdir $(MAKE) -C meshlab/src/external $(MAKE) -C meshlab/src touch $@ clean: dh clean rm -f build-stamp configure-stamp -rm -f meshlab/docs/meshlab.1.xml meshlab/docs/meshlabserver.1.xml if [ -e meshlab/src/Makefile ] ; then $(MAKE) -C meshlab/src distclean ; fi if [ -e meshlab/src/external/Makefile ] ; then $(MAKE) -C meshlab/src/external distclean ; fi -rm -rf meshlab/src/external/lib/linux-g++ -rm meshlab/src/external/levmar-2.3/Makefile.levmar-2 -rm meshlab/src/external/structuresynth/Makefile.structuresynth -rm meshlab/src/external/jhead-2.95/Makefile.jhead-2 -find ./ -name "Makefile" | xargs rm -f -find ./ -name "Makefile.Debug" | xargs rm -f -find ./ -name "Makefile.Release" | xargs rm -f -mv 3Dlabs-license.txt meshlab/src/distrib/shaders -mv LightworkDesign-license.txt meshlab/src/distrib/shaders override_dh_shlibdeps: dh_shlibdeps -lusr/lib/meshlab install: build dh_testdir -mv meshlab/src/distrib/shaders/3Dlabs-license.txt . -mv meshlab/src/distrib/shaders/LightworkDesign-license.txt . dh install # Build architecture-independent files here. binary-indep: build install dh binary-indep # Build architecture-dependent files here. binary-arch: build install dh binary-arch binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure get-orig-source debian/patches/0000755000000000000000000000000012266255022010617 5ustar debian/patches/14_ply_numeric.patch0000644000000000000000000000156112266255022014475 0ustar From: Teemu Ikonen Subject: Set LC_NUMERIC to "C" Git-Branch: p/ply_numeric Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..2aeac7daa4785a9cf0b2480f663780 Fixes reading of ascii float values in locales which use the comma as a float separator. meshlab/src/meshlab/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meshlab/src/meshlab/main.cpp b/meshlab/src/meshlab/main.cpp index 7058e31..e452e87 100644 --- a/meshlab/src/meshlab/main.cpp +++ b/meshlab/src/meshlab/main.cpp @@ -25,12 +25,16 @@ #include #include "mainwindow.h" +using namespace std; + int main(int argc, char *argv[]) { MeshLabApplication app(argc, argv); QLocale::setDefault(QLocale::C); QCoreApplication::setOrganizationName("VCG"); QCoreApplication::setApplicationName("MeshLab"); + + std::setlocale(LC_NUMERIC, "C"); if(argc>1) { debian/patches/08_lib3ds.patch0000644000000000000000000000250612266255022013332 0ustar From: Teemu Ikonen Subject: Use Debian lib3ds. Git-Branch: p/lib3ds Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..944ece3e566dbf4cc885163178d303 meshlab/src/meshlabplugins/io_3ds/io_3ds.pro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro index cf8052a..fed064d 100644 --- a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro +++ b/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro @@ -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,9 +25,7 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/3ds.lib 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++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a +linux-g++:LIBS += -l3ds # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds debian/patches/20_rpath.c18p2.patch0000644000000000000000000000374012266255022014117 0ustar From: Teemu Ikonen Subject: Use /usr/lib/meshlab as RPATH in binaries. Git-Branch: p/rpath Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..0ecffa4d55bfff6f3b98a478d0cd82 meshlab/src/meshlab/meshlab.pro | 4 +--- meshlab/src/meshlabserver/meshlabserver.pro | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro index 4a7d0fd..f67ba07 100644 --- a/meshlab/src/meshlab/meshlab.pro +++ b/meshlab/src/meshlab/meshlab.pro @@ -130,11 +130,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon #} linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -linux-g++:QMAKE_RPATHDIR += ../distrib +linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU -linux-g++-32:QMAKE_RPATHDIR += ../distrib linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU -linux-g++-64:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. # We should never be too permissive diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro index cca5560..6a19b81 100644 --- a/meshlab/src/meshlabserver/meshlabserver.pro +++ b/meshlab/src/meshlabserver/meshlabserver.pro @@ -26,11 +26,9 @@ win32-msvc2008: LIBS += -L../distrib -lcommon win32-msvc2010: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon linux-g++: LIBS += -L../distrib -lcommon -linux-g++:QMAKE_RPATHDIR += ../distrib +linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab linux-g++-32: LIBS += -L../distrib -lcommon -linux-g++-32:QMAKE_RPATHDIR += ../distrib linux-g++-64: LIBS += -L../distrib -lcommon -linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon # win32-msvc2008:release: LIBS += -L../common/release -lcommon debian/patches/06_format-security.patch0000644000000000000000000000453712266255022015313 0ustar From: Teemu Ikonen Subject: Fix compilation errors with -Werror=format-security. Git-Branch: p/format-security Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..be247b855ebb49a4d826d60b7d21a0 .../meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp | 4 ++-- meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp index 4864214..233b657 100644 --- a/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp +++ b/meshlab/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp @@ -526,7 +526,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act, GLenum err = glewInit(); if( err != GLEW_OK ) { - qWarning( (std::string("Impossible to load GLEW library.")+(char*)glewGetErrorString(err)).c_str() ); + qWarning("Impossible to load GLEW library: %s", glewGetErrorString(err)); return false; } Log( "GLEW library correctly initialized." ); @@ -536,7 +536,7 @@ bool DecorateRasterProjPlugin::startDecorate( QAction *act, std::string logs; if( !initShaders(logs) ) { - qWarning( ("Error while initializing shaders.\n"+logs).c_str() ); + qWarning("Error while initializing shaders.\n%s", logs.c_str()); return false; } Log( "Shaders correctly loaded." ); diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp index 88b6f9f..c23987c 100644 --- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp +++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.cpp @@ -269,7 +269,7 @@ void EditArc3DPlugin::ExportPly() QString suffix = "." + qfInfo.completeSuffix(); QString path = qfInfo.absoluteFilePath().remove(suffix); path.append("Undist" + suffix); - qDebug(path.toLatin1()); + qDebug("%s", path.toStdString().c_str()); QImage undistImg(originalImg.width(),originalImg.height(),originalImg.format()); undistImg.fill(qRgba(0,0,0,255)); debian/patches/07_gcc47.patch0000644000000000000000000000716112266255022013062 0ustar From: Teemu Ikonen Subject: Fix FTBFS with GCC-4.7 Git-Branch: p/gcc47 Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..07a6c6cf991f44779236b31381a7ca Closes: #667276 Thanks to Matej Vela for the patch. meshlab/src/meshlabplugins/decorate_base/colorhistogram.h | 2 +- .../vcg/complex/algorithms/local_optimization/tri_edge_flip.h | 8 ++++---- vcglib/vcg/space/index/grid_static_obj.h | 2 +- vcglib/wrap/gl/trimesh.h | 2 +- vcglib/wrap/ply/plystuff.h | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h index 2351b2a..90c6d76 100644 --- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h +++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h @@ -40,7 +40,7 @@ public: //! Reset histogram data. void Clear() { - this->::Clear(); + Histogram::Clear(); CV.clear(); } /* diff --git a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h index 9054166..f40f0dc 100644 --- a/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h +++ b/vcglib/vcg/complex/algorithms/local_optimization/tri_edge_flip.h @@ -558,13 +558,13 @@ public: // edges of the first face, except the flipped edge for(int i = 0; i < 3; i++) if(i != flipped) { PosType newpos(f1, i); - Insert(heap, newpos, this->GlobalMark()); + this->Insert(heap, newpos, this->GlobalMark()); } // edges of the second face, except the flipped edge for(int i = 0; i < 3; i++) if(i != f1->FFi(flipped)) { PosType newpos(f2, i); - Insert(heap, newpos, this->GlobalMark()); + this->Insert(heap, newpos, this->GlobalMark()); } // every edge with v0, v1 v3 of f1 @@ -583,7 +583,7 @@ public: do { VertexPointer v = pos.VFlip(); if(v != v0 && v != v1 && v != v2 && v != v3) - Insert(heap, pos, this->GlobalMark()); + this->Insert(heap, pos, this->GlobalMark()); pos.NextE(); } while(pos != startpos && !pos.IsBorder()); @@ -603,7 +603,7 @@ public: do { VertexPointer v = pos.VFlip(); if(v != v0 && v != v1 && v != v2 && v != v3) - Insert(heap, pos, this->GlobalMark()); + this->Insert(heap, pos, this->GlobalMark()); pos.NextE(); } while(pos != startpos && !pos.IsBorder()); diff --git a/vcglib/vcg/space/index/grid_static_obj.h b/vcglib/vcg/space/index/grid_static_obj.h index 0554393..26608d5 100644 --- a/vcglib/vcg/space/index/grid_static_obj.h +++ b/vcglib/vcg/space/index/grid_static_obj.h @@ -72,7 +72,7 @@ class GridStaticObj : public BasicGrid inline ~GridStaticObj() { if(grid) delete[] grid; } inline void Init(const ObjType &val) { - fill(grid,grid+size(),val); + std::fill(grid,grid+size(),val); } diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h index 5d40404..ba72456 100644 --- a/vcglib/wrap/gl/trimesh.h +++ b/vcglib/wrap/gl/trimesh.h @@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) } } - m.vert.math::Swap(newvert); + m.vert.swap(newvert); m.vn=m.vert.size(); } diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h index 3e41e63..4af9508 100644 --- a/vcglib/wrap/ply/plystuff.h +++ b/vcglib/wrap/ply/plystuff.h @@ -75,6 +75,7 @@ using namespace vcg; #define pb_close _close #define DIR_SEP "\\" #else +#include #define pb_mkdir(n) mkdir(n,0755) #define pb_access access #define pb_stat stat debian/patches/05_externals.patch0000644000000000000000000000170612266255022014155 0ustar From: Teemu Ikonen Subject: Only build necessary external sources. Git-Branch: p/externals Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ca572df8704909a1bbe18b1ce25d76 meshlab/src/external/external.pro | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meshlab/src/external/external.pro b/meshlab/src/external/external.pro index c103d88..324eb91 100644 --- a/meshlab/src/external/external.pro +++ b/meshlab/src/external/external.pro @@ -2,11 +2,6 @@ config += debug_and_release TEMPLATE = subdirs -SUBDIRS = lib3ds-1.3.0/lib3ds \ - bzip2-1.0.5/bzip2-1.0.5.pro \ - muparser_v132/src \ - levmar-2.3/levmar-2.3.pro \ +SUBDIRS = levmar-2.3/levmar-2.3.pro \ structuresynth/structuresynth.pro \ - OpenCTM-1.0.3/openctm.pro \ jhead-2.95/jhead-2.95.pro -# openkinect/openkinect.pro debian/patches/09_libbz2.patch0000644000000000000000000000262112266255022013335 0ustar From: Teemu Ikonen Subject: Use Debian libbz2. Git-Branch: p/libbz2 Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..a6e1a0b242a02075c0d686ec4fa8b8 meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro index e317b99..94dc124 100644 --- a/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro +++ b/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro @@ -32,16 +32,12 @@ RESOURCES = edit_arc3D.qrc 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++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/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++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 -linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 +linux-g++:INCLUDEPATH += /usr/include mac:LIBS += -lbz2 debian/patches/19_CONFLICTS_IN_rpath.patch0000644000000000000000000000253712266255022015270 0ustar reverted: --- b/meshlab/src/meshlab/meshlab.pro +++ a/meshlab/src/meshlab/meshlab.pro @@ -129,9 +129,11 @@ # win32-g++:release:LIBS += -L../common/release -lcommon #} +linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU linux-g++:QMAKE_RPATHDIR += ../distrib +linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU linux-g++-32:QMAKE_RPATHDIR += ../distrib +linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU linux-g++-64:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. reverted: --- b/meshlab/src/meshlabserver/meshlabserver.pro +++ a/meshlab/src/meshlabserver/meshlabserver.pro @@ -25,9 +25,11 @@ win32-msvc2008: LIBS += -L../distrib -lcommon win32-msvc2010: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon +linux-g++: LIBS += -L../distrib -lcommon -linux-g++: LIBS += -L../distrib -lcommon -lGLEW linux-g++:QMAKE_RPATHDIR += ../distrib +linux-g++-32: LIBS += -L../distrib -lcommon linux-g++-32:QMAKE_RPATHDIR += ../distrib +linux-g++-64: LIBS += -L../distrib -lcommon linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon debian/patches/17_structuresynth.patch0000644000000000000000000000426512266255022015304 0ustar From: Teemu Ikonen Subject: Include glu.h where needed in included structure-synth code. Git-Branch: p/structuresynth Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..45495fd45078a06d7c5f7405ba636c Also link structuresynth code with libGLU. This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same issue in the real structure-synth Debian package. .../structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h | 1 + .../src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h | 1 + meshlab/src/external/structuresynth/structuresynth.pro | 1 + 3 files changed, 3 insertions(+) diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h index 8905cbe..e13b011 100644 --- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h +++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "SyntopiaCore/Math/Vector3.h" #include "SyntopiaCore/Math/Matrix4.h" diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h index 0b0dc40..ed95346 100644 --- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h +++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h @@ -2,6 +2,7 @@ #include "SyntopiaCore/Math/Vector3.h" #include "Object3D.h" +#include namespace SyntopiaCore { namespace GLEngine { diff --git a/meshlab/src/external/structuresynth/structuresynth.pro b/meshlab/src/external/structuresynth/structuresynth.pro index 8579b03..362ce5d 100644 --- a/meshlab/src/external/structuresynth/structuresynth.pro +++ b/meshlab/src/external/structuresynth/structuresynth.pro @@ -120,3 +120,4 @@ win32-msvc2008:DESTDIR = ../lib/win32-msvc2008 linux-g++-32:DESTDIR = ../lib/linux-g++-32 linux-g++-64:DESTDIR = ../lib/linux-g++-64 linux-g++:DESTDIR = ../lib/linux-g++ +unix:LIBS+=-lGLU debian/patches/12_overflow.patch0000644000000000000000000000153412266255022014010 0ustar From: Teemu Ikonen Subject: Fix overflowing array index in VCGlib Git-Branch: p/overflow Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..ec0961589f0d134ab51265b8431c5f Fixes also E-array-bounds error in Debian build log scanner. vcglib/wrap/gl/addons.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcglib/wrap/gl/addons.h b/vcglib/wrap/gl/addons.h index 002ff1b..bc863bf 100644 --- a/vcglib/wrap/gl/addons.h +++ b/vcglib/wrap/gl/addons.h @@ -292,7 +292,7 @@ public: P[1] = Point3f( 0, sinf(angle), cosf(angle)); assert(!glGetError()); glBegin(GL_TRIANGLES); - Point3f n = ( (P[0]-p0) ^ (P[2]-p0) ).Normalize(); + Point3f n = ( (P[0]-p0) ^ (P[1]-p0) ).Normalize(); glNormal3f(n[0],n[1],n[2]); glVertex3f(p0[0],p0[1],p0[2]); glNormal3f(N[0][0],N[0][1],N[0][2]); debian/patches/01_crash-on-save.patch0000644000000000000000000000217612266255022014614 0ustar From: Teemu Ikonen Subject: Fix crash on project save (closes: #718583) Git-Branch: p/crash-on-save Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..cfc9473d1fa0e565d0aad4994fbb31 Patch from upstream SVN commit [r6114]. meshlab/src/meshlab/mainwindow_RunTime.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meshlab/src/meshlab/mainwindow_RunTime.cpp b/meshlab/src/meshlab/mainwindow_RunTime.cpp index 8f5057c..3273cec 100644 --- a/meshlab/src/meshlab/mainwindow_RunTime.cpp +++ b/meshlab/src/meshlab/mainwindow_RunTime.cpp @@ -1575,8 +1575,12 @@ void MainWindow::saveProject() /*********WARNING!!!!!! CHANGE IT!!! ALSO IN THE OPENPROJECT FUNCTION********/ meshDoc()->setDocLabel(fileName); - mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel()); - layerDialog->setWindowTitle(meshDoc()->docLabel()); + QMdiSubWindow* sub = mdiarea->currentSubWindow(); + if (sub != NULL) + { + sub->setWindowTitle(meshDoc()->docLabel()); + layerDialog->setWindowTitle(meshDoc()->docLabel()); + } /****************************************************************************/ debian/patches/13_pluginsdir.patch0000644000000000000000000000163712266255022014332 0ustar From: Teemu Ikonen Subject: Hardcode pluginsDir to the correct path in Debian Git-Branch: p/pluginsdir Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e1db74a038fd5fc27cc5e9f0bee8d3 meshlab/src/common/pluginmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshlab/src/common/pluginmanager.cpp b/meshlab/src/common/pluginmanager.cpp index d84c8fa..a039736 100644 --- a/meshlab/src/common/pluginmanager.cpp +++ b/meshlab/src/common/pluginmanager.cpp @@ -230,7 +230,7 @@ QString PluginManager::getBaseDirPath() QString PluginManager::getPluginDirPath() { - QDir pluginsDir(getBaseDirPath()); + QDir pluginsDir("/usr/lib/meshlab"); if(!pluginsDir.exists("plugins")) //QMessageBox::warning(0,"Meshlab Initialization","Serious error. Unable to find the plugins directory."); qDebug("Meshlab Initialization: Serious error. Unable to find the plugins directory."); debian/patches/10_muparser.patch0000644000000000000000000000263012266255022013777 0ustar From: Teemu Ikonen Subject: Use Debian muparser. Git-Branch: p/muparser Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..5e9cfcdae805ddac6f550b2a9f7011 meshlab/src/meshlabplugins/filter_func/filter_func.pro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meshlab/src/meshlabplugins/filter_func/filter_func.pro b/meshlab/src/meshlabplugins/filter_func/filter_func.pro index 3bcce2a..9a147b2 100644 --- a/meshlab/src/meshlabplugins/filter_func/filter_func.pro +++ b/meshlab/src/meshlabplugins/filter_func/filter_func.pro @@ -6,7 +6,7 @@ SOURCES += filter_func.cpp TARGET = filter_func -INCLUDEPATH += ../../external/muparser_v132/include +INCLUDEPATH += /usr/include/muParser # Note: we need static libs so when building muparser lib use # ./configure --enable-shared=no @@ -14,7 +14,5 @@ INCLUDEPATH += ../../external/muparser_v132/include win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib macx:LIBS += $$MACLIBDIR/libmuparser.a -linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a +linux-g++:LIBS += -lmuparser win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a debian/patches/03_disable-updates.patch0000644000000000000000000000155412266255022015215 0ustar From: Teemu Ikonen Subject: Disable checking for updates on startup. Git-Branch: p/disable-updates Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8f6cf9176644dce65ef4518b08526c meshlab/src/meshlab/mainwindow_Init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshlab/src/meshlab/mainwindow_Init.cpp b/meshlab/src/meshlab/mainwindow_Init.cpp index de3ff1d..ce7bf81 100644 --- a/meshlab/src/meshlab/mainwindow_Init.cpp +++ b/meshlab/src/meshlab/mainwindow_Init.cpp @@ -926,7 +926,7 @@ void MainWindow::saveRecentFileList(const QString &fileName) if(loadedMeshCounter-lastComunicatedValue>connectionInterval && !myLocalBuf.isOpen()) { -#if not defined(__DISABLE_AUTO_STATS__) +#if defined(__ENABLE_AUTO_STATS__) checkForUpdates(false); #endif int congratsMeshCounter = settings.value("congratsMeshCounter",50).toInt(); debian/patches/15_qhull.patch0000644000000000000000000000700712266255022013276 0ustar From: Teemu Ikonen Subject: Use Debian qhull. Git-Branch: p/qhull Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..776669d8d105b7c45476bc31ee8aad .../meshlabplugins/filter_qhull/filter_qhull.pro | 26 ++------------------ .../src/meshlabplugins/filter_qhull/qhull_tools.h | 18 +++++++------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro index 864ea7d..1d3c583 100644 --- a/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro +++ b/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro @@ -8,28 +8,6 @@ HEADERS += filter_qhull.h \ SOURCES += filter_qhull.cpp \ qhull_tools.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 +LIBS += -lqhull -SOURCES += ../../external/qhull-2003.1/src/geom.c \ - ../../external/qhull-2003.1/src/geom2.c \ - ../../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 - -TARGET = filter_qhull \ No newline at end of file +TARGET = filter_qhull diff --git a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h index 9a1a59b..34eaa6d 100644 --- a/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h +++ b/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h @@ -55,14 +55,14 @@ extern "C" #endif #include #include -#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 +#include +#include +#include +#include +#include +#include +#include #if defined(__cplusplus) } #endif @@ -71,4 +71,4 @@ facetT *compute_convex_hull(int dim, int numpoints, MeshModel &m); facetT *compute_delaunay(int dim, int numpoints, MeshModel &m); bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold); bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape); -int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); \ No newline at end of file +int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); debian/patches/18_glew.c18p1.patch0000644000000000000000000001313512266255022013744 0ustar From: Teemu Ikonen Subject: Use Debian GLEW. Git-Branch: p/glew Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..7023f74389baab6b9032c08ae2e2b2 meshlab/src/common/common.pro | 5 ++--- meshlab/src/meshlab/meshlab.pro | 4 +--- meshlab/src/meshlabplugins/filter_plymc/plymc.pro | 2 +- meshlab/src/meshlabserver/meshlabserver.pro | 6 ++---- meshlab/src/shared.pri | 7 ++++--- vcglib/apps/sample/trimesh_QT/trimesh_qt.pro | 5 +++-- vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro | 4 ++-- 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/meshlab/src/common/common.pro b/meshlab/src/common/common.pro index eec1863..58bda06 100644 --- a/meshlab/src/common/common.pro +++ b/meshlab/src/common/common.pro @@ -1,9 +1,9 @@ include (../general.pri) EXIF_DIR = ../external/jhead-2.95 +GLEWDIR = /usr +LIBS += -lGLEW -GLEWCODE = $$GLEWDIR/src/glew.c - win32-msvc2005:DESTDIR = ../distrib win32-msvc2008:DESTDIR = ../distrib win32-msvc2010:DESTDIR = ../distrib @@ -106,7 +106,6 @@ SOURCES += filterparameter.cpp \ mlapplication.cpp \ scriptsyntax.cpp \ searcher.cpp \ - $$GLEWCODE \ meshlabdocumentxml.cpp \ meshlabdocumentbundler.cpp diff --git a/meshlab/src/meshlab/meshlab.pro b/meshlab/src/meshlab/meshlab.pro index 4a7d0fd..ecd9ed6 100644 --- a/meshlab/src/meshlab/meshlab.pro +++ b/meshlab/src/meshlab/meshlab.pro @@ -129,11 +129,9 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon # win32-g++:release:LIBS += -L../common/release -lcommon #} -linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU +linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU linux-g++:QMAKE_RPATHDIR += ../distrib -linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU linux-g++-64:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. diff --git a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro index b609419..a89e8c6 100755 --- a/meshlab/src/meshlabplugins/filter_plymc/plymc.pro +++ b/meshlab/src/meshlabplugins/filter_plymc/plymc.pro @@ -1,7 +1,7 @@ TARGET = plymc DEPENDPATH += . INCLUDEPATH += ../../../../vcglib \ - ../../code/lib/glew/include + /usr/include CONFIG += console \ stl \ debug_and_release diff --git a/meshlab/src/meshlabserver/meshlabserver.pro b/meshlab/src/meshlabserver/meshlabserver.pro index cca5560..9b070c7 100644 --- a/meshlab/src/meshlabserver/meshlabserver.pro +++ b/meshlab/src/meshlabserver/meshlabserver.pro @@ -1,4 +1,4 @@ -GLEWDIR = ../external/glew-1.5.1 +GLEWDIR = /usr HEADERS = @@ -25,11 +25,9 @@ win32-msvc2005: LIBS += -L../distrib -lcommon win32-msvc2008: LIBS += -L../distrib -lcommon win32-msvc2010: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon -linux-g++: LIBS += -L../distrib -lcommon +linux-g++: LIBS += -L../distrib -lcommon -lGLEW linux-g++:QMAKE_RPATHDIR += ../distrib -linux-g++-32: LIBS += -L../distrib -lcommon linux-g++-32:QMAKE_RPATHDIR += ../distrib -linux-g++-64: LIBS += -L../distrib -lcommon linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri index 93ed32f..0ba3e67 100644 --- a/meshlab/src/shared.pri +++ b/meshlab/src/shared.pri @@ -17,9 +17,10 @@ win32-msvc2005: LIBS += ../../distrib/common.lib win32-msvc2008: LIBS += ../../distrib/common.lib win32-msvc2010: LIBS += ../../distrib/common.lib win32-g++:LIBS += -L../../distrib -lcommon -linux-g++:LIBS += -L../../distrib -lcommon -linux-g++-32:LIBS += -L../../distrib -lcommon -linux-g++-64:LIBS += -L../../distrib -lcommon +linux-g++:LIBS += -L../../distrib -lcommon -lGLEW +#linux-g++-32:LIBS += -L../../distrib -lcommon +#linux-g++-64:LIBS += -L../../distrib -lcommon + #CONFIG(debug, debug|release) { # win32-msvc2005: LIBS += ../../common/debug/common.lib diff --git a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro index 8a3c7fc..986116e 100644 --- a/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro +++ b/vcglib/apps/sample/trimesh_QT/trimesh_qt.pro @@ -26,8 +26,9 @@ SOURCES += ../../../wrap/gui/trackmode.cpp # Compile glew DEFINES += GLEW_STATIC -INCLUDEPATH += ../../../../code/lib/glew/include -SOURCES += ../../../../code/lib/glew/src/glew.c +INCLUDEPATH += /usr/include +#SOURCES += ../../../../code/lib/glew/src/glew.c +LIBS += -lGLEW # Awful problem with windows.. win32{ diff --git a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro index e8ae178..4a69fef 100644 --- a/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro +++ b/vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro @@ -1,14 +1,14 @@ -INCLUDEPATH += . ../../.. ../../../../code/lib ../../../../code/lib/glew/include +INCLUDEPATH += . ../../.. ../../../../code/lib /usr/include HEADERS = glwidget.h \ window.h \ mesh_type.h SOURCES = glwidget.cpp \ main.cpp \ window.cpp\ - ../../../../code/lib/glew/src/glew.c \ ../../../wrap/ply/plylib.cpp\ ../../../wrap/gui/trackmode.cpp\ ../../../wrap/gui/trackball.cpp +LIBS += -lGLEW QT += opengl # install debian/patches/16_shadersdir.patch0000644000000000000000000000440712266255022014303 0ustar From: Teemu Ikonen Subject: Hardcode shadersDir to the correct path in Debian in various plugins Git-Branch: p/shadersdir Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..06b8aa9ce525fc0c5c221f5d675c29 meshlab/src/meshlabplugins/render_gdp/meshrender.cpp | 2 +- meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp | 2 +- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp index 64dbcc3..c07998c 100644 --- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp +++ b/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp @@ -39,7 +39,7 @@ void MeshShaderRenderPlugin::initActionList() { 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 --git a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp index 9c45981..0256805 100644 --- a/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp +++ b/meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp @@ -323,7 +323,7 @@ void ShaderDialog::changeTexturePath(int i) { 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(); diff --git a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp index e327cea..eb67fd2 100755 --- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp +++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp @@ -55,7 +55,7 @@ QList RenderRFX::actions() void RenderRFX::initActionList() { - QDir shadersDir = PluginManager::getBaseDirPath(); + QDir shadersDir = QDir("/usr/share/meshlab"); #if defined(Q_OS_WIN) if (shadersDir.dirName() == "debug" || debian/patches/21_RESOLUTION.patch0000644000000000000000000000264412266255022013653 0ustar Resolve patch overlaps. --- a/meshlab/src/meshlab/meshlab.pro +++ b/meshlab/src/meshlab/meshlab.pro @@ -129,10 +129,8 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -L../distrib -lcommon # win32-g++:release:LIBS += -L../common/release -lcommon #} -linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU +linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab -linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU -linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon -lGLU # uncomment in your local copy only in emergency cases. # We should never be too permissive --- a/meshlab/src/meshlabserver/meshlabserver.pro +++ b/meshlab/src/meshlabserver/meshlabserver.pro @@ -25,10 +25,8 @@ win32-msvc2005: LIBS += -L../distrib -lcommon win32-msvc2008: LIBS += -L../distrib -lcommon win32-msvc2010: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon -linux-g++: LIBS += -L../distrib -lcommon +linux-g++: LIBS += -L../distrib -lcommon -lGLEW linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab -linux-g++-32: LIBS += -L../distrib -lcommon -linux-g++-64: LIBS += -L../distrib -lcommon #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon # win32-msvc2008:release: LIBS += -L../common/release -lcommon debian/patches/series0000644000000000000000000000063512266255022012040 0ustar 01_crash-on-save.patch 02_cstddef.patch 03_disable-updates.patch 04_eigen.patch 05_externals.patch 06_format-security.patch 07_gcc47.patch 08_lib3ds.patch 09_libbz2.patch 10_muparser.patch 11_openctm.patch 12_overflow.patch 13_pluginsdir.patch 14_ply_numeric.patch 15_qhull.patch 16_shadersdir.patch 17_structuresynth.patch 18_glew.c18p1.patch 19_CONFLICTS_IN_rpath.patch 20_rpath.c18p2.patch 21_RESOLUTION.patch debian/patches/11_openctm.patch0000644000000000000000000000260612266255022013612 0ustar From: Teemu Ikonen Subject: Use Debian OpenCTM Git-Branch: p/openctm Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..e067d2c66c2408593f62f9c7776eed meshlab/src/meshlabplugins/io_ctm/io_ctm.pro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro index 1084902..31f0237 100644 --- a/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro +++ b/meshlab/src/meshlabplugins/io_ctm/io_ctm.pro @@ -3,7 +3,7 @@ HEADERS += io_ctm.h \ $$VCGDIR/wrap/io_trimesh/import_ctm.h \ $$VCGDIR/wrap/io_trimesh/export_ctm.h SOURCES += io_ctm.cpp -INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib +INCLUDEPATH += /usr/include TARGET = io_ctm win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC @@ -15,8 +15,6 @@ win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/openctm.lib win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a -linux-g++:LIBS += ../../external/lib/linux-g++/libopenctm.a -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libopenctm.a -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libopenctm.a +linux-g++:LIBS += -lopenctm #macx:LIBS += ../../external/lib/macx/libopenctm.a macx:LIBS += $$MACLIBDIR/libopenctm.a debian/patches/02_cstddef.patch0000644000000000000000000000301512266255022013554 0ustar From: Teemu Ikonen Subject: Include on files using offsetoff (closes: #625053) Git-Branch: p/cstddef Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..8fb2fc380c1a53d0e603d1aaeff156 vcglib/wrap/io_tetramesh/import_ply.h | 1 + vcglib/wrap/io_trimesh/import_ply.h | 1 + vcglib/wrap/ply/plystuff.h | 1 + 3 files changed, 3 insertions(+) diff --git a/vcglib/wrap/io_tetramesh/import_ply.h b/vcglib/wrap/io_tetramesh/import_ply.h index 0da4c1f..8370e48 100644 --- a/vcglib/wrap/io_tetramesh/import_ply.h +++ b/vcglib/wrap/io_tetramesh/import_ply.h @@ -36,6 +36,7 @@ created #include #include #include +#include diff --git a/vcglib/wrap/io_trimesh/import_ply.h b/vcglib/wrap/io_trimesh/import_ply.h index 13eaa30..ce2de3a 100644 --- a/vcglib/wrap/io_trimesh/import_ply.h +++ b/vcglib/wrap/io_trimesh/import_ply.h @@ -29,6 +29,7 @@ #include #include #include +#include namespace vcg { namespace tri { diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h index 3e41e63..4761e9f 100644 --- a/vcglib/wrap/ply/plystuff.h +++ b/vcglib/wrap/ply/plystuff.h @@ -57,6 +57,7 @@ Cleaning of the automatic bbox caching support for ply files. First working vers #include #include #include +#include #ifdef WIN32 #include #endif debian/patches/04_eigen.patch0000644000000000000000000000777012266255022013245 0ustar From: Teemu Ikonen Subject: Use Debian Eigen. Git-Branch: p/eigen Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..4c7dc79313100768c23320743a4233 meshlab/src/meshlabplugins/filter_texture/filter_texture.cpp | 8 ++++---- meshlab/src/shared.pri | 1 + .../vcg/complex/algorithms/parametrization/poisson_solver.h | 8 ++++---- vcglib/vcg/complex/algorithms/update/curvature_fitting.h | 10 +++++----- vcglib/vcg/math/eigen.h | 8 ++++---- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/meshlab/src/meshlabplugins/filter_texture/filter_texture.cpp b/meshlab/src/meshlabplugins/filter_texture/filter_texture.cpp index ef4de59..c999530 100644 --- a/meshlab/src/meshlabplugins/filter_texture/filter_texture.cpp +++ b/meshlab/src/meshlabplugins/filter_texture/filter_texture.cpp @@ -23,10 +23,10 @@ #include #include #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/meshlab/src/shared.pri b/meshlab/src/shared.pri index 93ed32f..98d2515 100644 --- a/meshlab/src/shared.pri +++ b/meshlab/src/shared.pri @@ -36,6 +36,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC _USE_MATH_DEFINES # CONFIG += warn_off INCLUDEPATH *= ../.. $$VCGDIR ../$$GLEWDIR/include +INCLUDEPATH += /usr/include/eigen3 DEPENDPATH += ../.. $$VCGDIR # Uncomment these if you want to experiment with newer gcc compilers diff --git a/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h index b19d13f..5b895f7 100644 --- a/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h +++ b/vcglib/vcg/complex/algorithms/parametrization/poisson_solver.h @@ -25,10 +25,10 @@ #define VCG_POISSON_SOLVER #define EIGEN_YES_I_KNOW_SPARSE_MODULE_IS_NOT_STABLE_YET -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/vcglib/vcg/complex/algorithms/update/curvature_fitting.h b/vcglib/vcg/complex/algorithms/update/curvature_fitting.h index 055e2fa..6ed5054 100644 --- a/vcglib/vcg/complex/algorithms/update/curvature_fitting.h +++ b/vcglib/vcg/complex/algorithms/update/curvature_fitting.h @@ -41,11 +41,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // GG include #include #include diff --git a/vcglib/vcg/math/eigen.h b/vcglib/vcg/math/eigen.h index 1522e75..f9ce4bd 100644 --- a/vcglib/vcg/math/eigen.h +++ b/vcglib/vcg/math/eigen.h @@ -53,10 +53,10 @@ struct ei_to_vcgtype; } #include "base.h" -#include "../../eigenlib/Eigen/LU" -#include "../../eigenlib/Eigen/Geometry" -#include "../../eigenlib/Eigen/Array" -#include "../../eigenlib/Eigen/Core" +#include +#include +#include +#include // add support for unsigned char and short int namespace Eigen { debian/copyright0000644000000000000000000003220512266255022011125 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: MeshLab Upstream-Contact: http://meshlab.sourceforge.net/ X-Debianized-By: Teemu Ikonen X-Debianized-Date: 2007-05-29 16:45:55 +0200. Source: http://sourceforge.net/projects/meshlab/files/meshlab/MeshLab%20v1.3.0/MeshLabSrc_AllInc_v130a.tgz The upstream Meshlab source has been repackaged for this Debian release. The primary reason is the uncertain copyright status of some (unused) code in the Meshlab distribution. Additionally, some external libraries which are distributed with the Meshlab source, but are also available in Debian as separate packages have been removed. . The following subdirectories or files have been removed: . meshlab/src/distrib/render_template Unnecessary copies of MOSAICfunctions.h meshlab/src/distrib/sample Textures with unknown copyright status. meshlab/src/external/ann_1.1.1 In Debian. meshlab/src/external/bzip2-1.0.5 In Debian. meshlab/src/external/glew-1.5.1 In Debian. meshlab/src/external/glew-1.7.0 In Debian. meshlab/src/external/inc Not needed for Linux builds. meshlab/src/external/lib3ds-1.3.0 In Debian. meshlab/src/external/muparser_v130 In Debian. meshlab/src/external/muparser_v132 In Debian. meshlab/src/external/ode-0.11.1 Empty (libode-dev is in Debian). meshlab/src/external/OpenCTM-1.0.3 In Debian. meshlab/src/external/openkinect Not needed yet, Debian has freenect. meshlab/src/external/qhull-2003.1 In Debian. meshlab/src/external/tsai-30b3 Not needed for the current build. meshlab/src/meshlabplugins/edit_ocme Unknown license, not needed. meshlab/src/meshlabplugins/edit_vase Unknown license, not needed. vcglib/vcg/Eigen In Debian. vcglib/eigenlib In Debian. vcglib/wrap/system/time Unknown license. Files: * Copyright: 2005-2012 Visual Computing Lab ISTI - Italian National Research Council License: GPL-2+ License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. Files: meshlab/src/distrib/shaders/dimple.* meshlab/src/distrib/shaders/envmap.* meshlab/src/distrib/shaders/glass.* meshlab/src/distrib/shaders/gooch.* meshlab/src/distrib/shaders/polkadot3d.* meshlab/src/distrib/shaders/lattice.frag Copyright: 2002-2004 3Dlabs, Inc. License: BSD-3 /************************************************************************ * * * Copyright (C) 2002-2004 3Dlabs Inc. Ltd. * * * * All rights reserved. * * * * Redistribution and use in source and binary forms, with or without * * modification, are permitted provided that the following conditions * * are met: * * * * Redistributions of source code must retain the above copyright * * notice, this list of conditions and the following disclaimer. * * * * Redistributions in binary form must reproduce the above * * copyright notice, this list of conditions and the following * * disclaimer in the documentation and/or other materials provided * * with the distribution. * * * * Neither the name of 3Dlabs Inc. Ltd. nor the names of its * * contributors may be used to endorse or promote products derived * * from this software without specific prior written permission. * * * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * ************************************************************************/ Files: meshlab/src/distrib/shaders/lattice.gdp meshlab/src/distrib/shaders/lattice.vert Copyright: 2002-2004 LightWork Design Ltd. License: BSD-3 /************************************************************************ * * * Copyright (C) 2002-2004 LightWork Design Ltd. * * * * All rights reserved. * * * * Redistribution and use in source and binary forms, with or without * * modification, are permitted provided that the following conditions * * are met: * * * * Redistributions of source code must retain the above copyright * * notice, this list of conditions and the following disclaimer. * * * * Redistributions in binary form must reproduce the above * * copyright notice, this list of conditions and the following * * disclaimer in the documentation and/or other materials provided * * with the distribution. * * * * Neither the name of LightWork Design Ltd. nor the names of its * * contributors may be used to endorse or promote products derived * * from this software without specific prior written permission. * * * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * ************************************************************************/ Files: meshlab/src/meshlabplugins/filter_poisson/src/* Copyright: 2006, Michael Kazhdan and Matthew Bolitho License: BSD-3 Copyright (c) 2006, Michael Kazhdan and Matthew Bolitho All rights reserved. . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . Redistributions of source code must retain the above copyright notic this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . Neither the name of the Johns Hopkins University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: meshlab/src/meshlabplugins/render_radiance_scaling/* Copyright: 2010 Vergne Romain, Dumas Olivier, INRIA - Institut Nationnal de Recherche en Informatique et Automatique License: GPL-2+ Files: vcglib/apps/sample/trimesh_ant_qt/* Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies) License: BSD-3 ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are ** met: ** * Redistributions of source code must retain the above copyright ** notice, this list of conditions and the following disclaimer. ** * Redistributions in binary form must reproduce the above copyright ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor ** the names of its contributors may be used to endorse or promote ** products derived from this software without specific prior written ** permission. ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** $QT_END_LICENSE$ Files: vcglib/wrap/system/getopt.* Copyright: 1987-1993 Free Software Foundation, Inc. License: GPL-2+ Files: vcglib/wrap/tsai/* Copyright: 2008 by Luca Baronti License: GPL-2+ Files: vcglib/vcg/complex/algorithms/create/emc_lookup_table.h Copyright: 2002 by Computer Graphics Group, RWTH Aachen License: GPL-2+ Files: vcglib/vcg/complex/algorithms/create/mc_lookup_table.h Copyright: 2002 Thomas Lewiner License: GPL-2+ Files: vcglib/vcg/math/random_generator.h Copyright: 2005-2009 Visual Computing Lab ISTI - Italian National Research Council, 1994 Everett F. Carter Jr. [Polar form of the Box-Muller Transformation], 1997-2002 Makoto Matsumoto and Takuji Nishimura [Mersenne RNG] License: GPL-2+ Files: vcglib/wrap/tsai/* Copyright: 2008 by Luca Baronti License: GPL-2+ Files: debian/* Copyright: 2007-2013, Teemu Ikonen License: GPL-2+ debian/meshlab.desktop0000644000000000000000000000127612266255022012204 0ustar [Desktop Entry] Version=1.0 Name=MeshLab Name[en_GB]=MeshLab GenericName=Mesh processing GenericName[en_GB]=Mesh processing Comment=View and process meshes Type=Application Exec=meshlab Icon=/usr/share/pixmaps/meshlab_32x32.xpm Terminal=false MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf; Categories=Graphics;3DGraphics;Viewer;Qt; debian/compat0000644000000000000000000000000212266255022010366 0ustar 9 debian/source/0000755000000000000000000000000012266255022010470 5ustar debian/source/format0000644000000000000000000000001412266255022011676 0ustar 3.0 (quilt) debian/control0000644000000000000000000000225412266255022010576 0ustar Source: meshlab Section: graphics Priority: extra Maintainer: Teemu Ikonen Vcs-Browser: http://git.debian.org/?p=debian-science/packages/meshlab.git Vcs-Git: http://git.debian.org/git/debian-science/packages/meshlab.git Build-Depends: debhelper (>= 9), lib3ds-dev (>=1.3.0), libglew-dev, libqt4-dev, libqt4-opengl-dev, libbz2-dev, xsltproc, docbook-xsl, libqhull-dev, libmuparser-dev, libeigen3-dev, libopenctm-dev Homepage: http://meshlab.sourceforge.net/ Standards-Version: 3.9.5 Package: meshlab Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: chemical-mime-data Description: System for processing and editing triangular meshes MeshLab is an open source, portable, and extendible 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 this kind of meshes. . Meshlab can read files in these formats: PLY, STL, OFF, OBJ, 3DS, COLLADA and PTX. It can write PLY, STL, OFF, OBJ, 3DS, COLLADA, VRML, and DXF. debian/mime0000644000000000000000000000043512266255022010044 0ustar model/mesh; /usr/bin/meshlab '%s'; test=/usr/bin/test -n "$DISPLAY" application/x-3ds; /usr/bin/meshlab '%s'; test=/usr/bin/test -n "$DISPLAY" image/x-3ds; /usr/bin/meshlab '%s'; test=/usr/bin/test -n "$DISPLAY" application/sla; /usr/bin/meshlab '%s'; test=/usr/bin/test -n "$DISPLAY" debian/dirs0000644000000000000000000000005212266255022010051 0ustar usr/bin usr/lib/meshlab usr/share/meshlab debian/menu0000644000000000000000000000015412266255022010057 0ustar ?package(meshlab):needs="X11" section="Applications/Graphics"\ title="meshlab" command="/usr/bin/meshlab" debian/meshlab.sharedmimeinfo0000644000000000000000000000553312266255022013525 0ustar Stanford Triangle Format Stereolithography File Format Wavefront Object File Quad Object File Geomview Object File Format Cyclone pointcloud export format VCG Dump File Format Breuckmann Scanner File COLLADA File Format OpenCTM File Format EXPE binary point set EXPE ASCII point set XYZ Point Cloud GNU Triangulated Surface TRI photogrammetric reconstruction ASCII triplet of points X3D XML File X3D VRML File VRML File Universal 3D File Format Intermediate Data Text Format debian/meshlab.lintian-overrides0000644000000000000000000000010512266255022014157 0ustar meshlab: hardening-no-fortify-functions usr/lib/meshlab/plugins/*.so debian/metapatches/0000755000000000000000000000000012266255022011466 5ustar debian/metapatches/15_gcc470000644000000000000000000000022212266255022012621 0ustar From: Teemu Ikonen Subject: Fix FTBFS with GCC-4.7 Git-Branch: p/gcc47 Closes: #667276 Thanks to Matej Vela for the patch. debian/metapatches/08_externals0000644000000000000000000000016012266255022013722 0ustar From: Teemu Ikonen Subject: Only build necessary external sources. Git-Branch: p/externals debian/metapatches/10_shadersdir0000644000000000000000000000021712266255022014041 0ustar From: Teemu Ikonen Subject: Hardcode shadersDir to the correct path in Debian in various plugins Git-Branch: p/shadersdir debian/metapatches/19_crash-on-save0000644000000000000000000000024212266255022014366 0ustar From: Teemu Ikonen Subject: Fix crash on project save (closes: #718583) Git-Branch: p/crash-on-save Patch from upstream SVN commit [r6114]. debian/metapatches/18_format-security0000644000000000000000000000020412266255022015052 0ustar From: Teemu Ikonen Subject: Fix compilation errors with -Werror=format-security. Git-Branch: p/format-security debian/metapatches/09_rpath0000644000000000000000000000016012266255022013034 0ustar From: Teemu Ikonen Subject: Use /usr/lib/meshlab as RPATH in binaries. Git-Branch: p/rpath debian/metapatches/14_structuresynth0000644000000000000000000000046012266255022015043 0ustar From: Teemu Ikonen Subject: Include glu.h where needed in included structure-synth code. Git-Branch: p/structuresynth Also link structuresynth code with libGLU. This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same issue in the real structure-synth Debian package. debian/metapatches/07_disable-updates0000644000000000000000000000017012266255022014763 0ustar From: Teemu Ikonen Subject: Disable checking for updates on startup. Git-Branch: p/disable-updates debian/metapatches/02_qhull0000644000000000000000000000012712266255022013037 0ustar From: Teemu Ikonen Subject: Use Debian qhull. Git-Branch: p/qhull debian/metapatches/06_eigen0000644000000000000000000000012712266255022013005 0ustar From: Teemu Ikonen Subject: Use Debian Eigen. Git-Branch: p/eigen debian/metapatches/17_openctm0000644000000000000000000000013212266255022013361 0ustar From: Teemu Ikonen Subject: Use Debian OpenCTM Git-Branch: p/openctm debian/metapatches/13_cstddef0000644000000000000000000000020412266255022013324 0ustar From: Teemu Ikonen Subject: Include on files using offsetoff (closes: #625053) Git-Branch: p/cstddef debian/metapatches/11_pluginsdir0000644000000000000000000000017412266255022014074 0ustar From: Teemu Ikonen Subject: Hardcode pluginsDir to the correct path in Debian Git-Branch: p/pluginsdir debian/metapatches/03_lib3ds0000644000000000000000000000013112266255022013066 0ustar From: Teemu Ikonen Subject: Use Debian lib3ds. Git-Branch: p/lib3ds debian/metapatches/01_muparser0000644000000000000000000000013512266255022013546 0ustar From: Teemu Ikonen Subject: Use Debian muparser. Git-Branch: p/muparser debian/metapatches/16_overflow0000644000000000000000000000025412266255022013563 0ustar From: Teemu Ikonen Subject: Fix overflowing array index in VCGlib Git-Branch: p/overflow Fixes also E-array-bounds error in Debian build log scanner. debian/metapatches/04_libbz20000644000000000000000000000013112266255022013073 0ustar From: Teemu Ikonen Subject: Use Debian libbz2. Git-Branch: p/libbz2 debian/metapatches/05_glew0000644000000000000000000000012512266255022012651 0ustar From: Teemu Ikonen Subject: Use Debian GLEW. Git-Branch: p/glew debian/metapatches/12_ply_numeric0000644000000000000000000000027312266255022014243 0ustar From: Teemu Ikonen Subject: Set LC_NUMERIC to "C" Git-Branch: p/ply_numeric Fixes reading of ascii float values in locales which use the comma as a float separator.