1 |
commit: 26dceaebced3d049d5234de197b7d36f15832f86 |
2 |
Author: Marty E. Plummer <hanetzer <AT> protonmail <DOT> com> |
3 |
AuthorDate: Tue Oct 17 00:03:53 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 17 05:35:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26dceaeb |
7 |
|
8 |
media-video/ffmpeg: use get_exeext on fftools_* |
9 |
|
10 |
Otherwise build will fail at building tools/aviocat instead of |
11 |
tools/aviocat.exe and so on. |
12 |
|
13 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
14 |
|
15 |
media-video/ffmpeg/ffmpeg-3.2.6.ebuild | 4 ++-- |
16 |
media-video/ffmpeg/ffmpeg-3.2.7.ebuild | 4 ++-- |
17 |
media-video/ffmpeg/ffmpeg-3.3.3.ebuild | 4 ++-- |
18 |
media-video/ffmpeg/ffmpeg-3.3.4.ebuild | 4 ++-- |
19 |
media-video/ffmpeg/ffmpeg-3.4.ebuild | 4 ++-- |
20 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++-- |
21 |
media-video/ffmpeg/metadata.xml | 20 ++++++++++---------- |
22 |
7 files changed, 22 insertions(+), 22 deletions(-) |
23 |
|
24 |
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild |
25 |
index b80c746f8b2..4ff6951374b 100644 |
26 |
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild |
27 |
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild |
28 |
@@ -433,7 +433,7 @@ multilib_src_compile() { |
29 |
if multilib_is_native_abi; then |
30 |
for i in "${FFTOOLS[@]}" ; do |
31 |
if use fftools_${i} ; then |
32 |
- emake V=1 tools/${i} |
33 |
+ emake V=1 tools/${i}$(get_exeext) |
34 |
fi |
35 |
done |
36 |
fi |
37 |
@@ -445,7 +445,7 @@ multilib_src_install() { |
38 |
if multilib_is_native_abi; then |
39 |
for i in "${FFTOOLS[@]}" ; do |
40 |
if use fftools_${i} ; then |
41 |
- dobin tools/${i} |
42 |
+ dobin tools/${i}$(get_exeext) |
43 |
fi |
44 |
done |
45 |
fi |
46 |
|
47 |
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild |
48 |
index 15961769e9c..5cf850715a9 100644 |
49 |
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild |
50 |
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild |
51 |
@@ -433,7 +433,7 @@ multilib_src_compile() { |
52 |
if multilib_is_native_abi; then |
53 |
for i in "${FFTOOLS[@]}" ; do |
54 |
if use fftools_${i} ; then |
55 |
- emake V=1 tools/${i} |
56 |
+ emake V=1 tools/${i}$(get_exeext) |
57 |
fi |
58 |
done |
59 |
fi |
60 |
@@ -445,7 +445,7 @@ multilib_src_install() { |
61 |
if multilib_is_native_abi; then |
62 |
for i in "${FFTOOLS[@]}" ; do |
63 |
if use fftools_${i} ; then |
64 |
- dobin tools/${i} |
65 |
+ dobin tools/${i}$(get_exeext) |
66 |
fi |
67 |
done |
68 |
fi |
69 |
|
70 |
diff --git a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild |
71 |
index 7152de0c54a..9c490223fed 100644 |
72 |
--- a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild |
73 |
+++ b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild |
74 |
@@ -466,7 +466,7 @@ multilib_src_compile() { |
75 |
if multilib_is_native_abi; then |
76 |
for i in "${FFTOOLS[@]}" ; do |
77 |
if use fftools_${i} ; then |
78 |
- emake V=1 tools/${i} |
79 |
+ emake V=1 tools/${i}$(get_exeext) |
80 |
fi |
81 |
done |
82 |
|
83 |
@@ -485,7 +485,7 @@ multilib_src_install() { |
84 |
if multilib_is_native_abi; then |
85 |
for i in "${FFTOOLS[@]}" ; do |
86 |
if use fftools_${i} ; then |
87 |
- dobin tools/${i} |
88 |
+ dobin tools/${i}$(get_exeext) |
89 |
fi |
90 |
done |
91 |
|
92 |
|
93 |
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild |
94 |
index 527fc20e356..d3e88130938 100644 |
95 |
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild |
96 |
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild |
97 |
@@ -467,7 +467,7 @@ multilib_src_compile() { |
98 |
if multilib_is_native_abi; then |
99 |
for i in "${FFTOOLS[@]}" ; do |
100 |
if use fftools_${i} ; then |
101 |
- emake V=1 tools/${i} |
102 |
+ emake V=1 tools/${i}$(get_exeext) |
103 |
fi |
104 |
done |
105 |
|
106 |
@@ -486,7 +486,7 @@ multilib_src_install() { |
107 |
if multilib_is_native_abi; then |
108 |
for i in "${FFTOOLS[@]}" ; do |
109 |
if use fftools_${i} ; then |
110 |
- dobin tools/${i} |
111 |
+ dobin tools/${i}$(get_exeext) |
112 |
fi |
113 |
done |
114 |
|
115 |
|
116 |
diff --git a/media-video/ffmpeg/ffmpeg-3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.4.ebuild |
117 |
index 265ef86db52..5fc93de56d5 100644 |
118 |
--- a/media-video/ffmpeg/ffmpeg-3.4.ebuild |
119 |
+++ b/media-video/ffmpeg/ffmpeg-3.4.ebuild |
120 |
@@ -446,7 +446,7 @@ multilib_src_compile() { |
121 |
if multilib_is_native_abi; then |
122 |
for i in "${FFTOOLS[@]}" ; do |
123 |
if use fftools_${i} ; then |
124 |
- emake V=1 tools/${i} |
125 |
+ emake V=1 tools/${i}$(get_exeext) |
126 |
fi |
127 |
done |
128 |
|
129 |
@@ -465,7 +465,7 @@ multilib_src_install() { |
130 |
if multilib_is_native_abi; then |
131 |
for i in "${FFTOOLS[@]}" ; do |
132 |
if use fftools_${i} ; then |
133 |
- dobin tools/${i} |
134 |
+ dobin tools/${i}$(get_exeext) |
135 |
fi |
136 |
done |
137 |
|
138 |
|
139 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
140 |
index 41b89ca5e01..fa68683f56f 100644 |
141 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
142 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
143 |
@@ -446,7 +446,7 @@ multilib_src_compile() { |
144 |
if multilib_is_native_abi; then |
145 |
for i in "${FFTOOLS[@]}" ; do |
146 |
if use fftools_${i} ; then |
147 |
- emake V=1 tools/${i} |
148 |
+ emake V=1 tools/${i}$(get_exeext) |
149 |
fi |
150 |
done |
151 |
|
152 |
@@ -465,7 +465,7 @@ multilib_src_install() { |
153 |
if multilib_is_native_abi; then |
154 |
for i in "${FFTOOLS[@]}" ; do |
155 |
if use fftools_${i} ; then |
156 |
- dobin tools/${i} |
157 |
+ dobin tools/${i}$(get_exeext) |
158 |
fi |
159 |
done |
160 |
|
161 |
|
162 |
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml |
163 |
index a0b4d7e7ad7..a23d63c7c23 100644 |
164 |
--- a/media-video/ffmpeg/metadata.xml |
165 |
+++ b/media-video/ffmpeg/metadata.xml |
166 |
@@ -1,10 +1,10 @@ |
167 |
<?xml version="1.0" encoding="UTF-8"?> |
168 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
169 |
<pkgmetadata> |
170 |
- <maintainer type="project"> |
171 |
- <email>media-video@g.o</email> |
172 |
- </maintainer> |
173 |
- <use> |
174 |
+<maintainer type="project"> |
175 |
+ <email>media-video@g.o</email> |
176 |
+</maintainer> |
177 |
+<use> |
178 |
<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag> |
179 |
<flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag> |
180 |
<flag name="armv5te">Enables optimizations for armv5te processors.</flag> |
181 |
@@ -56,10 +56,10 @@ |
182 |
<flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag> |
183 |
<flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag> |
184 |
<flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag> |
185 |
- </use> |
186 |
- <slots> |
187 |
- <slot name="0">For building against. This is the only slot that provides |
188 |
- headers and command line tools. Binary compatibility slots come and go |
189 |
- as required, so always pin dependencies to this slot when appropriate.</slot> |
190 |
- </slots> |
191 |
+</use> |
192 |
+<slots> |
193 |
+ <slot name="0">For building against. This is the only slot that provides |
194 |
+ headers and command line tools. Binary compatibility slots come and go |
195 |
+ as required, so always pin dependencies to this slot when appropriate.</slot> |
196 |
+</slots> |
197 |
</pkgmetadata> |