diff options
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 50cc241d4a6c..60138802adf1 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -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 <billie@gentoo.org> 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 <pacho@gentoo.org> mjpegtools-2.1.0-r2.ebuild: amd64 stable, bug #525770 diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild index 1ad839f5abdf..eafe2ba01e63 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild @@ -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 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" 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 @@ RDEPEND="${RDEPEND} !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 @@ multilib_src_configure() { $(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 |