1 |
mgorny 15/02/27 22:24:32 |
2 |
|
3 |
Modified: mlt-0.9.0.ebuild ChangeLog |
4 |
Log: |
5 |
Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
6 |
|
7 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 media-libs/mlt/mlt-0.9.0.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: mlt-0.9.0.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- mlt-0.9.0.ebuild 29 Jan 2015 17:51:44 -0000 1.7 |
23 |
+++ mlt-0.9.0.ebuild 27 Feb 2015 22:24:32 -0000 1.8 |
24 |
@@ -1,8 +1,8 @@ |
25 |
# Copyright 1999-2015 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.7 2015/01/29 17:51:44 mgorny Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.9.0.ebuild,v 1.8 2015/02/27 22:24:32 mgorny Exp $ |
29 |
|
30 |
-EAPI=4 |
31 |
+EAPI=5 |
32 |
PYTHON_DEPEND="python? 2:2.6" |
33 |
inherit eutils toolchain-funcs multilib python |
34 |
|
35 |
@@ -13,12 +13,16 @@ |
36 |
LICENSE="GPL-3" |
37 |
SLOT="0" |
38 |
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
39 |
-IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libsamplerate melt |
40 |
+IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libav libsamplerate melt |
41 |
cpu_flags_x86_mmx qt4 quicktime rtaudio sdl cpu_flags_x86_sse cpu_flags_x86_sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl |
42 |
IUSE="${IUSE} kernel_linux" |
43 |
|
44 |
#rtaudio will use OSS on non linux OSes |
45 |
-RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] ) |
46 |
+RDEPEND=" |
47 |
+ ffmpeg? ( |
48 |
+ libav? ( media-video/libav:0=[vdpau?] ) |
49 |
+ !libav? ( media-video/ffmpeg:0=[vdpau?] ) |
50 |
+ ) |
51 |
dv? ( >=media-libs/libdv-0.104 ) |
52 |
xml? ( >=dev-libs/libxml2-2.5 ) |
53 |
vorbis? ( >=media-libs/libvorbis-1.1.2 ) |
54 |
@@ -107,18 +111,20 @@ |
55 |
$(use_enable kdenlive) |
56 |
$(use_enable qt4 qimage) |
57 |
--disable-sox" |
58 |
- #$(use_enable sox) FIXME |
59 |
+ #$(use_enable sox) FIXME |
60 |
|
61 |
use ffmpeg && myconf="${myconf} --avformat-swscale" |
62 |
use kde || myconf="${myconf} --without-kde" |
63 |
- (use quicktime && use dv) || myconf="${myconf} --disable-kino" |
64 |
+ (use quicktime && use dv) || myconf="${myconf} --disable-kino" |
65 |
use compressed-lumas && myconf="${myconf} --luma-compress" |
66 |
|
67 |
( use x86 || use amd64 ) && \ |
68 |
myconf="${myconf} $(use_enable cpu_flags_x86_mmx mmx)" || |
69 |
myconf="${myconf} --disable-mmx" |
70 |
|
71 |
- use melt || sed -i -e "s;src/melt;;" Makefile |
72 |
+ if ! use melt; then |
73 |
+ sed -i -e "s;src/melt;;" Makefile || die |
74 |
+ fi |
75 |
|
76 |
# TODO: add swig language bindings |
77 |
# see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover |
78 |
@@ -131,11 +137,11 @@ |
79 |
[ -z "${swig_lang}" ] && swig_lang="none" |
80 |
|
81 |
econf ${myconf} --swig-languages="${swig_lang}" |
82 |
- sed -i -e s/^OPT/#OPT/ "${S}/config.mak" |
83 |
+ sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die |
84 |
} |
85 |
|
86 |
src_install() { |
87 |
- emake DESTDIR="${D}" install || die |
88 |
+ emake DESTDIR="${D}" install |
89 |
dodoc AUTHORS ChangeLog NEWS README docs/*.txt |
90 |
|
91 |
dodir /usr/share/${PN} |
92 |
@@ -146,25 +152,25 @@ |
93 |
|
94 |
# Install SWIG bindings |
95 |
if use lua; then |
96 |
- cd "${S}"/src/swig/lua |
97 |
+ cd "${S}"/src/swig/lua || die |
98 |
exeinto $(pkg-config --variable INSTALL_CMOD lua) |
99 |
- doexe mlt.so || die |
100 |
+ doexe mlt.so |
101 |
dodoc play.lua |
102 |
fi |
103 |
|
104 |
if use python; then |
105 |
- cd "${S}"/src/swig/python |
106 |
+ cd "${S}"/src/swig/python || die |
107 |
insinto $(python_get_sitedir) |
108 |
- doins mlt.py || die |
109 |
+ doins mlt.py |
110 |
exeinto $(python_get_sitedir) |
111 |
- doexe _mlt.so || die |
112 |
+ doexe _mlt.so |
113 |
dodoc play.py |
114 |
fi |
115 |
|
116 |
if use ruby; then |
117 |
- cd "${S}"/src/swig/ruby |
118 |
+ cd "${S}"/src/swig/ruby || die |
119 |
exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]') |
120 |
- doexe mlt.so || die |
121 |
+ doexe mlt.so |
122 |
dodoc play.rb thumbs.rb |
123 |
fi |
124 |
# TODO: java perl php tcl |
125 |
|
126 |
|
127 |
|
128 |
1.114 media-libs/mlt/ChangeLog |
129 |
|
130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/ChangeLog?rev=1.114&view=markup |
131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/ChangeLog?rev=1.114&content-type=text/plain |
132 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mlt/ChangeLog?r1=1.113&r2=1.114 |
133 |
|
134 |
Index: ChangeLog |
135 |
=================================================================== |
136 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v |
137 |
retrieving revision 1.113 |
138 |
retrieving revision 1.114 |
139 |
diff -u -r1.113 -r1.114 |
140 |
--- ChangeLog 29 Jan 2015 17:51:44 -0000 1.113 |
141 |
+++ ChangeLog 27 Feb 2015 22:24:32 -0000 1.114 |
142 |
@@ -1,6 +1,10 @@ |
143 |
# ChangeLog for media-libs/mlt |
144 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
145 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.113 2015/01/29 17:51:44 mgorny Exp $ |
146 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.114 2015/02/27 22:24:32 mgorny Exp $ |
147 |
+ |
148 |
+ 27 Feb 2015; Michał Górny <mgorny@g.o> mlt-0.9.0.ebuild: |
149 |
+ Use USE=libav to control ffmpeg/libav linking. Patch provided by Nikoli in |
150 |
+ https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/62. |
151 |
|
152 |
29 Jan 2015; Michał Górny <mgorny@g.o> mlt-0.8.2.ebuild, |
153 |
mlt-0.8.8.ebuild, mlt-0.9.0.ebuild: |