diff options
| author | bartus | 2017-07-06 19:34:18 +0200 |
|---|---|---|
| committer | bartus | 2017-07-06 19:34:18 +0200 |
| commit | 9f9ff0e12cf1e7abb27ec5459f0d4f1567fa20a5 (patch) | |
| tree | b80f479e0db889a7655287ae310a55656e235f8b | |
| parent | f50aa42b61a4deb2e0f20d8e8e7cc3a276a0fe50 (diff) | |
| download | aur-9f9ff0e12cf1e7abb27ec5459f0d4f1567fa20a5.tar.gz | |
drop quick fix from prev commit, already corrected in repo
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | patch.patch | 13 |
3 files changed, 2 insertions, 20 deletions
@@ -1,6 +1,6 @@ pkgbase = meshlab-git pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) - pkgver = 2016.12.r170.gb4103dc0 + pkgver = 2016.12.r177.g70b9dd7f pkgrel = 1 url = http://www.meshlab.net install = meshlab-git.install @@ -33,7 +33,6 @@ pkgbase = meshlab-git source = mpir.patch source = rpath.patch source = import_bundle_out.patch - source = patch.patch source = meshlab.desktop md5sums = SKIP md5sums = SKIP @@ -47,7 +46,6 @@ pkgbase = meshlab-git md5sums = cb5a75c2f2cdf154ad61f753439f226f md5sums = 07da2fc11c1667e6c6a07f0042a2757d md5sums = 765a59b64dd05b74f6a4bdf3962a1d93 - md5sums = 7cb2aa39c2b4a6e7abbec40201df9c7e md5sums = 18aed0a21276a22325bf8c32166fb110 pkgname = meshlab-git @@ -1,6 +1,6 @@ # Maintainer: bartus <aur@bartus.33mail.com> pkgname=meshlab-git -pkgver=2016.12.r170.gb4103dc0 +pkgver=2016.12.r177.g70b9dd7f pkgrel=1 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') @@ -23,7 +23,6 @@ source=("git+https://github.com/cnr-isti-vclab/meshlab.git" "mpir.patch" "rpath.patch" "import_bundle_out.patch" - "patch.patch" "meshlab.desktop") md5sums=('SKIP' 'SKIP' @@ -37,7 +36,6 @@ md5sums=('SKIP' 'cb5a75c2f2cdf154ad61f753439f226f' '07da2fc11c1667e6c6a07f0042a2757d' '765a59b64dd05b74f6a4bdf3962a1d93' - '7cb2aa39c2b4a6e7abbec40201df9c7e' '18aed0a21276a22325bf8c32166fb110') pkgver() { @@ -71,7 +69,6 @@ prepare() { patch -Np0 -i shaders_dir.patch msg "fix import bundler/nvm" patch -Np0 -i import_bundle_out.patch - patch -Np0 -i patch.patch } build() { diff --git a/patch.patch b/patch.patch deleted file mode 100644 index 274d70ec4c77..000000000000 --- a/patch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wrap/io_trimesh/export_3ds.h b/wrap/io_trimesh/export_3ds.h -index 387222f5..9a473b75 100644 ---- vcglib/wrap/io_trimesh/export_3ds.h -+++ b/wrap/io_trimesh/export_3ds.h -@@ -362,7 +362,7 @@ namespace io { - - if((mask & vcg::tri::io::Mask::IOM_FACECOLOR) | (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD)) - { -- int material_index = vcg::tri::io::Materials<SaveMeshType>::CreateNewMaterial(m, materials, 0, fi); -+ int material_index = vcg::tri::io::Materials<SaveMeshType>::CreateNewMaterial(m, materials, fi); - if(material_index == (int)materials.size()) - { - Lib3dsMaterial *material = lib3ds_material_new();//creates a new material |