From c5bc6c9a71be8958d5701f8f0109d8f658fea866 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Feb 2012 19:15:09 +0000 Subject: [PATCH] crtmpserver: merge r29785 SVN-Revision: 30071 --- multimedia/crtmpserver/Makefile | 20 ++++---- .../patches/010-link-crypt-for-lua.patch | 14 +++--- .../crtmpserver/patches/020-add-rpath.patch | 14 +++--- .../patches/030-default-config.patch | 50 ++++++++++++------- .../crtmpserver/patches/040-use-select.patch | 8 +-- .../050-add-missing-make-defines.patch | 22 ++++++++ 6 files changed, 86 insertions(+), 42 deletions(-) create mode 100644 multimedia/crtmpserver/patches/050-add-missing-make-defines.patch diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile index a101915d2..046eeb6cd 100644 --- a/multimedia/crtmpserver/Makefile +++ b/multimedia/crtmpserver/Makefile @@ -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)) diff --git a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch index 6c6622cde..4840ec40b 100644 --- a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch +++ b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch @@ -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) diff --git a/multimedia/crtmpserver/patches/020-add-rpath.patch b/multimedia/crtmpserver/patches/020-add-rpath.patch index 7b6d5f435..83ebe561f 100644 --- a/multimedia/crtmpserver/patches/020-add-rpath.patch +++ b/multimedia/crtmpserver/patches/020-add-rpath.patch @@ -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 = \ diff --git a/multimedia/crtmpserver/patches/030-default-config.patch b/multimedia/crtmpserver/patches/030-default-config.patch index f0fdc1a74..a5031c98e 100644 --- a/multimedia/crtmpserver/patches/030-default-config.patch +++ b/multimedia/crtmpserver/patches/030-default-config.patch @@ -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: -- //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" diff --git a/multimedia/crtmpserver/patches/040-use-select.patch b/multimedia/crtmpserver/patches/040-use-select.patch index 42b3a283e..466f86c9e 100644 --- a/multimedia/crtmpserver/patches/040-use-select.patch +++ b/multimedia/crtmpserver/patches/040-use-select.patch @@ -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 \ diff --git a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch new file mode 100644 index 000000000..43447b004 --- /dev/null +++ b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch @@ -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) -- 2.30.2