1 |
commit: 229fafca58d3d7f34ef10233b3cecfce9551f01f |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 26 21:36:03 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 26 21:36:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229fafca |
7 |
|
8 |
media-video/ffmpeg: disable sofalizer in non native abis since netcdf is not multilib. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 6 +++--- |
13 |
1 file changed, 3 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
16 |
index 72c5f07..151504a 100644 |
17 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
18 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
19 |
@@ -221,8 +221,8 @@ RDEPEND=" |
20 |
schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) |
21 |
sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) |
22 |
sofalizer? ( |
23 |
- >=sci-libs/netcdf-4.3.2-r1[hdf5,${MULTILIB_USEDEP}] |
24 |
- >=sci-libs/hdf5-1.8.18[hl,${MULTILIB_USEDEP}] |
25 |
+ >=sci-libs/netcdf-4.3.2-r1[hdf5] |
26 |
+ >=sci-libs/hdf5-1.8.18[hl] |
27 |
) |
28 |
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) |
29 |
ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) |
30 |
@@ -340,7 +340,7 @@ multilib_src_configure() { |
31 |
|
32 |
# (temporarily) disable non-multilib deps |
33 |
if ! multilib_is_native_abi; then |
34 |
- for i in frei0r ; do |
35 |
+ for i in frei0r netcdf ; do |
36 |
myconf+=( --disable-${i} ) |
37 |
done |
38 |
fi |