summaryrefslogtreecommitdiff
path: root/media-video/guvcview
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-22 10:09:44 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-22 10:09:44 +0000
commit09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree41a96399f56ed3aa399006871bfce4430db84aa2 /media-video/guvcview
parentc8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)
gentoo resync : 22.01.2019
Diffstat (limited to 'media-video/guvcview')
-rw-r--r--media-video/guvcview/Manifest5
-rw-r--r--media-video/guvcview/files/ffmpeg4.patch195
-rw-r--r--media-video/guvcview/guvcview-2.0.5.ebuild59
-rw-r--r--media-video/guvcview/guvcview-2.0.6.ebuild2
4 files changed, 2 insertions, 259 deletions
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 4f1050eb44e2..872df4a1cbfd 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,6 +1,3 @@
-AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b765827dddd318ca0923206f45849ea29671e3d642b72a46eb9b58d9c2aa9735c0f312dd81f6002a488d SHA512 bc9225d94160a565bdfd524853d37d54594acae7df80c7ffd694e79943273568bd497e9e0ac24c154823bc272cfdc1f697823feb95d191aea829f331ed0daf98
-DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
-EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
-EBUILD guvcview-2.0.6.ebuild 1658 BLAKE2B d265675c9cf22564d886ce510117092536c892f13673ab6d050d0f2c11f01be707ef5be0937e3c16657cd25cf4a76428181eb03836cd163a254751384fb6dcc2 SHA512 b5b4da68ae318a698de2c9860d0799bf5a706c34ce45efe781a0cc0dc5a30b2ac97380a7b6826ab4dea7cea5be857f96517dda9b38b39abcd5d43cb6ab72fd5b
+EBUILD guvcview-2.0.6.ebuild 1657 BLAKE2B 6d3a8da54455143dcdd4d83b8f01c21e001dba80bf83cb862bea4abc5ee43117e6ee5daf4da44dc050ea5f5a26880ab81f622657c380117621da4f8153339534 SHA512 e80b0f97844b7c2b7cb3b2cf37eed6601d251da34f06de0da140b51a18726e25026f015077491ca4ab8440277477a24a82f308fdc6fd93d9f54a257d978efc2c
MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/files/ffmpeg4.patch b/media-video/guvcview/files/ffmpeg4.patch
deleted file mode 100644
index e6421834b5b0..000000000000
--- a/media-video/guvcview/files/ffmpeg4.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-Index: guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
-===================================================================
---- guvcview-src-2.0.5.orig/guvcview/gui_qt5_callbacks.cpp
-+++ guvcview-src-2.0.5/guvcview/gui_qt5_callbacks.cpp
-@@ -1590,10 +1590,8 @@ void MainWindow::video_codec_properties(
- framerefs->setValue(defaults->framerefs);
- form.addRow(_("framerefs: "), framerefs);
- /*me method*/
-- QSpinBox *me_method = new QSpinBox(&dialog);
-- me_method->setRange(1, 10);
-- me_method->setSingleStep(1);
-- me_method->setValue(defaults->me_method);
-+ QLabel *me_method = new QLabel(&dialog);
-+ me_method->setText(defaults->me_method);
- form.addRow(_("me method: "), me_method);
- /*mb decision*/
- QSpinBox *mb_decision = new QSpinBox(&dialog);
-@@ -1645,7 +1643,7 @@ void MainWindow::video_codec_properties(
- defaults->qblur = qblur->value();
- defaults->subq = subq->value();
- defaults->framerefs = framerefs->value();
-- defaults->me_method = me_method->value();
-+ defaults->me_method = me_method->text().toLatin1().data();
- defaults->mb_decision = mb_decision->value();
- defaults->max_b_frames = max_b_frames->value();
- defaults->num_threads = num_threads->value();
-Index: guvcview-src-2.0.5/gview_encoder/encoder.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/encoder.c
-+++ guvcview-src-2.0.5/gview_encoder/encoder.c
-@@ -445,10 +445,8 @@ static encoder_video_context_t *encoder_
- #if !LIBAVCODEC_VER_AT_LEAST(56,60)
- video_codec_data->codec_context->me_method = video_defaults->me_method;
- #else
-- if( video_defaults->codec_id == AV_CODEC_ID_H264 && video_defaults->me_method > 4)
-- video_defaults->me_method = X264_ME_HEX;
--
-- av_dict_set_int(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
-+ if(video_defaults->me_method)
-+ av_dict_set(&video_codec_data->private_options, "motion-est", video_defaults->me_method, 0);
- #endif
-
- #if !LIBAVCODEC_VER_AT_LEAST(57,00)
-Index: guvcview-src-2.0.5/gview_encoder/gviewencoder.h
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/gviewencoder.h
-+++ guvcview-src-2.0.5/gview_encoder/gviewencoder.h
-@@ -104,7 +104,7 @@ typedef struct _video_codec_t
- char codec_name[20]; //lavc codec_name
- int mb_decision; //lavc mb_decision
- int trellis; //lavc trellis quantization
-- int me_method; //lavc motion estimation method
-+ const char* me_method; //lavc motion estimation method
- int mpeg_quant; //lavc mpeg quantization
- int max_b_frames; //lavc max b frames
- int num_threads; //lavc num threads
-Index: guvcview-src-2.0.5/gview_encoder/video_codecs.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_encoder/video_codecs.c
-+++ guvcview-src-2.0.5/gview_encoder/video_codecs.c
-@@ -97,7 +97,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "none",
- .mb_decision = 0,
- .trellis = 0,
-- .me_method = 0,
-+ .me_method = NULL,
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 0,
-@@ -133,7 +133,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "mjpeg",
- .mb_decision = 0,
- .trellis = 0,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 0,
-@@ -169,7 +169,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "mpeg1video",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 1,
-@@ -205,11 +205,11 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "flv",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 1,
-- .flags = CODEC_FLAG_4MV
-+ .flags = AV_CODEC_FLAG_4MV
- },
- {
- .valid = 1,
-@@ -241,7 +241,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "wmv1",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 1,
-@@ -277,7 +277,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "mpeg2video",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 1,
-@@ -313,7 +313,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "msmpeg4v3",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 0,
- .max_b_frames = 0,
- .num_threads = 1,
-@@ -349,7 +349,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "mpeg4",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 1,
-- .me_method = ME_EPZS,
-+ .me_method = "epsz",
- .mpeg_quant = 1,
- .max_b_frames = 0,
- .num_threads = 1,
-@@ -385,7 +385,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "libx264",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 0,
-- .me_method = X264_ME_HEX,
-+ .me_method = "hex",
- .mpeg_quant = 1,
- .max_b_frames = 16,
- .num_threads = 4,
-@@ -426,7 +426,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "libx265",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 0,
-- .me_method = ME_HEX,
-+ .me_method = "hex",
- .mpeg_quant = 1,
- .max_b_frames = 16,
- .num_threads = 4,
-@@ -463,7 +463,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "libvpx_vp8",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 0,
-- .me_method = ME_HEX,
-+ .me_method = "hex",
- .mpeg_quant = 1,
- .max_b_frames = 0,
- .num_threads = 4,
-@@ -500,7 +500,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "libvpx_vp9",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 0,
-- .me_method = ME_HEX,
-+ .me_method = "hex",
- .mpeg_quant = 1,
- .max_b_frames = 16,
- .num_threads = 4,
-@@ -537,7 +537,7 @@ static video_codec_t listSupCodecs[] =
- .codec_name = "libtheora",
- .mb_decision = FF_MB_DECISION_RD,
- .trellis = 0,
-- .me_method = ME_HEX,
-+ .me_method = "hex",
- .mpeg_quant = 1,
- .max_b_frames = 0,
- .num_threads = 4,
-Index: guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
-===================================================================
---- guvcview-src-2.0.5.orig/gview_v4l2core/uvc_h264.c
-+++ guvcview-src-2.0.5/gview_v4l2core/uvc_h264.c
-@@ -1039,7 +1039,7 @@ int h264_init_decoder(int width, int hei
- exit(-1);
- }
-
-- h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
-+ h264_ctx->context->flags2 |= AV_CODEC_FLAG2_FAST;
- h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- h264_ctx->context->width = width;
- h264_ctx->context->height = height;
diff --git a/media-video/guvcview/guvcview-2.0.5.ebuild b/media-video/guvcview/guvcview-2.0.5.ebuild
deleted file mode 100644
index 80229e7311d7..000000000000
--- a/media-video/guvcview/guvcview-2.0.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gsl libav pulseaudio qt5"
-
-RDEPEND=">=dev-libs/glib-2.10
- media-libs/libpng:0=
- media-libs/libsdl2
- media-libs/libv4l
- >=media-libs/portaudio-19_pre
- !libav? ( >=media-video/ffmpeg-2.8:0= )
- libav? ( media-video/libav:= )
- virtual/ffmpeg
- virtual/libusb:1
- virtual/udev
- pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
- gsl? ( >=sci-libs/gsl-1.15 )
- qt5? ( dev-qt/qtwidgets:5 )
- !qt5? ( >=x11-libs/gtk+-3.6:3 )
- !<sys-kernel/linux-headers-3.4-r2" #448260
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/os-headers
- sys-devel/autoconf-archive
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i '/^docdir/,/^$/d' Makefile.am || die
- has_version '>=media-video/ffmpeg-4' && epatch "${FILESDIR}/ffmpeg4.patch"
- eautoreconf
-}
-
-src_configure() {
- export MOC="$(qt5_get_bindir)/moc"
- use qt5 && append-cxxflags -std=c++11
- # 599030
- tc-export CC CXX
- econf \
- --disable-debian-menu \
- $(use_enable gsl) \
- $(use_enable pulseaudio pulse) \
- $(use_enable qt5) \
- $(use_enable !qt5 gtk3)
-}
diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index 8f62edffa655..92634f1db14d 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="gsl libav pulseaudio qt5"
RDEPEND="