cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

crtmpserver: import from packages, add myself as the maintainer

Browse Source 
This adds the crtmpserver package from the old svn package tree. I adopt
the licensing information and will maintain the package in the future. I
also updated the package to the latest version and ensure that is
building on x86_64, ar71xx and avr32.

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
This commit is contained in:
Thomas Heil
2014-06-23 18:53:18 +02:00
parent c7931f98b2
commit e236613a49
9 changed files with 315 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/builders/make/compile.mk
+++ b/builders/make/compile.mk
@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
#common
COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml
+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt
COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp")
COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o)
multimedia/crtmpserver/patches/020-add-rpath.patch
+13
View File
@@ -0,0 +1,13 @@
--- a/builders/make/linux.mk
+++ b/builders/make/linux.mk
@@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3
COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS)
#linking flags
-dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,"\$$ORIGIN"
-dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,"\$$ORIGIN"
+dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/crtmpserver
+dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/crtmpserver
#compile switches
PLATFORM_DEFINES = \
multimedia/crtmpserver/patches/030-default-config.patch
+60
View File
@@ -0,0 +1,60 @@
--- a/builders/cmake/crtmpserver/crtmpserver.lua
+++ b/builders/cmake/crtmpserver/crtmpserver.lua
@@ -4,7 +4,7 @@ configuration=
{
-- if true, the server will run as a daemon.
-- NOTE: all console appenders will be ignored if this is a daemon
- daemon=false,
+ daemon=true,
-- the OS's path separator. Used in composing paths
pathSeparator="/",
@@ -44,7 +44,7 @@ configuration=
{
-- this is the root directory of all applications
-- usually this is relative to the binary execuable
- rootDirectory="applications",
+ rootDirectory="/usr/lib/crtmpserver",
--this is where the applications array starts
@@ -68,7 +68,7 @@ configuration=
-- this is the folder from where the current application gets it's content.
-- It is optional. If not specified, it will be defaulted to:
-- <rootDirectory>/<name>/mediaFolder
- -- mediaFolder="/some/directory/where/media/files/are/stored"
+ mediaFolder="/usr/share/crtmpserver/appselector",
-- the application will also be known by that names. It is optional
--aliases=
--{
@@ -89,13 +89,6 @@ configuration=
},
{
ip="0.0.0.0",
- port=8081,
- protocol="inboundRtmps",
- sslKey="server.key",
- sslCert="server.crt"
- },
- {
- ip="0.0.0.0",
port=8080,
protocol="inboundRtmpt"
},
@@ -105,7 +98,7 @@ configuration=
description="FLV Playback Sample",
name="flvplayback",
protocol="dynamiclinklibrary",
- mediaFolder="/Volumes/android/backup/media/",
+ mediaFolder="/media/",
aliases=
{
"simpleLive",
@@ -183,6 +176,7 @@ configuration=
name="samplefactory",
description="asdsadasdsa",
protocol="dynamiclinklibrary",
+ mediaFolder="/usr/share/ctmpserver/media",
aliases=
{
"httpOutboundTest"
multimedia/crtmpserver/patches/040-use-select.patch
+13
View File
@@ -0,0 +1,13 @@
Index: crtmpserver-r726/builders/make/linux.mk
===================================================================
--- crtmpserver-r726.orig/builders/make/linux.mk
+++ crtmpserver-r726/builders/make/linux.mk
@@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT
PLATFORM_DEFINES = \
-DLINUX \
-DLITTLE_ENDIAN_BYTE_ALIGNED \
- -DNET_EPOLL
+ -DNET_SELECT
SSL_BASE=/usr/local
multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
+57
View File
@@ -0,0 +1,57 @@
--- a/builders/make/compile.mk
+++ b/builders/make/compile.mk
@@ -43,17 +43,22 @@ FEATURES_DEFINES = \
-DHAS_PROTOCOL_RTP \
-DHAS_PROTOCOL_TS \
-DHAS_PROTOCOL_VAR \
+ -DHAS_PROTOCOL_CLI \
+ -DHAS_PROTOCOL_HLS \
+ -DHAS_PROTOCOL_RAWHTTPSTREAM \
-DHAS_LUA \
-DHAS_MEDIA_MP3 \
-DHAS_MEDIA_MP4 \
- -DHAS_MEDIA_FLV
+ -DHAS_MEDIA_FLV \
+ -DHAS_SYSLOG
+
DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES)
#library paths
SSL_INCLUDE=-I$(SSL_BASE)/include
-SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto
+SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto -ldl
#lua
LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev
@@ -67,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
#common
COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt
+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) $(PROJECT_BASE_PATH)/builders/make/output/dynamic/liblua.so -ltinyxml -lcrypt -ldl
COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp")
COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o)
#thelib
THELIB_INCLUDE=$(COMMON_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/thelib/include
-THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon
+THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon -ldl
THELIB_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/thelib/src -type f -name "*.cpp")
THELIB_OBJS = $(THELIB_SRCS:.cpp=.thelib.o)
#tests
TESTS_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/tests/include
-TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
+TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
TESTS_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/tests/src -type f -name "*.cpp")
TESTS_OBJS=$(TESTS_SRCS:.cpp=.tests.o)
#crtmpserver
CRTMPSERVER_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/crtmpserver/include
-CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib
+CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl
CRTMPSERVER_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/crtmpserver/src -type f -name "*.cpp")
CRTMPSERVER_OBJS_DYNAMIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_dynamic.o)
CRTMPSERVER_OBJS_STATIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_static.o)
multimedia/crtmpserver/patches/060-add-missing-includes.patch
+26
View File
@@ -0,0 +1,26 @@
--- a/sources/common/include/common.h
+++ b/sources/common/include/common.h
@@ -20,6 +20,10 @@
#ifndef _COMMON_H
#define _COMMON_H
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+
#include "defines.h"
#include "platform/platform.h"
#include "utils/utils.h"
--- a/sources/common/src/utils/logging/fileloglocation.cpp
+++ b/sources/common/src/utils/logging/fileloglocation.cpp
@@ -18,6 +18,10 @@
*/
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+
#include "utils/logging/fileloglocation.h"
#include "utils/lua/luautils.h"
multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
+10
View File
@@ -0,0 +1,10 @@
--- a/3rdparty/tinyxml/tinyxml.h
+++ b/3rdparty/tinyxml/tinyxml.h
@@ -39,6 +39,7 @@ distribution.
#include <string>
#include <iostream>
#include <sstream>
+#include "lstate.h"
// Help out windows:
#if defined( _DEBUG ) && !defined( DEBUG )