Commit a43132bc authored by José Mª. Fernández's avatar José Mª. Fernández
Browse files

Fixed x11-misc/mando , so it plays nice with virtual/lapack

parent b5ce4687
AUX mando-1.8.2-v4l1-compat.patch 376 SHA256 37535a10704387eac73ca9060253c541371af68234527d2fa00e8de9ff103e63 SHA512 0993356e1dec05f4b651ab8ea598a62097012016345c6e55ef22508e25c3b26f3f5a4bfb269902e8db338f9004fc88644993276cdb35d04eff636f255f1dc65f WHIRLPOOL 8ea0da587a67665ea26ef126a82b754faf9626e4682147e9096057063aa8675655f2025d6a298f00f1ffab3bba741127fe370c3c9233f25d0bb6025762a9c653
AUX mando-1.8.2-virtual_lapack.patch 1408 SHA256 0ec624821ee4eb2f8b38d44c7271d690e7ebfe7a90f9f27825fdfe52f3f921f2 SHA512 55bb35218fec4502181ef2ff96c762cd173275de5cf2205ce5732b6a7ed6d26400118d44d853578d0a8fba9c607a94012a2c3310e9e081f2eba2f833ca352a41 WHIRLPOOL 6c80ee9c71573f54349cbf5b7e200027dfafa36e236b803251f36c9f74182b88c7f663ef571a621aedaff7e9840f40da4abae3335ad598339b7aa6ddee02b69d
DIST mando_1.8.2.orig.tar.gz 153624 SHA256 920ad80ef8a57da29d53f6a318d9cc1276a3028823fddd5ea88ef10852ee821a SHA512 2dc90338b514d1d0a7ac9fb215e7ec26ed0645fbab62d7882ec79a417d86aaccfb9e565cc15ebd5014d531f551dc716bf44375b7a17488a821fa3d002b646620 WHIRLPOOL cc7ed2a40edd52a2db48a84eccdc84fa0a5317cfe3ead42db2fde638572f41a9fd3902db8bd8b34f6604bb82dd453ed7e6d38387dce6eb2e47252bf68ce847f0
EBUILD mando-1.8.2-r1.ebuild 849 SHA256 cd0c793eee339caf6d990c871f785bb021d3329f6f297a1016718266122e81f7 SHA512 c820e0c935188a6fa995ab3d8831a2523592276ba04c0bb58311e11f8054b7dfd5b7ff43c10682f7871737b9c4de05688f7fcc835e2b6dda42e526d4cbcec5cb WHIRLPOOL 4800925db4823b8d568c8c73be48dbb7ab7a25daeb9fc340e7734d6fdb431e45098ab99fa001074f28422710be2d0c981c2d7234caf26a5fe79814577bd38208
EBUILD mando-1.8.2-r1.ebuild 896 SHA256 d61a4016335c33fd280c694dd0dd33d83c4166000716459cfeb2030917565572 SHA512 b88dac76ad7a495c9f1e634431b616611c942c22b00f5d6992cde9a029727fbf4ec228a624d90281c303d3e95297eb212e5a64c66b163916c764920772e1755a WHIRLPOOL 669c10c69459bf90ace13ee0728d12f8aa1667e21d3d6f56db4ec8cb4003d7e5b575d7e875431fa610d549aa18bf581dfe1d10968bdcfbcf875c03cfb3af4257
diff -Nru a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2011-11-28 09:24:30.000000000 +0100
+++ b/CMakeLists.txt 2017-12-11 01:18:52.043486151 +0100
@@ -7,6 +7,9 @@
set(QT_USE_QTOPENGL TRUE)
include( ${QT_USE_FILE} )
+# Added to find lapack properly
+find_package(PkgConfig REQUIRED)
+
MESSAGE(STATUS "Looking for libfftw3")
find_library(FFTW3_LIBRARY fftw3)
if (FFTW3_LIBRARY)
@@ -56,12 +59,15 @@
endif (X11_LIBRARY)
MESSAGE(STATUS "Looking for liblapack")
-find_library(LAPACK_LIBRARY lapack)
-if (LAPACK_LIBRARY)
+pkg_search_module(LAPACK REQUIRED lapack)
+if (LAPACK_FOUND)
MESSAGE(STATUS "Looking for liblapack - found")
-else (LAPACK_LIBRARY)
+else (LAPACK_FOUND)
MESSAGE(FATAL_ERROR "Looking for liblapack - not found.")
-endif (LAPACK_LIBRARY)
+endif (LAPACK_FOUND)
+include_directories(${LAPACK_INCLUDE_DIRS})
+link_directories(${LAPACK_LIBRARY_DIRS})
+add_compile_options(${LAPACK_CFLAGS_OTHER})
MESSAGE(STATUS "Looking for Xtst")
find_library(XTST_LIBRARY Xtst)
diff -Nru a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2011-11-28 09:24:30.000000000 +0100
+++ b/src/CMakeLists.txt 2017-12-11 01:16:44.005493233 +0100
@@ -97,7 +97,7 @@
${M_LIBRARY}
${GL_LIBRARY}
${X11_LIBRARY}
- ${LAPACK_LIBRARY}
+ ${LAPACK_LIBRARIES}
${XTST_LIBRARY}
)
......@@ -29,11 +29,15 @@ DEPEND="dev-qt/qtgui:4
virtual/lapack
${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-v4l1-compat.patch"
"${FILESDIR}/${P}-virtual_lapack.patch"
)
src_unpack() {
mkdir "${S}"
cd "${S}"
unpack "$A"
epatch "${FILESDIR}/${P}-v4l1-compat.patch"
}
src_install() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment