diff options
| -rw-r--r-- | graphics/meshlab/README | 11 | ||||
| -rw-r--r-- | graphics/meshlab/lapack.patch | 11 | ||||
| -rw-r--r-- | graphics/meshlab/meshlab.SlackBuild | 108 | ||||
| -rw-r--r-- | graphics/meshlab/meshlab.desktop | 13 | ||||
| -rw-r--r-- | graphics/meshlab/meshlab.info | 10 | ||||
| -rw-r--r-- | graphics/meshlab/meshlab_32x32.xpm | 118 | ||||
| -rw-r--r-- | graphics/meshlab/meshlab_48x48.xpm | 170 | ||||
| -rw-r--r-- | graphics/meshlab/patches/1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df.patch | 79 | ||||
| -rw-r--r-- | graphics/meshlab/patches/612388c42d00ab8eba1d9626a7da33a18c724d76.patch | 28 | ||||
| -rw-r--r-- | graphics/meshlab/patches/bzip2.patch | 26 | ||||
| -rw-r--r-- | graphics/meshlab/patches/lapack.patch | 11 | ||||
| -rw-r--r-- | graphics/meshlab/patches/levmar.patch | 112 | ||||
| -rw-r--r-- | graphics/meshlab/patches/mpir.patch | 16 | ||||
| -rw-r--r-- | graphics/meshlab/patches/muparser.patch | 14 | ||||
| -rw-r--r-- | graphics/meshlab/plystuff.diff | 13 | ||||
| -rw-r--r-- | graphics/meshlab/slack-desc | 2 |
16 files changed, 55 insertions, 687 deletions
diff --git a/graphics/meshlab/README b/graphics/meshlab/README index 22fe7cf1d4ef..9880c7926cad 100644 --- a/graphics/meshlab/README +++ b/graphics/meshlab/README @@ -1,5 +1,6 @@ -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 this kind of mesh. +MeshLab is an open source, portable, and extensible system for the processing +and editing of unstructured large 3D triangular meshes. It 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. These tools include MeshLab +proper, a versatile program with a graphical user interface. diff --git a/graphics/meshlab/lapack.patch b/graphics/meshlab/lapack.patch deleted file mode 100644 index 81c094634050..000000000000 --- a/graphics/meshlab/lapack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h ---- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 -+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 -@@ -27,7 +27,6 @@ - - /* specify whether to use LAPACK or not. The first option is strongly recommended */ - #define HAVE_LAPACK /* use LAPACK */ -- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */ - - /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to - * retain working memory between calls. Such a choice, however, renders these routines diff --git a/graphics/meshlab/meshlab.SlackBuild b/graphics/meshlab/meshlab.SlackBuild index 61f668473a95..db322a1554db 100644 --- a/graphics/meshlab/meshlab.SlackBuild +++ b/graphics/meshlab/meshlab.SlackBuild @@ -25,8 +25,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=meshlab -VERSION=${VERSION:-2016.12} -VCGLIBVER=${VCGLIBVER:-1.0.1} +SRCNAM=Meshlab +VCGLIB=vcglib +VERSION=${VERSION:-2021.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -61,7 +62,6 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -71,81 +71,59 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf meshlab -tar xvf $CWD/meshlab-$VERSION.tar.gz --transform="s#^meshlab-$VERSION/#meshlab/#" - -rm -rf vcglib -tar xvf $CWD/vcglib-$VCGLIBVER.tar.gz --transform="s#^vcglib-$VCGLIBVER/#vcglib/#" - -chown -R root:root meshlab vcglib -find -L meshlab vcglib \ +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --transform="s#$SRCNAM-$VERSION/#$VERSION/#" +cd $PRGNAM-$VERSION/src +tar xvf $CWD/$VCGLIB-$VERSION.tar.gz --transform="s#$VCGLIB-$VERSION/#$VCGLIB/#" +cd - +chown -R root:root $PRGNAM-$VERSION +find -L $PRGNAM-$VERSION \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cd meshlab - -# patches from or via Arch -patch -p1 < $CWD/patches/mpir.patch # use external library, see also below -patch -p1 < $CWD/patches/bzip2.patch # use external library, see also below -patch -p1 < $CWD/patches/muparser.patch # use external library, see also below -patch -p1 < $CWD/patches/levmar.patch # use external library, see also below -patch -p1 < $CWD/patches/lapack.patch # enable lapack -# fix derpy filename -mv src/plugins_experimental/io_TXT/io_txt.pro src/plugins_experimental/io_TXT/io_TXT.pro -# fix from git: https://github.com/cnr-isti-vclab/meshlab/commit/1e2a54c -patch -p1 < $CWD/patches/1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df.patch -# fix from git: https://github.com/cnr-isti-vclab/meshlab/commit/612388c -patch -p1 < $CWD/patches/612388c42d00ab8eba1d9626a7da33a18c724d76.patch - -# Build the supplied dependencies (they will be statically linked into meshlab) -cd src/external - - # don't use meshlab's ancient mpir - rm -rf inc/ lib/ # <-- mpir in these dirs - # and don't use meshlab's ancient bzip2, muParser, levmar - sed -i \ - -e 's/bzip2.*pro//' -e '/muparser/d' -e '/levmar/d' \ - external.pro - - qmake-qt5 -recursive external.pro \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS -std=c++11" - make - -cd .. - -# Build meshlab itself -qmake-qt5 -recursive meshlab_mini.pro \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS -std=c++11" -make - -mkdir -p $PKG/opt -cp -a distrib/ $PKG/opt/meshlab - -mkdir -p $PKG/usr/bin -ln -s \ - /opt/meshlab/{meshlab,meshlabserver} \ - $PKG/usr/bin +cd $PRGNAM-$VERSION + +mkdir -p build +cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DALLOW_SYSTEM_QHULL=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -G Ninja \ + -B ./build \ + -S ./src +# shellcheck disable=SC2046 # allow MAKEFLAGS to split when passing multiple flags. +DESTDIR=$PKG "${NINJA:=ninja}" $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "./build" install + +# fix plugin folder +if [ $LIBDIRSUFFIX ] ; then + mkdir -p $PKG/usr/lib/$PRGNAM + cd $PKG/usr/lib/$PRGNAM + ln -s ../../lib$LIBDIRSUFFIX/$PRGNAM/plugins plugins + cd - +fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/share/pixmaps -cp \ - $CWD/meshlab_{32x32,48x48}.xpm \ - $PKG/usr/share/pixmaps +# Install and compress man pages +mkdir -p $PKG/usr/man/man1 +cp docs/man/$PRGNAM.1 $PKG/usr/man/man1/ +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \; + for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done + ) +fi -mkdir -p $PKG/usr/share/applications -cp \ - $CWD/meshlab.desktop \ - $PKG/usr/share/applications +# fix version in desktop entry +sed -i "s#Version=.*#Version=$VERSION#" $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - $TMP/$PRGNAM/LICENSE.txt $TMP/$PRGNAM/README.md \ + LICENSE.txt README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/meshlab/meshlab.desktop b/graphics/meshlab/meshlab.desktop deleted file mode 100644 index f92badb0f15a..000000000000 --- a/graphics/meshlab/meshlab.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[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;application/sla; -Categories=Graphics;3DGraphics;Viewer;Qt; diff --git a/graphics/meshlab/meshlab.info b/graphics/meshlab/meshlab.info index 99d2c6a261a7..13eb48e377ef 100644 --- a/graphics/meshlab/meshlab.info +++ b/graphics/meshlab/meshlab.info @@ -1,10 +1,10 @@ PRGNAM="meshlab" -VERSION="2016.12" +VERSION="2021.10" HOMEPAGE="http://www.meshlab.net/" -DOWNLOAD="https://github.com/cnr-isti-vclab/meshlab/archive/v2016.12/meshlab-2016.12.tar.gz \ - https://github.com/cnr-isti-vclab/vcglib/archive/v1.0.1/vcglib-1.0.1.tar.gz" -MD5SUM="74c5732656633aa4a3c8649a306d4c15 \ - 4fee598c1b3c4f8ceca7086fd68cf75d" +DOWNLOAD="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-2021.10/meshlab-2021.10.tar.gz \ + https://github.com/cnr-isti-vclab/vcglib/archive/2021.10/vcglib-2021.10.tar.gz" +MD5SUM="bb1d2f373549cce1d48fb589033f6b2a \ + 12cce090b9292e3306f6ee4848e58e1e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="levmar muParser mpir" diff --git a/graphics/meshlab/meshlab_32x32.xpm b/graphics/meshlab/meshlab_32x32.xpm deleted file mode 100644 index d5a042fec8ba..000000000000 --- a/graphics/meshlab/meshlab_32x32.xpm +++ /dev/null @@ -1,118 +0,0 @@ -/* 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~~~~~~~~~~~", -"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" -}; diff --git a/graphics/meshlab/meshlab_48x48.xpm b/graphics/meshlab/meshlab_48x48.xpm deleted file mode 100644 index 08dcc6dcc70d..000000000000 --- a/graphics/meshlab/meshlab_48x48.xpm +++ /dev/null @@ -1,170 +0,0 @@ -/* 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." -}; diff --git a/graphics/meshlab/patches/1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df.patch b/graphics/meshlab/patches/1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df.patch deleted file mode 100644 index 3d4638bdeb33..000000000000 --- a/graphics/meshlab/patches/1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 1e2a54cee2fcb2f0fc15fd83c1014e1813eb75df Mon Sep 17 00:00:00 2001 -From: Guido Ranzuglia <guido.ranzuglia@isti.cnr.it> -Date: Mon, 9 Jan 2017 17:51:01 +0100 -Subject: [PATCH] - added locale support to MeshLab&MeshLabServer -fixed "not - enough memory" bug in MeshLabServer - ---- - src/meshlab/main.cpp | 2 ++ - src/meshlabserver/mainserver.cpp | 21 ++++++++++++++++----- - 2 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/src/meshlab/main.cpp b/src/meshlab/main.cpp -index eee69b9..068e8ab 100644 ---- a/src/meshlab/main.cpp -+++ b/src/meshlab/main.cpp -@@ -24,11 +24,13 @@ - #include <QMessageBox> - #include "mainwindow.h" - #include <QString> -+#include <clocale> - - int main(int argc, char *argv[]) - { - - MeshLabApplication app(argc, argv); -+ std::setlocale(LC_ALL, "C"); - QLocale::setDefault(QLocale::C); - QCoreApplication::setOrganizationName(MeshLabApplication::organization()); - #if QT_VERSION >= 0x050100 -diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp -index ab9a7c0..28b86c3 100644 ---- a/src/meshlabserver/mainserver.cpp -+++ b/src/meshlabserver/mainserver.cpp -@@ -29,7 +29,10 @@ - #include <common/filterscript.h> - #include <common/meshlabdocumentxml.h> - #include <common/mlexception.h> -+#include <common/filterparameter.h> - #include <wrap/qt/qt_thread_safe_memory_info.h> -+#include "../meshlab/mainwindow.h" -+#include <clocale> - - #include <QFileInfo> - -@@ -619,11 +622,11 @@ struct OutProject - - int main(int argc, char *argv[]) - { -- -- - FILE* logfp = stdout; - FILE* dumpfp = NULL; - MeshLabApplication app(argc, argv); -+ std::setlocale(LC_ALL, "C"); -+ QLocale::setDefault(QLocale::C); - if(argc == 1) - { - commandline::usage(); -@@ -645,9 +648,17 @@ int main(int argc, char *argv[]) - exit(-1); - } - -- QSettings st; -- QVariant mbvar = st.value("MeshLab::System::maxGPUMemDedicatedToGeometry"); -- std::ptrdiff_t maxgpumem = (std::ptrdiff_t)mbvar.toInt() * (float)(1024 * 1024); -+ QSettings settings(MeshLabApplication::organization(),MeshLabApplication::appArchitecturalName(MeshLabApplication::HW_64BIT)); -+ -+ QVariant xmlgpupar = settings.value(MainWindowSetting::maximumDedicatedGPUMem()); -+ -+ QDomDocument doc; -+ doc.setContent(xmlgpupar.toString(), false); -+ -+ QDomElement paramelem = doc.firstChild().toElement(); -+ int gpumemmb = paramelem.attribute("value").toInt(); -+ -+ std::ptrdiff_t maxgpumem = (std::ptrdiff_t) gpumemmb * (float)(1024 * 1024); - vcg::QtThreadSafeMemoryInfo gpumeminfo(maxgpumem); - - MeshDocument meshDocument; diff --git a/graphics/meshlab/patches/612388c42d00ab8eba1d9626a7da33a18c724d76.patch b/graphics/meshlab/patches/612388c42d00ab8eba1d9626a7da33a18c724d76.patch deleted file mode 100644 index d0b7abcdd247..000000000000 --- a/graphics/meshlab/patches/612388c42d00ab8eba1d9626a7da33a18c724d76.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 612388c42d00ab8eba1d9626a7da33a18c724d76 Mon Sep 17 00:00:00 2001 -From: bartoszek <bartus@yopmail.com> -Date: Sun, 15 Jan 2017 22:19:18 +0100 -Subject: [PATCH] add missing linker flag for linux - -also extend post link file copying to include linux build ( linking is somewhat strange but wont work without ) ---- - src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -index 814bd31..a93f67a 100644 ---- a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -+++ b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro -@@ -2,6 +2,7 @@ include (../../shared.pri) - - macx:QMAKE_CXX = clang++-mp-3.9 - macx:QMAKE_LFLAGS += -L/opt/local/lib/libomp -lomp -+linux:QMAKE_LFLAGS += -lgomp - macx:QMAKE_CXXFLAGS_RELEASE+= -O3 -DRELEASE -funroll-loops -ffast-math -Wno-sign-compare -Wno-unused-parameter - - QMAKE_CXXFLAGS+=-fopenmp -@@ -22,4 +23,4 @@ DEFINES += FOR_RELEASE - - #PRE_TARGETDEPS += ./filter_screened_poisson.xml - macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml" -- -+linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -s "$$TARGET".xml lib"$$TARGET".xml" diff --git a/graphics/meshlab/patches/bzip2.patch b/graphics/meshlab/patches/bzip2.patch deleted file mode 100644 index 49a822aa746e..000000000000 --- a/graphics/meshlab/patches/bzip2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur -r meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro ---- meshlab.orig/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2016-10-31 21:31:43.301625217 +0100 -+++ meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro 2016-10-31 21:36:46.694965117 +0100 -@@ -35,9 +35,9 @@ - win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/bz2.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/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
-+linux-g++-32:LIBS += -lbz2
-+linux-g++-64:LIBS += -lbz2
- mac:LIBS += -lbz2
-
- win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
-@@ -48,9 +48,6 @@ - win32-msvc2015: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
-
-
- CONFIG(release, debug|release) {
diff --git a/graphics/meshlab/patches/lapack.patch b/graphics/meshlab/patches/lapack.patch deleted file mode 100644 index 81c094634050..000000000000 --- a/graphics/meshlab/patches/lapack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h ---- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 -+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 -@@ -27,7 +27,6 @@ - - /* specify whether to use LAPACK or not. The first option is strongly recommended */ - #define HAVE_LAPACK /* use LAPACK */ -- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */ - - /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to - * retain working memory between calls. Such a choice, however, renders these routines diff --git a/graphics/meshlab/patches/levmar.patch b/graphics/meshlab/patches/levmar.patch deleted file mode 100644 index a43a2aeb1e6f..000000000000 --- a/graphics/meshlab/patches/levmar.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- ../meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2016-10-31 00:00:30.266005497 +0100 -+++ meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2016-10-31 21:55:34.158322851 +0100 -@@ -51,9 +51,9 @@ - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/levmar.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/levmar.lib
- win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
--linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar
--linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar
--linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar
-+linux-g++:LIBS += -llevmar
-+linux-g++-32:LIBS += -llevmar
-+linux-g++-64:LIBS += -llevmar
- macx:LIBS += $$MACLIBDIR/liblevmar.a
-
- # Please never ever uncomment this...
-diff -Naur -r ../meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h ---- ../meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2016-10-31 00:00:30.692667284 +0100 -+++ meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h 2016-10-31 22:10:49.158342653 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h ---- ../meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2016-10-31 00:00:30.692667284 +0100 -+++ meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h 2016-10-31 22:11:16.808343251 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff -Naur -r ../meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h ---- ../meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h 2016-10-31 00:00:08.816250885 +0100 -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/levmarmethods.h 2016-10-31 22:23:35.671692575 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h ---- ../meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h 2016-10-31 00:00:08.816250885 +0100 -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/solver.h 2016-10-31 22:24:05.935026562 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff -Naur -r ../meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h ---- ../meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2016-10-31 00:00:09.476243333 +0100 -+++ meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h 2016-10-31 22:30:06.391701030 +0100 -@@ -12,7 +12,7 @@ -
- #include <list>
-
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
-
- struct LevmarCorrelation {
-diff -Naur -r ../meshlab/src/plugins_experimental/filter_mutualglobal/solver.h meshlab/src/plugins_experimental/filter_mutualglobal/solver.h ---- ../meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2016-10-31 00:00:09.476243333 +0100 -+++ meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2016-10-31 22:29:02.815032988 +0100 -@@ -5,7 +5,7 @@ - #include "alignset.h"
-
- #include "parameters.h"
--#include "../../external/levmar-2.3/lm.h"
-+#include <levmar/levmar.h>
-
- #include <iostream>
- #include <fstream>
-diff --git a/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro b/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -index 049bec6..84f6ca9 100644 ---- a/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -+++ meshlab/src/plugins_experimental/edit_mutualcorrs/edit_mutualcorrs.pro -@@ -1,7 +1,7 @@ - include (../../shared.pri)
-
-
--HEADERS = += ./alignset.h \
-+HEADERS += ./alignset.h \
- ./levmarmethods.h \
- ./mutual.h \
- ./parameters.h \
-@@ -29,8 +29,8 @@ FORMS = edit_mutualcorrsDialog.ui - win32-msvc2013: LIBS += ../../external/lib/win32-msvc2013/levmar.lib
- win32-msvc2015: LIBS += ../../external/lib/win32-msvc2015/levmar.lib
- win32-g++:LIBS += -L../../external -llevmar
--linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar
--linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar
--linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar
-+linux-g++:LIBS += -llevmar
-+linux-g++-32:LIBS += -llevmar
-+linux-g++-64:LIBS += -llevmar
- macx:LIBS += $$MACLIBDIR/liblevmar.a
-
diff --git a/graphics/meshlab/patches/mpir.patch b/graphics/meshlab/patches/mpir.patch deleted file mode 100644 index 9e0829b6942c..000000000000 --- a/graphics/meshlab/patches/mpir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/meshlabplugins/filter_csg/filter_csg.pro b/src/meshlabplugins/filter_csg/filter_csg.pro -index 52147b1..f41385d 100644 ---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro -+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro -@@ -20,7 +20,7 @@ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../exte - win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib - win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib --linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 --linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a --linux-g++-64:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 --linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmpirxx.a ../../external/lib/linux-g++-64/libmpir.a -+unix:LIBS += -lmpirxx -lmpir -+linux-g++-:LIBS += -lmpirxx -lmpir -+linux-g++-32:LIBS += -lmpirxx -lmpir -+linux-g++-64:LIBS += -lmpirxx -lmpir diff --git a/graphics/meshlab/patches/muparser.patch b/graphics/meshlab/patches/muparser.patch deleted file mode 100644 index d500a17d767f..000000000000 --- a/graphics/meshlab/patches/muparser.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur ../meshlab/src/meshlabplugins/filter_func/filter_func.pro meshlab/src/meshlabplugins/filter_func/filter_func.pro ---- ../meshlab/src/meshlabplugins/filter_func/filter_func.pro 2016-10-31 00:00:30.459336619 +0100 -+++ meshlab/src/meshlabplugins/filter_func/filter_func.pro 2016-10-31 21:42:47.134972919 +0100 -@@ -19,7 +19,7 @@ - win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/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
-+linux-g++-32:LIBS += -lmuparser
-+linux-g++-64:LIBS += -lmuparser
- win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
diff --git a/graphics/meshlab/plystuff.diff b/graphics/meshlab/plystuff.diff deleted file mode 100644 index 74f28a4d2119..000000000000 --- a/graphics/meshlab/plystuff.diff +++ /dev/null @@ -1,13 +0,0 @@ -*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500 ---- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500 -*************** -*** 75,80 **** ---- 75,81 ---- - #define pb_close _close - #define DIR_SEP "\\" - #else -+ #include <unistd.h> - #define pb_mkdir(n) mkdir(n,0755) - #define pb_access access - #define pb_stat stat - diff --git a/graphics/meshlab/slack-desc b/graphics/meshlab/slack-desc index b6536e687e33..2cb3622bf40a 100644 --- a/graphics/meshlab/slack-desc +++ b/graphics/meshlab/slack-desc @@ -15,5 +15,5 @@ meshlab: unstructured models arising in 3D scanning, providing a set of tools meshlab: for editing, cleaning, healing, inspecting, rendering and converting meshlab: this kind of mesh. meshlab: -meshlab: Homepage: http://www.meshlab.net/ +meshlab: Homepage: https://www.meshlab.net/ meshlab: |