Update to 2016.12-1

1 files changed, 52 insertions, 45 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5de33b353d40..36c949d8e8d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,86 @@
 # Maintainer: Jonathan Liu <net147@gmail.com>
 pkgname=meshlab
-pkgver=1.3.3
-pkgrel=6
-pkgdesc="System for processing and editing triangular meshes"
+_realpkgname=MeshLab
+pkgver=2016.12
+pkgrel=1
+pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)"
 arch=('i686' 'x86_64')
-url="http://meshlab.sourceforge.net/"
+url="http://www.meshlab.net/"
 license=('GPL2')
-depends=('bzip2' 'desktop-file-utils' 'glu' 'lapack' 'mpir' 'openssl' 'qt4')
-install="${pkgname}.install"
-source=("http://downloads.sourceforge.net/project/meshlab/meshlab/MeshLab%20v${pkgver//[a-z]/}/MeshLabSrc_AllInc_v${pkgver//./}.tgz"
-        "fix_local_stl_import.patch"
-        "gcc-4.7.patch"
-        "lapack.patch"
-        "mpir.patch"
-        "nullptr.patch"
+depends=('bzip2' 'muparser' 'levmar' 'lib3ds' 'desktop-file-utils' 'glu' 'mpir' 'openssl' 'qt5-base' 'qt5-declarative' 'qt5-script')
+makedepends=('git')
+source=("git://github.com/cnr-isti-vclab/${pkgname}.git#tag=v2016.12"
+        "git://github.com/cnr-isti-vclab/vcglib.git#commit=611341b754b08dd2b8d655b92d855de9dcce4a18"
+        "cpp11_abs.patch"
         "rpath.patch"
-        "qt-4.8.patch"
+        "meshlabserver_GLU.patch"
+        "external.patch"
+        "3ds.patch"
+        "bzip2.patch"
+        "levmar.patch"
+        "mpir.patch"
+        "muparser.patch"
         "meshlab.1"
         "meshlabserver.1"
         "meshlab.desktop")
-noextract=("MeshLabSrc_AllInc_v${pkgver//./}.tgz")
-md5sums=('cbdd83d4f3ed69e7a9837c34ebae307a'
-         '5582b6a1bcd7fd46b4854e1f4a8aea7f'
-         '65d7ff92ad2d6e74119af9c0e377bb37'
-         '4139d3217f1540c67306545213126391'
-         '308f1b90f7de56f9df1485808713ed53'
-         'c8689554179380947a118a493a564715'
+md5sums=('SKIP'
+         'SKIP'
+         'c1cfb910d20db49ec195d9918036e3c3'
          '2cc1246fc1b01029ae762c82a7dbf364'
-         '1df4ee299f4ad996a05e80d9cf5e5389'
+         '5d87f00356539f84f37f873f304eb11e'
+         '038494125d7bd422074fc5635c5579ca'
+         'e51b027eb9d78b82de73c4724b3928cf'
+         '616b0dcf018f46a490867028d6ddc533'
+         '1a53a92e12f74520b36e38d9a2311834'
+         '5dbc0d45dd96a4439857d51c545dafb9'
+         '64caafa96bef4208d641e889099eba26'
          '32a52b0a8dab1b4816b028b463e7fd9c'
          '0af205a93961dbfcb6b003765f79c4cf'
          '18aed0a21276a22325bf8c32166fb110')
 
 prepare() {
-  cd "${srcdir}"
-
-  tar -zxf "MeshLabSrc_AllInc_v${pkgver//./}.tgz"
+  cd "${srcdir}/${pkgname}"
 
   # remove bundled headers and libraries
-  rm -fr meshlab/src/external/{inc,lib}
-
-  # fix text import breaking for different locales
-  patch -Np0 -i "${srcdir}/fix_local_stl_import.patch"
-  # fix compile errors with GCC 4.7
-  patch -Np0 -i "${srcdir}/qt-4.8.patch"
-  # fix Qt 4.8 compatibility
-  patch -Np1 -i "${srcdir}/gcc-4.7.patch"
-
-  cd "${srcdir}/meshlab/src"
-  # build levmar with lapack
-  patch -Np2 -i "${srcdir}/lapack.patch"
-  # use system mpir
-  patch -Np2 -i "${srcdir}/mpir.patch"
-  # fix use of bool to return null pointer
-  patch -Np2 -i "${srcdir}/nullptr.patch"
+  rm -fr src/external/{inc,lib}
+  # fix wrong case for io_TXT plugin project file
+  mv src/plugins_experimental/io_TXT/io_txt.pro src/plugins_experimental/io_TXT/io_TXT.pro
+  # fix C++11 abs()
+  patch -Np1 -i "${srcdir}/cpp11_abs.patch"
   # fix rpath
-  patch -Np2 -i "${srcdir}/rpath.patch"
+  patch -Np1 -i "${srcdir}/rpath.patch"
+  # add missing linking of GLU library for meshlabserver
+  patch -Np1 -i "${srcdir}/meshlabserver_GLU.patch"
+  # do not use bundled external libraries
+  patch -Np1 -i "${srcdir}/external.patch"
+  # use system 3ds library
+  patch -Np1 -i "${srcdir}/3ds.patch"
+  # use system bzip2 library
+  patch -Np1 -i "${srcdir}/bzip2.patch"
+  # use system levmar library
+  patch -Np1 -i "${srcdir}/levmar.patch"
+  # use system mpir library
+  patch -Np1 -i "${srcdir}/mpir.patch"
+  # use system muparser library
+  patch -Np1 -i "${srcdir}/muparser.patch"
 }
 
 build() {
-  cd "${srcdir}/meshlab/src"
+  cd "${srcdir}/${pkgname}/src"
 
   # build external libraries
   cd external
-  qmake-qt4 -recursive external.pro
+  qmake -recursive external.pro
   make
 
   # build meshlab
   cd ..
-  qmake-qt4 -recursive meshlab_full.pro
+  qmake -recursive meshlab_full.pro
   make
 }
 
 package() {
-  cd "${srcdir}/meshlab/src"
+  cd "${srcdir}/${pkgname}/src"
 
   # install meshlab
   install -d -m755 "${pkgdir}/opt"