commit: 136acdac85f3d12e0c4bdd3dc28bd607345813cc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 16:05:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 20 19:09:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=136acdac
media-video/mjpegtools: Use PATCHES, not epatch for EAPI 6
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch | 16 ++++++++--------
media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild | 11 +++++++----
2 files changed, 15 insertions(+), 12 deletions(-)
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 7d0d1b60c01..0fda6c73c26 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-r3.ebuild
b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index da515e8abcc..65febbe011d 100644
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -32,11 +32,14 @@ DEPEND="${RDEPEND}
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
