* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/files/, media-video/guvcview/
@ 2018-04-22 11:21 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2018-04-22 11:21 UTC (permalink / raw
To: gentoo-commits
commit: d92c9ab7ad471597340c7d779ea3b3735feff3a1
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 11:04:04 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 11:21:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92c9ab7
media-video/guvcview: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-video/guvcview/files/ffmpeg4.patch | 195 +++++++++++++++++++++++++++++
media-video/guvcview/guvcview-2.0.5.ebuild | 3 +-
2 files changed, 197 insertions(+), 1 deletion(-)
diff --git a/media-video/guvcview/files/ffmpeg4.patch b/media-video/guvcview/files/ffmpeg4.patch
new file mode 100644
index 00000000000..e6421834b5b
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg4.patch
@@ -0,0 +1,195 @@
+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
index d2b5e54c3ea..80229e7311d 100644
--- a/media-video/guvcview/guvcview-2.0.5.ebuild
+++ b/media-video/guvcview/guvcview-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -41,6 +41,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
sed -i '/^docdir/,/^$/d' Makefile.am || die
+ has_version '>=media-video/ffmpeg-4' && epatch "${FILESDIR}/ffmpeg4.patch"
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/files/, media-video/guvcview/
@ 2018-12-16 23:53 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 6fda96827b136e3cf18e5be2d737f0b9f03f3d18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 23:51:59 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 23:53:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fda9682
media-video/guvcview: Drop old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/guvcview/Manifest | 2 --
media-video/guvcview/files/ffmpeg3.patch | 26 --------------
media-video/guvcview/guvcview-2.0.3.ebuild | 56 -----------------------------
media-video/guvcview/guvcview-2.0.4.ebuild | 57 ------------------------------
4 files changed, 141 deletions(-)
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index f7f66f962b0..6c49a0fc76d 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,4 +1,2 @@
-DIST guvcview-src-2.0.3.tar.gz 1062788 BLAKE2B 18cb79838e5c797fd07219345f7d7ae0a997f4360b95ceabac3c4adddf7cdef57ba23d0514e9038f05a67aef2ce6ab8e656f8a8774c843a7e1db66eaf9a1553a SHA512 976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704
-DIST guvcview-src-2.0.4.tar.gz 1120666 BLAKE2B 582d2b36effda9dd99b5ee54f42f91bdc0001cc885c3a21f67d3fdb49cac95deaf41bb1700021fc9ae438fc64926abfe9cb1366c32ff8b04e84a30ce771edc09 SHA512 9339e9cf7dc5224f1b87bb21e0ad711d9c27f4197d5f758c70edf465eb01c8c9c51542c75d686f0439f9e843a1c14c2f76835e8529b87b35a737fc5ccb01fe0a
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
diff --git a/media-video/guvcview/files/ffmpeg3.patch b/media-video/guvcview/files/ffmpeg3.patch
deleted file mode 100644
index 5397d68834a..00000000000
--- a/media-video/guvcview/files/ffmpeg3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/jpeg_decoder.c
-+++ guvcview-src-2.0.3/gview_v4l2core/jpeg_decoder.c
-@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int hei
- exit(-1);
- }
-
-- codec_data->context->pix_fmt = PIX_FMT_YUV422P;
-+ codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P;
- codec_data->context->width = width;
- codec_data->context->height = height;
- //jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
-Index: guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-===================================================================
---- guvcview-src-2.0.3.orig/gview_v4l2core/uvc_h264.c
-+++ guvcview-src-2.0.3/gview_v4l2core/uvc_h264.c
-@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int hei
- }
-
- h264_ctx->context->flags2 |= CODEC_FLAG2_FAST;
-- h264_ctx->context->pix_fmt = PIX_FMT_YUV420P;
-+ h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P;
- h264_ctx->context->width = width;
- h264_ctx->context->height = height;
- //h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE);
diff --git a/media-video/guvcview/guvcview-2.0.3.ebuild b/media-video/guvcview/guvcview-2.0.3.ebuild
deleted file mode 100644
index 43494111459..00000000000
--- a/media-video/guvcview/guvcview-2.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils qmake-utils
-
-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() {
- epatch "${FILESDIR}/ffmpeg3.patch"
- sed -i '/^docdir/,/^$/d' Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- export MOC="$(qt5_get_bindir)/moc"
- 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.4.ebuild b/media-video/guvcview/guvcview-2.0.4.ebuild
deleted file mode 100644
index 7d6a7794823..00000000000
--- a/media-video/guvcview/guvcview-2.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic qmake-utils
-
-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() {
- epatch "${FILESDIR}/ffmpeg3.patch"
- sed -i '/^docdir/,/^$/d' Makefile.am || die
- eautoreconf
-}
-
-src_configure() {
- export MOC="$(qt5_get_bindir)/moc"
- use qt5 && append-cxxflags -std=c++11
- econf \
- --disable-debian-menu \
- $(use_enable gsl) \
- $(use_enable pulseaudio pulse) \
- $(use_enable qt5) \
- $(use_enable !qt5 gtk3)
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/files/, media-video/guvcview/
@ 2022-02-21 17:04 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2022-02-21 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 8a72dd9e2e22ec412a5ae79d4b0ccefad8442784
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 17:04:12 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 17:04:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a72dd9e
media-video/guvcview: bump to 2.0.7
also fix build with ffmpeg5
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/guvcview/Manifest | 1 +
media-video/guvcview/files/ffmpeg5.patch | 47 ++++++++++++++++++
media-video/guvcview/guvcview-2.0.7.ebuild | 78 ++++++++++++++++++++++++++++++
3 files changed, 126 insertions(+)
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 5b2772755ce6..d1aa2eedf8c0 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1 +1,2 @@
DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
+DIST guvcview-src-2.0.7.tar.bz2 449392 BLAKE2B 94140845dbe1209802a7109a3f30d3f7aa391ff4f1b67396481138c65ae3a3cc27499c8dc239bf5e17b730c06e1ebe361872f2a1976f0c2802b8e84fb54a3548 SHA512 a3dcabf3fcb90171969fea76c1a05b4e47b640ba886370b048f5736e2f064f8682967c785db44a9461bdd3761b2bf264e8ce579691d37c8b9efa1a1393162ad8
diff --git a/media-video/guvcview/files/ffmpeg5.patch b/media-video/guvcview/files/ffmpeg5.patch
new file mode 100644
index 000000000000..7e8c71b2bc6f
--- /dev/null
+++ b/media-video/guvcview/files/ffmpeg5.patch
@@ -0,0 +1,47 @@
+Index: work/gview_encoder/encoder.c
+===================================================================
+--- work.orig/gview_encoder/encoder.c
++++ work/gview_encoder/encoder.c
+@@ -446,10 +446,6 @@ static encoder_video_context_t *encoder_
+
+ video_codec_data->codec_context = avcodec_alloc_context3(video_codec_data->codec);
+
+- avcodec_get_context_defaults3 (
+- video_codec_data->codec_context,
+- video_codec_data->codec);
+-
+ if(video_codec_data->codec_context == NULL)
+ {
+ fprintf(stderr, "ENCODER: FATAL memory allocation failure (encoder_video_init): %s\n", strerror(errno));
+@@ -712,7 +708,6 @@ static encoder_audio_context_t *encoder_
+ }
+
+ audio_codec_data->codec_context = avcodec_alloc_context3(audio_codec_data->codec);
+- avcodec_get_context_defaults3 (audio_codec_data->codec_context, audio_codec_data->codec);
+
+ if(audio_codec_data->codec_context == NULL)
+ {
+Index: work/gview_v4l2core/jpeg_decoder.c
+===================================================================
+--- work.orig/gview_v4l2core/jpeg_decoder.c
++++ work/gview_v4l2core/jpeg_decoder.c
+@@ -1409,7 +1409,6 @@ int jpeg_init_decoder(int width, int hei
+
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ codec_data->context = avcodec_alloc_context3(codec_data->codec);
+- avcodec_get_context_defaults3 (codec_data->context, codec_data->codec);
+ #else
+ codec_data->context = avcodec_alloc_context();
+ avcodec_get_context_defaults(codec_data->context);
+Index: work/gview_v4l2core/uvc_h264.c
+===================================================================
+--- work.orig/gview_v4l2core/uvc_h264.c
++++ work/gview_v4l2core/uvc_h264.c
+@@ -1004,7 +1004,6 @@ int h264_init_decoder(int width, int hei
+
+ #if LIBAVCODEC_VER_AT_LEAST(53,6)
+ h264_ctx->context = avcodec_alloc_context3(h264_ctx->codec);
+- avcodec_get_context_defaults3 (h264_ctx->context, h264_ctx->codec);
+ #else
+ h264_ctx->context = avcodec_alloc_context();
+ avcodec_get_context_defaults(h264_ctx->context);
diff --git a/media-video/guvcview/guvcview-2.0.7.ebuild b/media-video/guvcview/guvcview-2.0.7.ebuild
new file mode 100644
index 000000000000..7cb8017438fb
--- /dev/null
+++ b/media-video/guvcview/guvcview-2.0.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-src-${PV}
+inherit autotools qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices"
+HOMEPAGE="http://guvcview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl pulseaudio qt5"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/autoconf-archive
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="
+ >=dev-libs/glib-2.10
+ media-libs/libpng:0=
+ media-libs/libsdl2
+ media-libs/libv4l
+ >=media-libs/portaudio-19_pre
+ >=media-video/ffmpeg-2.8:0=
+ virtual/libusb:1
+ virtual/udev
+ gsl? ( >=sci-libs/gsl-1.15:= )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ !qt5? ( >=x11-libs/gtk+-3.6:3 )
+"
+# linux-headers: bug 448260
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-3.4-r2
+ virtual/os-headers
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
+
+src_prepare() {
+ default
+ sed -i '/^docdir/,/^$/d' Makefile.am || die
+ echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
+ eautoreconf
+}
+
+src_configure() {
+ export MOC="$(qt5_get_bindir)/moc"
+
+ # 599030
+ tc-export CC CXX
+
+ local myeconfargs=(
+ --disable-debian-menu
+ --disable-static
+ $(use_enable gsl)
+ $(use_enable pulseaudio pulse)
+ $(use_enable qt5)
+ $(use_enable !qt5 gtk3)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-21 17:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-22 11:21 [gentoo-commits] repo/gentoo:master commit in: media-video/guvcview/files/, media-video/guvcview/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2018-12-16 23:53 Andreas Sturmlechner
2022-02-21 17:04 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox