diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2015-02-22 14:55:17 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2015-02-22 14:55:17 +0000 |
| commit | 33ada5f2b2067efecddbc1ad38ba69bcccdb1862 (patch) | |
| tree | ec47d7a03c17a9680e379e669f19e3aa2f306d72 /media-video | |
| parent | Fix HOMEPAGE and provide a mirror for distfiles. Bug #537810. https://github.... (diff) | |
| download | historical-33ada5f2b2067efecddbc1ad38ba69bcccdb1862.tar.gz historical-33ada5f2b2067efecddbc1ad38ba69bcccdb1862.tar.bz2 historical-33ada5f2b2067efecddbc1ad38ba69bcccdb1862.zip | |
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.
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/Manifest | 10 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild | 13 |
3 files changed, 13 insertions, 16 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/Manifest b/media-video/mjpegtools/Manifest index 9fb7bfebc41b..725114aa06b5 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -6,13 +6,13 @@ AUX mjpegtools-2.1.0-pic.patch 2282 SHA256 1b8c08c993d01838b6fe04094c00fd07220ae AUX mjpegtools-2.1.0-sdl-cflags.patch 387 SHA256 fcba002f1f12f1fd864179f2c9971acab1bf298d9a719f74ceacc231e7232a99 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 WHIRLPOOL 1eb9815a12d425acc8345a825258f7e71c2e362e79cf064484edc4dfdd67164f4935c1b9de44f8460e791340e315fd9a40127d1899a45a81b74c6a7a880e24c8 DIST mjpegtools-2.1.0.tar.gz 1844336 SHA256 864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 WHIRLPOOL e2e869a328e95dab22331ea1f03a669553ee01682a8e76d27d33da8b1cda46e042d252ff2b1974d08b2109ab1a664f4d5247ee92d7846876d496c7e63b472af9 EBUILD mjpegtools-2.1.0-r1.ebuild 2402 SHA256 48ab1a137c5ec7fb29d78f89494da4916f171ba97bf0196a86c980b10766a0ac SHA512 1e3ab770066265f356dab33802f778df5eea1c659ac3831ebb551397da29873853a3e7ee692e3d76d4398e76260610ffc134153c5771b93e104274ca59d4d1cc WHIRLPOOL b7737377ae6e5e6cddd62118f3c5b29cd1f4557c4da52fdfc956753143c38bd0612e2edfdd66198f84c6f04cc6eba375a563985fddf9a656277879f23bffddf5 -EBUILD mjpegtools-2.1.0-r2.ebuild 3386 SHA256 65514f866453cd887f2f03310fe45503ba625dcf070b85ba165f95b7615ed226 SHA512 bfabf69061f606434929a9b07d58a18ed041d311ca1dc621ce0df815ba062da24fbb1d84d67182d334d12480a7b7cdbaec2c6d3fd981217b4cd149404736092b WHIRLPOOL 94939d26292c4e84c56a63b8c8c65d9350a16a40f5ae4bf2d2cf89a179f5f138b1812b3518aab19110ce7edeaf99bd0be0a67a434b13f8c15ae303637c5a1d0f -MISC ChangeLog 37116 SHA256 478a75d3616675fb16a08616557608b93ee077038bc9beba3ce8d928fcf94d59 SHA512 550f7f5f0d507f037a80a28d3b282f5a4e394324f6dc374228c207e4853f83c8e03d7895dae3b860dcc1ecd608b3f805409d0f0216c16acb6d0ec8d1557212bd WHIRLPOOL a429d5224a12295df4ac5cd0cf5fc73ef5dc856205d172b83af95a089b5e9f3698ae9b8ac5795c5e4b570abf76eb15e5a88fa875ebbf67857c292d21ac0a16d4 +EBUILD mjpegtools-2.1.0-r2.ebuild 3136 SHA256 4fe61348125ee0fe380b19a9cc1b95b107340c252d8b606fd17a92f05142b79d SHA512 453c0a666b574246017f44874bb54d57a61318017c6badf4459908af3dcde77822f95e814972b4d4ec4f90162d2db302c560b444513c96fca7ec02daf4ebd3bb WHIRLPOOL 111e554d1735414dd080d27e4279d9a9e5dc09bd2a334bd39983c7e1c7acb7dc80188e44b3ea55c8e7f229e3178c993a44572a41cb4568724a642e8a82f7ec76 +MISC ChangeLog 37354 SHA256 47c1c797b98641717acf428a5b7427b1601e699b608c2f746a51772172e93af2 SHA512 9e8c454e580dc547eac0830cd725d6a00b2a6781b34822c7687b412a695efdef623082c1f131fbe2bd4e2043245261e320c7db9cd9d1b13ac7fe30ccf396d1fa WHIRLPOOL de5fd86505036de29de5409df625bf0b5cccad9f549083229a26ce436b3131722611cb59b2a489dace97345c09faa80785590cad3650ac3d534a90afb9b44bc5 MISC metadata.xml 372 SHA256 1a22854e4e0449f6e855f21962f4af646a81eeb7cfa0de905c87ffb52a7081b7 SHA512 a1b0beff78a45667fb4095c203c59c0a63f262ac486b98858f7432fe1f4295f51e9c59c056149c1408e413c5e975abb41b971d1036179ecdea48772a04a5b222 WHIRLPOOL 90544f87533aaf15dba62efcea8ebf4039f29e6e3fef86a5a6907e2245c1f443132f967d65a6651393ad3e64ecedc1b0b73365662d2e770cb74f3abe1fa09b7f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTcgmkACgkQCaWpQKGI+9Q1/wCghesXi1tg7/oofR3hCsOdk5Rv -TvkAniYlHAZARvVR6zbiOhKbvgeU0QyR -=UP1Z +iEYEAREIAAYFAlTp7dUACgkQlcuUeyFa0U05KQCgqXygjhimieZM1lxvBgfuRUza +gfMAn3qQVtxp8aLUhrHvptLEFvws67+U +=ShUY -----END PGP SIGNATURE----- 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 |