* [gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/, media-video/mjpegtools/files/
@ 2018-05-20 19:10 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-05-20 19:10 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/, media-video/mjpegtools/files/
@ 2023-08-12 13:15 Daniel Pielmeier
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Pielmeier @ 2023-08-12 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 85deb61cae13a121ad252bf49247b3314cb28787
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Fri Aug 4 11:23:58 2023 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 13:13:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85deb61c
media-video/mjpegtools: fix compiling at least with c++17 standard
add two patches those are:
- fixing usage of 'register' specifier since, since c++17 standard,
it's been removed
- fixing usage pf 'auto_ptr' since, since c++17 standard, it's been
removed
Closes: https://bugs.gentoo.org/896416
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/32171
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
.../mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch | 20 ++++++++++++++++++++
.../files/mjpegtools-2.2.1-c++17-register-fix.patch | 17 +++++++++++++++++
media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 3 +++
3 files changed, 40 insertions(+)
diff --git a/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch
new file mode 100644
index 000000000000..cc68c95c2493
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch
@@ -0,0 +1,20 @@
+--- a/mplex/main.cpp
++++ b/mplex/main.cpp
+@@ -50,7 +50,7 @@
+ #include "multiplexor.hpp"
+
+
+-using std::auto_ptr;
++using std::unique_ptr;
+
+
+ /*************************************************************************
+@@ -138,7 +138,7 @@
+ void
+ FileOutputStream::NextSegment( )
+ {
+- auto_ptr<char> prev_filename_buf( new char[strlen(cur_filename)+1] );
++ unique_ptr<char[]> prev_filename_buf( new char[strlen(cur_filename)+1] );
+ char *prev_filename = prev_filename_buf.get();
+ fclose(strm);
+ ++segment_num;
diff --git a/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch
new file mode 100644
index 000000000000..b32cef5129a1
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch
@@ -0,0 +1,17 @@
+--- a/utils/fastintfns.h
++++ b/utils/fastintfns.h
+@@ -2,12 +2,12 @@
+ *
+ * WARNING: Assumes 2's complement arithmetic.
+ */
+-static inline int intmax( register int x, register int y )
++static inline int intmax( int x, int y )
+ {
+ return x < y ? y : x;
+ }
+
+-static inline int intmin( register int x, register int y )
++static inline int intmin( int x, int y )
+ {
+ return x < y ? x : y;
+ }
diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index c87164eacd60..3f24c272b0d4 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -40,6 +40,9 @@ DEPEND="
src_prepare() {
default
+ eapply "${FILESDIR}/${P}-c++17-register-fix.patch"
+ eapply "${FILESDIR}/${P}-c++17-no-auto_ptr-fix.patch"
+
eautoreconf
sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-12 13:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-20 19:10 [gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/, media-video/mjpegtools/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-08-12 13:15 Daniel Pielmeier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox