Date: Tue, 9 Jun 2015 08:06:55 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388902 - in head/multimedia/mkvtoolnix: . files Message-ID: <201506090806.t5986tO2027427@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Jun 9 08:06:54 2015 New Revision: 388902 URL: https://svnweb.freebsd.org/changeset/ports/388902 Log: Mark broken on FreeBSD < 10.0-RELEASE, it does not compile. Add patches that solve a problem with missing headers. A bug report has been submitted upstream. Added: head/multimedia/mkvtoolnix/files/patch-src_common_common.cpp (contents, props changed) head/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp (contents, props changed) head/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h (contents, props changed) head/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp (contents, props changed) head/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp (contents, props changed) Modified: head/multimedia/mkvtoolnix/Makefile Modified: head/multimedia/mkvtoolnix/Makefile ============================================================================== --- head/multimedia/mkvtoolnix/Makefile Tue Jun 9 07:55:49 2015 (r388901) +++ head/multimedia/mkvtoolnix/Makefile Tue Jun 9 08:06:54 2015 (r388902) @@ -58,6 +58,10 @@ MAKE_ENV+= V=1 INSTALLS_ICONS= yes .endif +.if ${OSVERSION} < 1000000 +BROKEN= does not compile on FreeBSD < 10.0-RELEASE +.endif + do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} ./drake ${_MAKE_JOBS}) Added: head/multimedia/mkvtoolnix/files/patch-src_common_common.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-src_common_common.cpp Tue Jun 9 08:06:54 2015 (r388902) @@ -0,0 +1,13 @@ +--- src/common/common.cpp.orig 2015-06-08 16:28:17.092399114 +0200 ++++ src/common/common.cpp 2015-06-08 16:28:32.292398239 +0200 +@@ -30,6 +30,10 @@ + #include "common/strings/editing.h" + #include "common/translation.h" + ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif ++ + #if !defined(LIBMATROSKA_VERSION) || (LIBMATROSKA_VERSION <= 0x000801) + #define matroska_init() + #define matroska_done() Added: head/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp Tue Jun 9 08:06:54 2015 (r388902) @@ -0,0 +1,13 @@ +--- src/common/dts.cpp.orig 2015-06-08 14:19:36 UTC ++++ src/common/dts.cpp +@@ -19,6 +19,10 @@ + #include "common/endian.h" + #include "common/math.h" + ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif ++ + // --------------------------------------------------------------------------- + + namespace mtx { namespace dts { Added: head/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-src_common_strings_editing.h Tue Jun 9 08:06:54 2015 (r388902) @@ -0,0 +1,10 @@ +--- src/common/strings/editing.h.orig 2015-06-08 16:25:26.833411779 +0200 ++++ src/common/strings/editing.h 2015-06-08 16:25:45.153412704 +0200 +@@ -43,7 +43,6 @@ + extern const std::string empty_string; + + int get_arg_len(const char *fmt, ...); +-int get_varg_len(const char *fmt, va_list ap); + + size_t utf8_strlen(const std::string &s); + Added: head/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp Tue Jun 9 08:06:54 2015 (r388902) @@ -0,0 +1,13 @@ +--- src/input/r_dts.cpp.orig 2015-06-08 14:20:03 UTC ++++ src/input/r_dts.cpp +@@ -23,6 +23,10 @@ + #include "merge/input_x.h" + #include "output/p_dts.h" + ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif ++ + #define READ_SIZE 16384 + + int Added: head/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp Tue Jun 9 08:06:54 2015 (r388902) @@ -0,0 +1,13 @@ +--- src/input/r_wav.cpp.orig 2015-06-08 14:20:26 UTC ++++ src/input/r_wav.cpp +@@ -29,6 +29,10 @@ + #include "output/p_dts.h" + #include "output/p_pcm.h" + ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif ++ + #define AC3ACM_READ_SIZE 100000 + + wav_demuxer_c::wav_demuxer_c(wav_reader_c *reader,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506090806.t5986tO2027427>