Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/
Date: Wed, 15 Nov 2017 23:45:41
Message-Id: 1510789010.686a963478c33ea1b28acd15d026062eed154128.asturm@gentoo
1 commit: 686a963478c33ea1b28acd15d026062eed154128
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 31 19:06:48 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 15 23:36:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686a9634
7
8 media-libs/mlt: string to array
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 media-libs/mlt/mlt-6.4.1-r5.ebuild | 26 +++++++++++++++-----------
13 1 file changed, 15 insertions(+), 11 deletions(-)
14
15 diff --git a/media-libs/mlt/mlt-6.4.1-r5.ebuild b/media-libs/mlt/mlt-6.4.1-r5.ebuild
16 index 05105d0264d..f03b1702362 100644
17 --- a/media-libs/mlt/mlt-6.4.1-r5.ebuild
18 +++ b/media-libs/mlt/mlt-6.4.1-r5.ebuild
19 @@ -118,7 +118,8 @@ src_configure() {
20 # bug 589848
21 append-cxxflags -std=c++11
22
23 - local myconf="--enable-gpl
24 + local myconf=(
25 + --enable-gpl
26 --enable-gpl3
27 --enable-motion-est
28 --target-arch=$(tc-arch)
29 @@ -144,21 +145,24 @@ src_configure() {
30 $(use_enable xml)
31 $(use_enable xine)
32 $(use_enable kdenlive)
33 - --disable-sox"
34 + --disable-sox
35 + )
36 #$(use_enable sox) FIXME
37
38 if use qt5 ; then
39 - myconf+=" --enable-qt
40 + myconf+=(
41 + --enable-qt
42 --qt-includedir=$(pkg-config Qt5Core --variable=includedir)
43 - --qt-libdir=$(pkg-config Qt5Core --variable=libdir)"
44 + --qt-libdir=$(pkg-config Qt5Core --variable=libdir)
45 + )
46 else
47 - myconf+=" --disable-qt"
48 + myconf+=( --disable-qt )
49 fi
50
51 if use x86 || use amd64 ; then
52 - myconf+=" $(use_enable cpu_flags_x86_mmx mmx)"
53 + myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
54 else
55 - myconf+=" --disable-mmx"
56 + myconf+=( --disable-mmx )
57 fi
58
59 if ! use melt; then
60 @@ -168,14 +172,14 @@ src_configure() {
61 # TODO: add swig language bindings
62 # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
63
64 - local swig_lang
65 + local swig_lang=()
66 # TODO: java perl php tcl
67 for i in lua python ruby ; do
68 - use $i && swig_lang="${swig_lang} $i"
69 + use $i && swig_lang+=( $i )
70 done
71 - [ -z "${swig_lang}" ] && swig_lang="none"
72 + [[ -z ${swig_lang} ]] && swig_lang=( none )
73
74 - econf ${myconf} --swig-languages="${swig_lang}"
75 + econf ${myconf[@]} --swig-languages="${swig_lang[@]}"
76
77 sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
78 }