bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] crtmpserver: update to r726

Browse Source 
- Relocate libraries and shared files to /usr/lib/crtmpserver and /usr/share/crtmpserver
 - Add missing defines from CMake to make
 - Set new CCOMPILER and CXXCOMPILER variables as well


git-svn-id: svn://svn.openwrt.org/openwrt/packages@29785 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-01-19 01:08:19 +00:00
parent fc96e6ba20
commit 099c9d1440
6 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
multimedia/crtmpserver/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=crtmpserver
PKG_REV:=346
PKG_REV:=726
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1
@ -53,6 +53,8 @@ define Build/Configure
cp linux.mk linux-openwrt-uclibc.mk; \
$(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TS_BASE),' \
-e 's,^TOOLCHAIN_PREFIX[[:space:]]*=.*,TOOLCHAIN_PREFIX=$(TARGET_CROSS),' \
-e 's,^CCOMPILER[[:space:]]*=.*,CCOMPILER=$(TARGET_CC),' \
-e 's,^CXXCOMPILER[[:space:]]*=.*,CXXCOMPILER=$(TARGET_CXX),' \
-e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \
-e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \
linux-openwrt-uclibc.mk)
@ -65,18 +67,18 @@ endef
define Package/crtmpserver/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/rtmpserver
$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/rtmpserver/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/crtmpserver
$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/crtmpserver/
$(foreach app,flvplayback samplefactory admin stresstest appselector vptests applestreamingclient proxypublish, \
$(INSTALL_DIR) $(1)/usr/lib/rtmpserver/$(app); \
$(INSTALL_DIR) $(1)/usr/lib/crtmpserver/$(app); \
$(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/applications/$(app)/lib$(app).so \
$(1)/usr/lib/rtmpserver/$(app)/; \
$(1)/usr/lib/crtmpserver/$(app)/; \
)
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver.lua $(1)/etc/
$(INSTALL_DIR) $(1)/usr/share/rtmpserver/appselector
$(INSTALL_DIR) $(1)/usr/share/rtmpserver/media
$(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver.lua $(1)/etc/
$(INSTALL_DIR) $(1)/usr/share/crtmpserver/appselector
$(INSTALL_DIR) $(1)/usr/share/crtmpserver/media
endef
$(eval $(call BuildPackage,crtmpserver))

14
multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
View File

@ -1,11 +1,13 @@
--- a/builders/make/compile.mk
+++ b/builders/make/compile.mk
@@ -65,7 +65,7 @@ LUA_OBJS = $(LUA_SRCS:.c=.lua.o)
Index: crtmpserver-r692/builders/make/compile.mk
===================================================================
--- crtmpserver-r692.orig/builders/make/compile.mk
+++ crtmpserver-r692/builders/make/compile.mk
@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny
#common
COMMON_INCLUDE=$(LUA_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include
-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua
+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -lcrypt
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)

14
multimedia/crtmpserver/patches/020-add-rpath.patch
View File

@ -1,15 +1,15 @@
Index: crtmpserver-r219/builders/make/linux.mk
Index: crtmpserver-r692/builders/make/linux.mk
===================================================================
--- crtmpserver-r219.orig/builders/make/linux.mk
+++ crtmpserver-r219/builders/make/linux.mk
@@ -29,8 +29,8 @@ OPTIMIZATIONS = -O3
COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS)
--- crtmpserver-r692.orig/builders/make/linux.mk
+++ crtmpserver-r692/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/rtmpserver
+dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/rtmpserver
+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 = \

50
multimedia/crtmpserver/patches/030-default-config.patch
View File

@ -1,37 +1,53 @@
--- a/builders/cmake/rtmpserver/rtmpserver.lua
+++ b/builders/cmake/rtmpserver/rtmpserver.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="/",
-- this is the async DNS resolver. This is a "clinet" connection
@@ -58,7 +58,7 @@ configuration=
Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
===================================================================
--- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua
+++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua
@@ -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/rtmpserver",
+ rootDirectory="/usr/lib/crtmpserver",
--this is where the applications array starts
@@ -82,7 +82,7 @@ configuration=
@@ -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/rtmpserver/appselector",
+ mediaFolder="/usr/share/crtmpserver/appselector",
-- the application will also be known by that names. It is optional
--aliases=
--{
@@ -119,6 +119,7 @@ configuration=
@@ -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="/usr/share/rtmpserver/media",
- 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"

8
multimedia/crtmpserver/patches/040-use-select.patch
View File

@ -1,6 +1,8 @@
--- a/builders/make/linux.mk
+++ b/builders/make/linux.mk
@@ -36,7 +36,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT
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 \

22
multimedia/crtmpserver/patches/050-add-missing-make-defines.patch Normal file
View File

@ -0,0 +1,22 @@
Index: crtmpserver-r726/builders/make/compile.mk
===================================================================
--- crtmpserver-r726.orig/builders/make/compile.mk
+++ crtmpserver-r726/builders/make/compile.mk
@@ -43,10 +43,16 @@ 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_MEDIA_NSV \
+ -DHAS_SYSLOG
+
DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES)