diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
commit | 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (patch) | |
tree | f4c7f54d0aeb344c21de9b9d1a3f1e9826d7a64c /media-video/mjpegtools | |
parent | 2bacbb3374587799c77a999f56352233a353b19e (diff) |
gentoo resync : 22.05.2018
Diffstat (limited to 'media-video/mjpegtools')
-rw-r--r-- | media-video/mjpegtools/Manifest | 6 | ||||
-rw-r--r-- | media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch | 16 | ||||
-rw-r--r-- | media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild | 4 | ||||
-rw-r--r-- | media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 32 |
4 files changed, 31 insertions, 27 deletions
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index 0452101ab8c3..e35d8471c1c7 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,7 +1,7 @@ AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe438b68eb3c62804c24285862af7a2ab93a06d4f8029da9a1a2dc7817fb55eeddeded100968066b6e6d152856c14e9034cb SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b -AUX mjpegtools-2.1.0-pic.patch 2282 BLAKE2B 9b35e26e4ef300747b6426cab8800c2bf92daddd43649dd673cb175bf7121b9d5b81097e296c7e111652b1bba4e77939db30cea2a317b26ab893a7e7444f0709 SHA512 3ad9d0b488a4fcc29fab8c0cc8322d99e63c755234c02a7fe7ad7efa974f67871460f43db05ca8097c358fdf7aafcc852967959a2abc83460c258aa38a448e28 +AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602 DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5 -EBUILD mjpegtools-2.1.0-r2.ebuild 2855 BLAKE2B 81909edf169cd3d15493e25e8863e5971f449f6dfb0d2767ddc0f46f010842133de46122a5181b2f584b3731d6f722953b9ef4b8c9bede6a227b8172c824e622 SHA512 84e5827b985eee8ab7fbf9c9999e98a11075552e1b60e4e558344e0c98a77b0ba719b2e2e1187cffee5f98e7afc45fed16bc917aaaa407ceda83ab57a736eef7 -EBUILD mjpegtools-2.1.0-r3.ebuild 2893 BLAKE2B 5df89a94b2ca7231cfbcfc576b12579cd6a6439268b59e7eb3b63e5edaedcd4bd53e890abec452beae10581bb95774d887678b161d3e29811e3420fc2274742e SHA512 d85bb1730190bfd0ed4d62c6949b89034d8a68de39c5285941975fcf805116540af9eac4a0cca61fe82a58f255f99689f5c8b3cb80f9a463da9fd4c5b1745a55 +EBUILD mjpegtools-2.1.0-r2.ebuild 2856 BLAKE2B 69ecbbd0dd2a8b6176d9fa5a93e1b5321331e1f701168a809f8d1660d05855bd1cf8187073895442443bd0cdf212494985b56500bebdc531c6b092a47675eae7 SHA512 741507bd082bfdd7a46f1fa5a73cca2c7c903b922268afacc8edaf0ad43392743b79dae798abe9eab7f12f9866199d6f868c386fff930e060eb4f7543e655642 +EBUILD mjpegtools-2.1.0-r3.ebuild 2879 BLAKE2B 35b2a6360c3ac4403429aa78d3d7c35c882c5ae52ace9c03bdbc5132160ecdfe1f70e2264c99c22bdbb31cce3e4ab31c7589a221edc323226b052f00556487f6 SHA512 995c3aa3d071617b767bde3936d9773e8a575542eb8895adf21a680f5e9c1354340598b42eb97afa6c79fe3c4ad4d4181f4c92286ea61d2b143ebab6ff43cb06 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch index 7d0d1b60c017..0fda6c73c26f 100644 --- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch +++ b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch @@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 ---- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 -+++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 +--- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 ++++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 @@ -4,8 +4,8 @@ EXTRA_DIST = implementation.html @@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 ---- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 -+++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 +--- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 ++++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 @@ -4,7 +4,7 @@ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) @@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 ---- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 -+++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 +--- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 ++++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in @@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 ---- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 -+++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 +--- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 ++++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 @@ -18,6 +18,6 @@ EXTRA_DIST = yuvscaler_implementation.txt diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild index 99e778a7bbac..09216f8d0c94 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.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 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" LICENSE="GPL-2" SLOT="1" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd" IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs" REQUIRED_USE="sdlgfx? ( sdl )" diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild index 7d41dcbe2185..a12c9c11b243 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs +inherit autotools flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="Tools for MJPEG video" HOMEPAGE="http://mjpeg.sourceforge.net/" @@ -11,31 +11,35 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" LICENSE="GPL-2" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -IUSE="dv gtk cpu_flags_x86_mmx png quicktime sdl sdlgfx static-libs" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd" +IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" REQUIRED_USE="sdlgfx? ( sdl )" -RDEPEND="virtual/jpeg:0=[${MULTILIB_USEDEP}] - quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) +RDEPEND=" + virtual/jpeg:0=[${MULTILIB_USEDEP}] dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0= ) gtk? ( x11-libs/gtk+:2 ) + png? ( media-libs/libpng:0= ) + quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] sdlgfx? ( media-libs/sdl-gfx ) )" - DEPEND="${RDEPEND} - cpu_flags_x86_mmx? ( dev-lang/nasm ) >=sys-apps/sed-4 virtual/awk - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + cpu_flags_x86_mmx? ( dev-lang/nasm ) +" -src_prepare() { - epatch "${FILESDIR}"/${P}-pic.patch +PATCHES=( + "${FILESDIR}"/${P}-pic.patch # https://sourceforge.net/p/mjpeg/bugs/139/ - epatch "${FILESDIR}"/${P}-sdl-cflags.patch - epatch "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch + "${FILESDIR}"/${P}-sdl-cflags.patch + "${FILESDIR}"/mjpegtools-2.1.0-no_format.patch +) + +src_prepare() { default eautoreconf |