[SCM] crtmpserver/jessie: fixup 21_fix_ftbfs_kfreebsd.diff to apply to the 1.0 codebase
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 23 16:55:51 UTC 2013
The following commit has been merged in the jessie branch:
commit 9007315748ce77d4edc5c9851ecbf4156021473e
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jun 23 18:47:01 2013 +0200
fixup 21_fix_ftbfs_kfreebsd.diff to apply to the 1.0 codebase
Not all hunks apply to the 1.0 release branch of this patch
diff --git a/debian/patches/21_fix_ftbfs_kfreebsd.diff b/debian/patches/21_fix_ftbfs_kfreebsd.diff
index 9ebadc7..870e589 100644
--- a/debian/patches/21_fix_ftbfs_kfreebsd.diff
+++ b/debian/patches/21_fix_ftbfs_kfreebsd.diff
@@ -6,11 +6,9 @@ Bug-Debian: http://bugs.debian.org/713840
It seems that the "dfreebsd" platform requires some updates to allow compilation on
(modern?) kfreebsd systems.
-Index: crtmpserver/common/include/platform/dfreebsd/dfreebsdplatform.h
-===================================================================
---- crtmpserver.orig/common/include/platform/dfreebsd/dfreebsdplatform.h 2013-06-23 16:23:56.000000000 +0000
-+++ crtmpserver/common/include/platform/dfreebsd/dfreebsdplatform.h 2013-06-23 16:23:56.000000000 +0000
-@@ -48,6 +48,7 @@
+--- a/common/include/platform/dfreebsd/dfreebsdplatform.h
++++ b/common/include/platform/dfreebsd/dfreebsdplatform.h
+@@ -50,6 +50,7 @@
#include <sstream>
#include <stdint.h>
#include <stdio.h>
@@ -18,25 +16,3 @@ Index: crtmpserver/common/include/platform/dfreebsd/dfreebsdplatform.h
#include <string>
#include <sys/event.h>
#include <sys/mman.h>
-@@ -79,8 +80,10 @@
- #define WRITE_FD write
- #define SOCKET int32_t
- #define LASTSOCKETERROR errno
--#define SOCKERROR_CONNECT_IN_PROGRESS EINPROGRESS
--#define SOCKERROR_SEND_IN_PROGRESS EAGAIN
-+#define SOCKERROR_EINPROGRESS EINPROGRESS
-+#define SOCKERROR_EAGAIN EAGAIN
-+#define SOCKERROR_ECONNRESET ECONNRESET
-+#define SOCKERROR_ENOBUFS ENOBUFS
- #define LIB_HANDLER void *
- #define FREE_LIBRARY(libHandler) dlclose((libHandler))
- #define LOAD_LIBRARY(file,flags) dlopen((file), (flags))
-@@ -156,7 +159,7 @@
- #define IOVEC iovec
- #define MSGHDR_MSG_IOV msg_iov
- #define MSGHDR_MSG_IOVLEN msg_iovlen
--#define MSGHDR_MSG_IOVLEN_TYPE size_t
-+#define MSGHDR_MSG_IOVLEN_TYPE int
- #define MSGHDR_MSG_NAME msg_name
- #define MSGHDR_MSG_NAMELEN msg_namelen
- #define IOVEC_IOV_BASE iov_base
--
crtmpserver packaging
More information about the pkg-multimedia-commits
mailing list