summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-11-11 12:52:17 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-11-11 12:52:17 +0100
commit18c31cf1207d001a9b05125b60ed8eeb4996023e (patch)
tree4560d460177346ebc8498a2b3a5be4c47f691017
parentmedia-gfx/freecad-9999: eapi7, qa fixes (diff)
downloadfordfrog-18c31cf1207d001a9b05125b60ed8eeb4996023e.tar.gz
fordfrog-18c31cf1207d001a9b05125b60ed8eeb4996023e.tar.bz2
fordfrog-18c31cf1207d001a9b05125b60ed8eeb4996023e.zip
media-gfx/meshlab-9999: removed obsolete patch
Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-gfx/meshlab/Manifest3
-rw-r--r--media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch38
-rw-r--r--media-gfx/meshlab/meshlab-9999.ebuild4
3 files changed, 1 insertions, 44 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 39d0f44c3..a774af6d7 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,4 +1,3 @@
AUX 9999-use-external-libs.patch 5816 BLAKE2B efc9459cb0a6ea4b1dc025976dd75a4d939d26a4122c9217eae8c7b672b7ab36e970f62f8a264ba42e258fc419dc900928b30801d44a3cf3e943bbb15e21f84f SHA512 a6b1c1e6110225f908c350b88ac255395bf42beded0adc9962c09b6fd002b99879254447e1e1ab9ecaa59f976951569d6580795682daeccce0db414fbcf0f037
-AUX meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
-EBUILD meshlab-9999.ebuild 2206 BLAKE2B fa2c140f16cb9a1163fe195f43d24f74f5f5276f031f5f3d56bf43bbefe3c8192a213a2bfd2c1077072a17d9b42b8bb4019186b47f6b44b25f49aca2c02be016 SHA512 19400e57842a995364b5dd0eed3df3975133ad93c8c815ba87b003f17140fe72ddb03d2ec8fe1ec812b259a1e4ddde2d414be663828c683f00defad82628f8a6
+EBUILD meshlab-9999.ebuild 2107 BLAKE2B 3b48a41230ce8b77070259ac3dd036a6581778f68dc3769377e13f23f7428a4109049dfcee19bcaf5a62fe49a84a54ec9eb8b17224d0a951c6e51cf93150ae10 SHA512 ff2e95e58aee8132aadd777adb4fca4ec6a9c6ae763379036a31feaa55c08935f5fb2f01a13a7310349599acbbbfc54f8b8ae95364123416d40c8e04abe919d8
MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch b/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch
deleted file mode 100644
index 8aeace854..000000000
--- a/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru vcglib/wrap/io_trimesh/import_nvm.h vcglib/wrap/io_trimesh/import_nvm.h
---- a/vcglib/wrap/io_trimesh/import_nvm.h 2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_nvm.h 2017-12-28 12:20:14.591670159 +0300
-@@ -85,15 +85,6 @@
- return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
- const char * filename, CallBackPos *cb=0)
-diff -ru vcglib/wrap/io_trimesh/import_out.h vcglib/wrap/io_trimesh/import_out.h
---- a/vcglib/wrap/io_trimesh/import_out.h 2016-12-29 12:54:58.000000000 +0300
-+++ b/vcglib/wrap/io_trimesh/import_out.h 2017-12-28 12:20:48.434017234 +0300
-@@ -85,15 +85,6 @@
- return true;
- }
-
--static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
-- FILE *fp = fopen(filename, "r");
-- if(!fp) return false;
-- ReadHeader(fp);
-- fclose(fp);
-- return true;
--}
--
--
- static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
- std::vector<std::string > & image_filenames,
- const char * filename,const char * filename_images, CallBackPos *cb=0)
diff --git a/media-gfx/meshlab/meshlab-9999.ebuild b/media-gfx/meshlab/meshlab-9999.ebuild
index ed72d0cb7..64294a0e1 100644
--- a/media-gfx/meshlab/meshlab-9999.ebuild
+++ b/media-gfx/meshlab/meshlab-9999.ebuild
@@ -51,10 +51,6 @@ src_prepare(){
rm -r "distrib/plugins/U3D_W32" || die
rm -r "distrib/plugins/U3D_OSX" || die
- # Fix bug 638796
- cd "${WORKDIR}" || die
- eapply "${FILESDIR}/${PN}-2016.12-remove-header.patch"
-
# Fix libssynth.a not being found
einfo "Fixing libssynth.a path"
ln -s "${S}"/external/lib/macx64/libssynth.a "${S}"/external/lib/linux-g++/ || die "Failed to create workaround symlink"