summaryrefslogtreecommitdiff
path: root/media-video/mjpegtools/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-08-12 18:08:24 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-08-12 18:08:24 +0100
commit8a60ccc0bb618fc402bc140a5cee6cf89addec51 (patch)
tree65afd2233c6a32062b2b52a4a901abf4f801c12d /media-video/mjpegtools/files
parent78f20b3ec2b822f4add309f60998356f403cf879 (diff)
gentoo auto-resync : 12:08:2023 - 18:08:23
Diffstat (limited to 'media-video/mjpegtools/files')
-rw-r--r--media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-no-auto_ptr-fix.patch20
-rw-r--r--media-video/mjpegtools/files/mjpegtools-2.2.1-c++17-register-fix.patch17
2 files changed, 37 insertions, 0 deletions
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;
+ }