1 |
commit: 4dffbdff7a8ac762599ba5b8b33c19eadc63921b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 14 14:37:35 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 14 16:03:50 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dffbdff |
7 |
|
8 |
media-video/guvcview: Drop 2.0.5 |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
media-video/guvcview/Manifest | 1 - |
14 |
media-video/guvcview/files/ffmpeg4.patch | 195 ----------------------------- |
15 |
media-video/guvcview/guvcview-2.0.5.ebuild | 59 --------- |
16 |
3 files changed, 255 deletions(-) |
17 |
|
18 |
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest |
19 |
index 6c49a0fc76d..5b2772755ce 100644 |
20 |
--- a/media-video/guvcview/Manifest |
21 |
+++ b/media-video/guvcview/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb |
24 |
DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec |
25 |
|
26 |
diff --git a/media-video/guvcview/files/ffmpeg4.patch b/media-video/guvcview/files/ffmpeg4.patch |
27 |
deleted file mode 100644 |
28 |
index e6421834b5b..00000000000 |
29 |
--- a/media-video/guvcview/files/ffmpeg4.patch |
30 |
+++ /dev/null |
31 |
@@ -1,195 +0,0 @@ |
32 |
-Index: guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp |
33 |
-=================================================================== |
34 |
---- guvcview-src-2.0.5.orig/guvcview/gui_qt5_callbacks.cpp |
35 |
-+++ guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp |
36 |
-@@ -1590,10 +1590,8 @@ void MainWindow::video_codec_properties( |
37 |
- framerefs->setValue(defaults->framerefs); |
38 |
- form.addRow(_("framerefs: "), framerefs); |
39 |
- /*me method*/ |
40 |
-- QSpinBox *me_method = new QSpinBox(&dialog); |
41 |
-- me_method->setRange(1, 10); |
42 |
-- me_method->setSingleStep(1); |
43 |
-- me_method->setValue(defaults->me_method); |
44 |
-+ QLabel *me_method = new QLabel(&dialog); |
45 |
-+ me_method->setText(defaults->me_method); |
46 |
- form.addRow(_("me method: "), me_method); |
47 |
- /*mb decision*/ |
48 |
- QSpinBox *mb_decision = new QSpinBox(&dialog); |
49 |
-@@ -1645,7 +1643,7 @@ void MainWindow::video_codec_properties( |
50 |
- defaults->qblur = qblur->value(); |
51 |
- defaults->subq = subq->value(); |
52 |
- defaults->framerefs = framerefs->value(); |
53 |
-- defaults->me_method = me_method->value(); |
54 |
-+ defaults->me_method = me_method->text().toLatin1().data(); |
55 |
- defaults->mb_decision = mb_decision->value(); |
56 |
- defaults->max_b_frames = max_b_frames->value(); |
57 |
- defaults->num_threads = num_threads->value(); |
58 |
-Index: guvcview-src-2.0.5/gview_encoder/encoder.c |
59 |
-=================================================================== |
60 |
---- guvcview-src-2.0.5.orig/gview_encoder/encoder.c |
61 |
-+++ guvcview-src-2.0.5/gview_encoder/encoder.c |
62 |
-@@ -445,10 +445,8 @@ static encoder_video_context_t *encoder_ |
63 |
- #if !LIBAVCODEC_VER_AT_LEAST(56,60) |
64 |
- video_codec_data->codec_context->me_method = video_defaults->me_method; |
65 |
- #else |
66 |
-- if( video_defaults->codec_id == AV_CODEC_ID_H264 && video_defaults->me_method > 4) |
67 |
-- video_defaults->me_method = X264_ME_HEX; |
68 |
-- |
69 |
-- av_dict_set_int(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0); |
70 |
-+ if(video_defaults->me_method) |
71 |
-+ av_dict_set(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0); |
72 |
- #endif |
73 |
- |
74 |
- #if !LIBAVCODEC_VER_AT_LEAST(57,00) |
75 |
-Index: guvcview-src-2.0.5/gview_encoder/gviewencoder.h |
76 |
-=================================================================== |
77 |
---- guvcview-src-2.0.5.orig/gview_encoder/gviewencoder.h |
78 |
-+++ guvcview-src-2.0.5/gview_encoder/gviewencoder.h |
79 |
-@@ -104,7 +104,7 @@ typedef struct _video_codec_t |
80 |
- char codec_name[20]; //lavc codec_name |
81 |
- int mb_decision; //lavc mb_decision |
82 |
- int trellis; //lavc trellis quantization |
83 |
-- int me_method; //lavc motion estimation method |
84 |
-+ const char* me_method; //lavc motion estimation method |
85 |
- int mpeg_quant; //lavc mpeg quantization |
86 |
- int max_b_frames; //lavc max b frames |
87 |
- int num_threads; //lavc num threads |
88 |
-Index: guvcview-src-2.0.5/gview_encoder/video_codecs.c |
89 |
-=================================================================== |
90 |
---- guvcview-src-2.0.5.orig/gview_encoder/video_codecs.c |
91 |
-+++ guvcview-src-2.0.5/gview_encoder/video_codecs.c |
92 |
-@@ -97,7 +97,7 @@ static video_codec_t listSupCodecs[] = |
93 |
- .codec_name = "none", |
94 |
- .mb_decision = 0, |
95 |
- .trellis = 0, |
96 |
-- .me_method = 0, |
97 |
-+ .me_method = NULL, |
98 |
- .mpeg_quant = 0, |
99 |
- .max_b_frames = 0, |
100 |
- .num_threads = 0, |
101 |
-@@ -133,7 +133,7 @@ static video_codec_t listSupCodecs[] = |
102 |
- .codec_name = "mjpeg", |
103 |
- .mb_decision = 0, |
104 |
- .trellis = 0, |
105 |
-- .me_method = ME_EPZS, |
106 |
-+ .me_method = "epsz", |
107 |
- .mpeg_quant = 0, |
108 |
- .max_b_frames = 0, |
109 |
- .num_threads = 0, |
110 |
-@@ -169,7 +169,7 @@ static video_codec_t listSupCodecs[] = |
111 |
- .codec_name = "mpeg1video", |
112 |
- .mb_decision = FF_MB_DECISION_RD, |
113 |
- .trellis = 1, |
114 |
-- .me_method = ME_EPZS, |
115 |
-+ .me_method = "epsz", |
116 |
- .mpeg_quant = 0, |
117 |
- .max_b_frames = 0, |
118 |
- .num_threads = 1, |
119 |
-@@ -205,11 +205,11 @@ static video_codec_t listSupCodecs[] = |
120 |
- .codec_name = "flv", |
121 |
- .mb_decision = FF_MB_DECISION_RD, |
122 |
- .trellis = 1, |
123 |
-- .me_method = ME_EPZS, |
124 |
-+ .me_method = "epsz", |
125 |
- .mpeg_quant = 0, |
126 |
- .max_b_frames = 0, |
127 |
- .num_threads = 1, |
128 |
-- .flags = CODEC_FLAG_4MV |
129 |
-+ .flags = AV_CODEC_FLAG_4MV |
130 |
- }, |
131 |
- { |
132 |
- .valid = 1, |
133 |
-@@ -241,7 +241,7 @@ static video_codec_t listSupCodecs[] = |
134 |
- .codec_name = "wmv1", |
135 |
- .mb_decision = FF_MB_DECISION_RD, |
136 |
- .trellis = 1, |
137 |
-- .me_method = ME_EPZS, |
138 |
-+ .me_method = "epsz", |
139 |
- .mpeg_quant = 0, |
140 |
- .max_b_frames = 0, |
141 |
- .num_threads = 1, |
142 |
-@@ -277,7 +277,7 @@ static video_codec_t listSupCodecs[] = |
143 |
- .codec_name = "mpeg2video", |
144 |
- .mb_decision = FF_MB_DECISION_RD, |
145 |
- .trellis = 1, |
146 |
-- .me_method = ME_EPZS, |
147 |
-+ .me_method = "epsz", |
148 |
- .mpeg_quant = 0, |
149 |
- .max_b_frames = 0, |
150 |
- .num_threads = 1, |
151 |
-@@ -313,7 +313,7 @@ static video_codec_t listSupCodecs[] = |
152 |
- .codec_name = "msmpeg4v3", |
153 |
- .mb_decision = FF_MB_DECISION_RD, |
154 |
- .trellis = 1, |
155 |
-- .me_method = ME_EPZS, |
156 |
-+ .me_method = "epsz", |
157 |
- .mpeg_quant = 0, |
158 |
- .max_b_frames = 0, |
159 |
- .num_threads = 1, |
160 |
-@@ -349,7 +349,7 @@ static video_codec_t listSupCodecs[] = |
161 |
- .codec_name = "mpeg4", |
162 |
- .mb_decision = FF_MB_DECISION_RD, |
163 |
- .trellis = 1, |
164 |
-- .me_method = ME_EPZS, |
165 |
-+ .me_method = "epsz", |
166 |
- .mpeg_quant = 1, |
167 |
- .max_b_frames = 0, |
168 |
- .num_threads = 1, |
169 |
-@@ -385,7 +385,7 @@ static video_codec_t listSupCodecs[] = |
170 |
- .codec_name = "libx264", |
171 |
- .mb_decision = FF_MB_DECISION_RD, |
172 |
- .trellis = 0, |
173 |
-- .me_method = X264_ME_HEX, |
174 |
-+ .me_method = "hex", |
175 |
- .mpeg_quant = 1, |
176 |
- .max_b_frames = 16, |
177 |
- .num_threads = 4, |
178 |
-@@ -426,7 +426,7 @@ static video_codec_t listSupCodecs[] = |
179 |
- .codec_name = "libx265", |
180 |
- .mb_decision = FF_MB_DECISION_RD, |
181 |
- .trellis = 0, |
182 |
-- .me_method = ME_HEX, |
183 |
-+ .me_method = "hex", |
184 |
- .mpeg_quant = 1, |
185 |
- .max_b_frames = 16, |
186 |
- .num_threads = 4, |
187 |
-@@ -463,7 +463,7 @@ static video_codec_t listSupCodecs[] = |
188 |
- .codec_name = "libvpx_vp8", |
189 |
- .mb_decision = FF_MB_DECISION_RD, |
190 |
- .trellis = 0, |
191 |
-- .me_method = ME_HEX, |
192 |
-+ .me_method = "hex", |
193 |
- .mpeg_quant = 1, |
194 |
- .max_b_frames = 0, |
195 |
- .num_threads = 4, |
196 |
-@@ -500,7 +500,7 @@ static video_codec_t listSupCodecs[] = |
197 |
- .codec_name = "libvpx_vp9", |
198 |
- .mb_decision = FF_MB_DECISION_RD, |
199 |
- .trellis = 0, |
200 |
-- .me_method = ME_HEX, |
201 |
-+ .me_method = "hex", |
202 |
- .mpeg_quant = 1, |
203 |
- .max_b_frames = 16, |
204 |
- .num_threads = 4, |
205 |
-@@ -537,7 +537,7 @@ static video_codec_t listSupCodecs[] = |
206 |
- .codec_name = "libtheora", |
207 |
- .mb_decision = FF_MB_DECISION_RD, |
208 |
- .trellis = 0, |
209 |
-- .me_method = ME_HEX, |
210 |
-+ .me_method = "hex", |
211 |
- .mpeg_quant = 1, |
212 |
- .max_b_frames = 0, |
213 |
- .num_threads = 4, |
214 |
-Index: guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c |
215 |
-=================================================================== |
216 |
---- guvcview-src-2.0.5.orig/gview_v4l2core/uvc_h264.c |
217 |
-+++ guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c |
218 |
-@@ -1039,7 +1039,7 @@ int h264_init_decoder(int width, int hei |
219 |
- exit(-1); |
220 |
- } |
221 |
- |
222 |
-- h264_ctx->context->flags2 |= CODEC_FLAG2_FAST; |
223 |
-+ h264_ctx->context->flags2 |= AV_CODEC_FLAG2_FAST; |
224 |
- h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P; |
225 |
- h264_ctx->context->width = width; |
226 |
- h264_ctx->context->height = height; |
227 |
|
228 |
diff --git a/media-video/guvcview/guvcview-2.0.5.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild |
229 |
deleted file mode 100644 |
230 |
index 80229e7311d..00000000000 |
231 |
--- a/media-video/guvcview/guvcview-2.0.5.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,59 +0,0 @@ |
234 |
-# Copyright 1999-2018 Gentoo Foundation |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
- |
237 |
-EAPI=5 |
238 |
-inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs |
239 |
- |
240 |
-MY_P=${PN}-src-${PV} |
241 |
- |
242 |
-DESCRIPTION="GTK+ UVC Viewer" |
243 |
-HOMEPAGE="http://guvcview.sourceforge.net/" |
244 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" |
245 |
- |
246 |
-LICENSE="GPL-3" |
247 |
-SLOT="0" |
248 |
-KEYWORDS="amd64 x86" |
249 |
-IUSE="gsl libav pulseaudio qt5" |
250 |
- |
251 |
-RDEPEND=">=dev-libs/glib-2.10 |
252 |
- media-libs/libpng:0= |
253 |
- media-libs/libsdl2 |
254 |
- media-libs/libv4l |
255 |
- >=media-libs/portaudio-19_pre |
256 |
- !libav? ( >=media-video/ffmpeg-2.8:0= ) |
257 |
- libav? ( media-video/libav:= ) |
258 |
- virtual/ffmpeg |
259 |
- virtual/libusb:1 |
260 |
- virtual/udev |
261 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) |
262 |
- gsl? ( >=sci-libs/gsl-1.15 ) |
263 |
- qt5? ( dev-qt/qtwidgets:5 ) |
264 |
- !qt5? ( >=x11-libs/gtk+-3.6:3 ) |
265 |
- !<sys-kernel/linux-headers-3.4-r2" #448260 |
266 |
-DEPEND="${RDEPEND} |
267 |
- dev-util/intltool |
268 |
- sys-devel/gettext |
269 |
- virtual/os-headers |
270 |
- sys-devel/autoconf-archive |
271 |
- virtual/pkgconfig" |
272 |
- |
273 |
-S=${WORKDIR}/${MY_P} |
274 |
- |
275 |
-src_prepare() { |
276 |
- sed -i '/^docdir/,/^$/d' Makefile.am || die |
277 |
- has_version '>=media-video/ffmpeg-4' && epatch "${FILESDIR}/ffmpeg4.patch" |
278 |
- eautoreconf |
279 |
-} |
280 |
- |
281 |
-src_configure() { |
282 |
- export MOC="$(qt5_get_bindir)/moc" |
283 |
- use qt5 && append-cxxflags -std=c++11 |
284 |
- # 599030 |
285 |
- tc-export CC CXX |
286 |
- econf \ |
287 |
- --disable-debian-menu \ |
288 |
- $(use_enable gsl) \ |
289 |
- $(use_enable pulseaudio pulse) \ |
290 |
- $(use_enable qt5) \ |
291 |
- $(use_enable !qt5 gtk3) |
292 |
-} |