billie 15/02/22 14:55:16 Modified: ChangeLog mjpegtools-2.1.0-r2.ebuild Log: Unconditionally disable v4l1 support as kernels providing it are long gone from the tree. This fixes bug #538626. Thanks to Pacho Ramos for the report. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)
Revision Changes Path 1.224 media-video/mjpegtools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.224&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?rev=1.224&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/ChangeLog?r1=1.223&r2=1.224 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- ChangeLog 12 Feb 2015 10:37:27 -0000 1.223 +++ ChangeLog 22 Feb 2015 14:55:15 -0000 1.224 @@ -1,6 +1,10 @@ # ChangeLog for media-video/mjpegtools # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.223 2015/02/12 10:37:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.224 2015/02/22 14:55:15 billie Exp $ + + 22 Feb 2015; Daniel Pielmeier <[email protected]> mjpegtools-2.1.0-r2.ebuild: + Unconditionally disable v4l1 support as kernels providing it are long gone + from the tree. This fixes bug #538626. Thanks to Pacho Ramos for the report. 12 Feb 2015; Pacho Ramos <[email protected]> mjpegtools-2.1.0-r2.ebuild: amd64 stable, bug #525770 1.8 media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild?r1=1.7&r2=1.8 Index: mjpegtools-2.1.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mjpegtools-2.1.0-r2.ebuild 12 Feb 2015 10:37:27 -0000 1.7 +++ mjpegtools-2.1.0-r2.ebuild 22 Feb 2015 14:55:15 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.7 2015/02/12 10:37:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild,v 1.8 2015/02/22 14:55:15 billie Exp $ EAPI=5 @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="1" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs v4l" +IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs" REQUIRED_USE="sdlgfx? ( sdl )" RDEPEND=">=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] @@ -38,13 +38,6 @@ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" -pkg_pretend() { - if has_version ">=sys-kernel/linux-headers-2.6.38" && use v4l; then - ewarn "Current versions of mjpegtools only support V4L1 which is not available" - ewarn "for kernel versions 2.6.38 and above. V4L1 will be disabled." - fi -} - src_prepare() { epatch "${FILESDIR}"/${P}-pic.patch # https://sourceforge.net/p/mjpeg/bugs/139/ @@ -66,7 +59,7 @@ $(use_with quicktime libquicktime) $(use_with dv libdv) $(use_with sdl libsdl) - $(use_with v4l) + --without-v4l $(use_with sdl x) # used by tools only
