diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-27 10:54:13 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-11-27 10:54:13 +0100 |
| commit | 784a2c8bc618b57b5b99cced1a50ccc6eeae00f2 (patch) | |
| tree | 80a8d5be14097d992450c649c80f1ce42dce4cbf | |
| parent | dev-util/netbeans-standalone: some improvements (diff) | |
| download | fordfrog-784a2c8bc618b57b5b99cced1a50ccc6eeae00f2.tar.gz fordfrog-784a2c8bc618b57b5b99cced1a50ccc6eeae00f2.tar.bz2 fordfrog-784a2c8bc618b57b5b99cced1a50ccc6eeae00f2.zip | |
media-gfx/meshlab-9999: updated
1) updated to eapi 7 including dolib -> dolib.so
2) updated patch
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
| -rw-r--r-- | media-gfx/meshlab/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/meshlab/files/9999-use-external-libs.patch | 8 | ||||
| -rw-r--r-- | media-gfx/meshlab/meshlab-9999.ebuild | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index a774af6d7..0328066a9 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -1,3 +1,3 @@ -AUX 9999-use-external-libs.patch 5816 BLAKE2B efc9459cb0a6ea4b1dc025976dd75a4d939d26a4122c9217eae8c7b672b7ab36e970f62f8a264ba42e258fc419dc900928b30801d44a3cf3e943bbb15e21f84f SHA512 a6b1c1e6110225f908c350b88ac255395bf42beded0adc9962c09b6fd002b99879254447e1e1ab9ecaa59f976951569d6580795682daeccce0db414fbcf0f037 -EBUILD meshlab-9999.ebuild 2107 BLAKE2B 3b48a41230ce8b77070259ac3dd036a6581778f68dc3769377e13f23f7428a4109049dfcee19bcaf5a62fe49a84a54ec9eb8b17224d0a951c6e51cf93150ae10 SHA512 ff2e95e58aee8132aadd777adb4fca4ec6a9c6ae763379036a31feaa55c08935f5fb2f01a13a7310349599acbbbfc54f8b8ae95364123416d40c8e04abe919d8 +AUX 9999-use-external-libs.patch 5824 BLAKE2B 29b2fb94778254ed834a1e58791c2612d1494fe848ddcb46c94dd14edc60c8c9228ca4347169f812beab903ddb59f34d92ec40d4bcc3a763a62df67a99d95670 SHA512 c3d0bad371dccd4b27b3bdeea9f8297999233d2e56d85adbc8efa0c704aa459943f3a7033f929eec6863688300418d458bae340f61b66ffcfa9b71992527ffcf +EBUILD meshlab-9999.ebuild 2110 BLAKE2B 8181d75f22e8a1191df3c6c86b8f128dde10ca0cef7a89314d8d843556b82c83918ad3bfecc527d09b0e1baea2518739eb993414eb54e644bfd8caab9f6bb533 SHA512 31f3826c60c5d907f6e64047af5622f95c5be783f24257c0597c391546a8cab5c0748281389bbf9bb31de1306fcab0d8189d5408e8bad24db41b1ef458a093b7 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25 diff --git a/media-gfx/meshlab/files/9999-use-external-libs.patch b/media-gfx/meshlab/files/9999-use-external-libs.patch index 8dd5a3cb1..f634614a3 100644 --- a/media-gfx/meshlab/files/9999-use-external-libs.patch +++ b/media-gfx/meshlab/files/9999-use-external-libs.patch @@ -35,7 +35,7 @@ index cf4cccff..e75f1bb4 100644 meshlabdocumentbundler.cpp \ ml_shared_data_context.cpp diff --git a/general.pri b/general.pri -index d12a066e..be41ffce 100644 +index 4cb5102c..b90d7546 100644 --- a/general.pri +++ b/general.pri @@ -7,7 +7,6 @@ DEFINES += MESHLAB_SCALAR=float @@ -47,7 +47,7 @@ index d12a066e..be41ffce 100644 CONFIG += c++11 diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro -index efaa6614..b9e5d321 100644 +index 5f542b87..fbf27bff 100644 --- a/meshlab/meshlab.pro +++ b/meshlab/meshlab.pro @@ -1,7 +1,6 @@ @@ -73,8 +73,8 @@ index efaa6614..b9e5d321 100644 # win32-g++:release:LIBS += -L../common/release -lcommon #} --linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU -+linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU -lGLEW +-linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU ++linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW linux:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. diff --git a/media-gfx/meshlab/meshlab-9999.ebuild b/media-gfx/meshlab/meshlab-9999.ebuild index 64294a0e1..472b1c06f 100644 --- a/media-gfx/meshlab/meshlab-9999.ebuild +++ b/media-gfx/meshlab/meshlab-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit qmake-utils git-r3 @@ -63,7 +63,7 @@ src_configure() { src_install() { dobin distrib/{meshlab,meshlabserver} - dolib distrib/libcommon.so.1.0.0 + dolib.so distrib/libcommon.so.1.0.0 dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so exeinto /usr/$(get_libdir)/meshlab/plugins |