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

crtmpserver: fix multiple issues

Browse Source 
- Switch download to the Github clone of crtmpserver
 - Rebase patches against latest version
 - Pregenerate version.h file
 - Disable applestreamingclient as it is broken

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
2016-05-30 19:11:37 +02:00
parent 083a6ece5d
commit 08fe1432ef
7 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/builders/make/compile.mk
+++ b/builders/make/compile.mk
@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
@@ -72,7 +72,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
#common
COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
multimedia/crtmpserver/patches/030-default-config.patch
+2 -11
View File
@@ -23,7 +23,7 @@
-- 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",
+ mediaFolder="/media",
-- the application will also be known by that names. It is optional
--aliases=
--{
@@ -41,16 +41,7 @@
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=
@@ -184,6 +177,7 @@ configuration=
name="samplefactory",
description="asdsadasdsa",
protocol="dynamiclinklibrary",
multimedia/crtmpserver/patches/040-use-select.patch
+2 -4
View File
@@ -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 \
multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
+2 -18
View File
@@ -1,22 +1,6 @@
--- 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)
@@ -58,7 +58,7 @@ DEFINES = $(PLATFORM_DEFINES) $(FEATURES
#library paths
SSL_INCLUDE=-I$(SSL_BASE)/include
@@ -25,7 +9,7 @@
#lua
LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev
@@ -67,25 +72,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
@@ -72,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
multimedia/crtmpserver/patches/060-add-missing-includes.patch
+1 -1
View File
@@ -23,4 +23,4 @@
+
#include "utils/logging/fileloglocation.h"
#include "utils/lua/luautils.h"
#include "utils/misc/file.h"
multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
+1 -1
View File
@@ -5,6 +5,6 @@
#include <iostream>
#include <sstream>
+#include "lstate.h"
using namespace std;
// Help out windows:
#if defined( _DEBUG ) && !defined( DEBUG )