diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/guvcview/Manifest | 2 | ||||
| -rw-r--r-- | media-video/guvcview/files/ffmpeg3.patch | 26 | ||||
| -rw-r--r-- | media-video/guvcview/guvcview-2.0.6-r1337.ebuild (renamed from media-video/guvcview/guvcview-2.0.5-r1.ebuild) | 59 |
3 files changed, 41 insertions, 46 deletions
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest index 574c4d07..5b277275 100644 --- a/media-video/guvcview/Manifest +++ b/media-video/guvcview/Manifest @@ -1 +1 @@ -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 5397d688..00000000 --- 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.5-r1.ebuild b/media-video/guvcview/guvcview-2.0.6-r1337.ebuild index c5102071..cd05de7c 100644 --- a/media-video/guvcview/guvcview-2.0.5-r1.ebuild +++ b/media-video/guvcview/guvcview-2.0.6-r1337.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils flag-o-matic qmake-utils toolchain-funcs +EAPI=6 + +inherit autotools flag-o-matic qmake-utils toolchain-funcs MY_P=${PN}-src-${PV} -DESCRIPTION="GTK+ UVC Viewer" +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.gz" @@ -15,33 +16,44 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="gsl libav pulseaudio qt5" -RDEPEND=">=dev-libs/glib-2.10 +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 ) + !libav? ( >=media-video/ffmpeg-2.8:0= ) + libav? ( media-video/libav:= ) + 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 ) - !<sys-kernel/linux-headers-3.4-r2" #448260 +" +# linux-headers: bug 448260 DEPEND="${RDEPEND} dev-util/intltool + sys-devel/autoconf-archive sys-devel/gettext + >=sys-kernel/linux-headers-3.4-r2 virtual/os-headers - sys-devel/autoconf-archive - virtual/pkgconfig" + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${PN}-use-theme-icon.patch" ) -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}/${PN}-use-theme-icon.patch" + default sed -i '/^docdir/,/^$/d' Makefile.am || die + echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984 eautoreconf } @@ -50,10 +62,19 @@ src_configure() { 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) \ + + 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' -delete || die } |