From 6335da56caf78c6c53b8b402078fea479ad60282 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 13 Mar 2014 16:52:13 +0000 Subject: [PATCH] crtmpsever: add missing unistd.h inclusion for sysconf() We were failing the build w/ GCC 4.8 on the sysconf() prototype due to a missing include of unistd.h Signed-off-by: Florian Fainelli SVN-Revision: 39922 --- .../crtmpserver/patches/010-link-crypt-for-lua.patch | 6 ++---- multimedia/crtmpserver/patches/020-add-rpath.patch | 6 ++---- .../crtmpserver/patches/030-default-config.patch | 6 ++---- multimedia/crtmpserver/patches/040-use-select.patch | 6 ++---- .../patches/050-add-missing-make-defines.patch | 6 ++---- .../crtmpserver/patches/060-add-dl-for-crypto.patch | 8 +++----- .../crtmpserver/patches/070-sysconf_unistd.patch | 10 ++++++++++ 7 files changed, 23 insertions(+), 25 deletions(-) create mode 100644 multimedia/crtmpserver/patches/070-sysconf_unistd.patch diff --git a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch index 4840ec40bb..ec758188ec 100644 --- a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch +++ b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch @@ -1,7 +1,5 @@ -Index: crtmpserver-r692/builders/make/compile.mk -=================================================================== ---- crtmpserver-r692.orig/builders/make/compile.mk -+++ crtmpserver-r692/builders/make/compile.mk +--- a/builders/make/compile.mk ++++ b/builders/make/compile.mk @@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny #common diff --git a/multimedia/crtmpserver/patches/020-add-rpath.patch b/multimedia/crtmpserver/patches/020-add-rpath.patch index 83ebe561f5..1ea8320335 100644 --- a/multimedia/crtmpserver/patches/020-add-rpath.patch +++ b/multimedia/crtmpserver/patches/020-add-rpath.patch @@ -1,7 +1,5 @@ -Index: crtmpserver-r692/builders/make/linux.mk -=================================================================== ---- crtmpserver-r692.orig/builders/make/linux.mk -+++ crtmpserver-r692/builders/make/linux.mk +--- a/builders/make/linux.mk ++++ b/builders/make/linux.mk @@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3 COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS) diff --git a/multimedia/crtmpserver/patches/030-default-config.patch b/multimedia/crtmpserver/patches/030-default-config.patch index a5031c98e7..25134e29ba 100644 --- a/multimedia/crtmpserver/patches/030-default-config.patch +++ b/multimedia/crtmpserver/patches/030-default-config.patch @@ -1,7 +1,5 @@ -Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua -=================================================================== ---- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua -+++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua +--- a/builders/cmake/crtmpserver/crtmpserver.lua ++++ b/builders/cmake/crtmpserver/crtmpserver.lua @@ -44,7 +44,7 @@ configuration= { -- this is the root directory of all applications diff --git a/multimedia/crtmpserver/patches/040-use-select.patch b/multimedia/crtmpserver/patches/040-use-select.patch index 466f86c9e6..380208e803 100644 --- a/multimedia/crtmpserver/patches/040-use-select.patch +++ b/multimedia/crtmpserver/patches/040-use-select.patch @@ -1,7 +1,5 @@ -Index: crtmpserver-r726/builders/make/linux.mk -=================================================================== ---- crtmpserver-r726.orig/builders/make/linux.mk -+++ crtmpserver-r726/builders/make/linux.mk +--- a/builders/make/linux.mk ++++ b/builders/make/linux.mk @@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT PLATFORM_DEFINES = \ -DLINUX \ diff --git a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch index 43447b0040..c4671f7313 100644 --- a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch +++ b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch @@ -1,7 +1,5 @@ -Index: crtmpserver-r726/builders/make/compile.mk -=================================================================== ---- crtmpserver-r726.orig/builders/make/compile.mk -+++ crtmpserver-r726/builders/make/compile.mk +--- a/builders/make/compile.mk ++++ b/builders/make/compile.mk @@ -43,10 +43,16 @@ FEATURES_DEFINES = \ -DHAS_PROTOCOL_RTP \ -DHAS_PROTOCOL_TS \ diff --git a/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch b/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch index cbd5daf2f8..3d2f602a07 100644 --- a/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch +++ b/multimedia/crtmpserver/patches/060-add-dl-for-crypto.patch @@ -1,8 +1,6 @@ -Index: crtmpserver-r726/builders/make/compile.mk -=================================================================== ---- crtmpserver-r726.orig/builders/make/compile.mk 2012-06-07 19:53:18.028378001 +0200 -+++ crtmpserver-r726/builders/make/compile.mk 2012-06-07 20:02:08.260400669 +0200 -@@ -59,7 +59,7 @@ +--- a/builders/make/compile.mk ++++ b/builders/make/compile.mk +@@ -59,7 +59,7 @@ DEFINES = $(PLATFORM_DEFINES) $(FEATURES #library paths SSL_INCLUDE=-I$(SSL_BASE)/include diff --git a/multimedia/crtmpserver/patches/070-sysconf_unistd.patch b/multimedia/crtmpserver/patches/070-sysconf_unistd.patch new file mode 100644 index 0000000000..c29be49efe --- /dev/null +++ b/multimedia/crtmpserver/patches/070-sysconf_unistd.patch @@ -0,0 +1,10 @@ +--- a/sources/common/include/platform/linux/linuxplatform.h ++++ b/sources/common/include/platform/linux/linuxplatform.h +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + using namespace std; + + -- 2.30.2