1 |
commit: b4dbda1d072c07a6578e297ae3feb442ccbd3ba9 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 26 22:07:41 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 27 00:12:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4dbda1d |
7 |
|
8 |
media-libs/vigra: Fix finding boost-python |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../vigra/files/vigra-1.11.1-boost-python.patch | 22 ++++++++++++++++++++++ |
14 |
media-libs/vigra/vigra-1.11.1-r2.ebuild | 3 +++ |
15 |
2 files changed, 25 insertions(+) |
16 |
|
17 |
diff --git a/media-libs/vigra/files/vigra-1.11.1-boost-python.patch b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..ffa3334f873 |
20 |
--- /dev/null |
21 |
+++ b/media-libs/vigra/files/vigra-1.11.1-boost-python.patch |
22 |
@@ -0,0 +1,22 @@ |
23 |
+From 32ce9bc334580de7df3a97b106189145744e3726 Mon Sep 17 00:00:00 2001 |
24 |
+From: Ullrich Koethe <ullrich.koethe@××××××××××××××××××.de> |
25 |
+Date: Tue, 16 Oct 2018 19:10:56 +0200 |
26 |
+Subject: [PATCH] cmake: add boost_python${MAJOR}${MINOR} (fixes #445) |
27 |
+ |
28 |
+--- |
29 |
+ config/FindVIGRANUMPY_DEPENDENCIES.cmake | 2 ++ |
30 |
+ 1 file changed, 2 insertions(+) |
31 |
+ |
32 |
+diff --git a/config/FindVIGRANUMPY_DEPENDENCIES.cmake b/config/FindVIGRANUMPY_DEPENDENCIES.cmake |
33 |
+index f6f9d563b..47cf4237c 100644 |
34 |
+--- a/config/FindVIGRANUMPY_DEPENDENCIES.cmake |
35 |
++++ b/config/FindVIGRANUMPY_DEPENDENCIES.cmake |
36 |
+@@ -115,6 +115,8 @@ IF(PYTHONINTERP_FOUND) |
37 |
+ boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} |
38 |
+ # Mac with Python 3 |
39 |
+ boost_python${PYTHON_VERSION_MAJOR} |
40 |
++ # conda-forge |
41 |
++ boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} |
42 |
+ # default |
43 |
+ boost_python) |
44 |
+ |
45 |
|
46 |
diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild |
47 |
index 9306ea02732..387419da085 100644 |
48 |
--- a/media-libs/vigra/vigra-1.11.1-r2.ebuild |
49 |
+++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild |
50 |
@@ -64,7 +64,10 @@ RDEPEND="${DEPEND}" |
51 |
RESTRICT="test" |
52 |
|
53 |
PATCHES=( |
54 |
+ # git master |
55 |
"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" |
56 |
+ "${FILESDIR}/${P}-boost-python.patch" |
57 |
+ # TODO: upstream |
58 |
"${FILESDIR}/${P}-lib_suffix.patch" |
59 |
) |