[SCM] mjpegtools/master: Avoid unconditional usage of PATH_MAX and MAXPATHLEN.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Oct 7 16:28:13 UTC 2013
The following commit has been merged in the master branch:
commit 148cf1100b0dd7afc5b2c1d791c2531975b13206
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Oct 7 17:27:23 2013 +0100
Avoid unconditional usage of PATH_MAX and MAXPATHLEN.
Closes: #724897
Thanks: Pino Toscano for the great work.
diff --git a/debian/patches/17_hurd.patch b/debian/patches/17_hurd.patch
new file mode 100644
index 0000000..2cc11ac
--- /dev/null
+++ b/debian/patches/17_hurd.patch
@@ -0,0 +1,51 @@
+Description: Avoid unconditional usage of PATH_MAX and MAXPATHLEN.
+Author: Pino Toscano <pino at debian.org>
+Forwarded: https://sourceforge.net/p/mjpeg/patches/53/
+Bug: https://sourceforge.net/p/mjpeg/patches/53/
+Bug-Debian: https://sourceforge.net/p/mjpeg/patches/53/
+Acked-by: Alessio Treglia <alessio at debian.org>
+Last-Update: 2013-10-07
+---
+ lavtools/editlist.c | 3 +++
+ lavtools/png2yuv.c | 4 ++++
+ mplex/main.cpp | 4 ++++
+ 3 files changed, 11 insertions(+)
+
+--- mjpegtools.orig/lavtools/editlist.c
++++ mjpegtools/lavtools/editlist.c
+@@ -26,6 +26,9 @@
+ #include "editlist.h"
+ #include <math.h>
+
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
+
+ /* Since we use malloc often, here the error handling */
+
+--- mjpegtools.orig/lavtools/png2yuv.c
++++ mjpegtools/lavtools/png2yuv.c
+@@ -51,6 +51,10 @@ png2yuv
+ #include "subsample.h"
+ #include "colorspace.h"
+
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
++
+ #define DEFAULT_CHROMA_MODE Y4M_CHROMA_420JPEG
+
+ typedef struct _parameters
+--- mjpegtools.orig/mplex/main.cpp
++++ mjpegtools/mplex/main.cpp
+@@ -73,6 +73,10 @@ lround(double x)
+ };
+ #endif
+
++#if !defined(MAXPATHLEN)
++# define MAXPATHLEN 4096
++#endif
++
+
+
+ class FileOutputStream : public OutputStream
diff --git a/debian/patches/series b/debian/patches/series
index 08cb4df..d6e3410 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
14_fix_mplex_linking.diff
15_fix_qttoy4m_linking.diff
16_fix_ftbfs_format_security.patch
+17_hurd.patch
--
mjpegtools packaging
More information about the pkg-multimedia-commits
mailing list