Ticket #10981: crtmpserver-736.patch

File crtmpserver-736.patch, 6.2 KB (added by heil, 6 years ago)

crtmpserver-736.patch

  • packages/multimedia/crtmpserver/patches/020-add-rpath.patch

     
    1 Index: crtmpserver-r692/builders/make/linux.mk 
    2 =================================================================== 
    3 --- crtmpserver-r692.orig/builders/make/linux.mk 
    4 +++ crtmpserver-r692/builders/make/linux.mk 
     1--- a/builders/make/linux.mk 
     2+++ b/builders/make/linux.mk 
    53@@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3 
    64 COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS) 
    75  
  • packages/multimedia/crtmpserver/patches/030-default-config.patch

     
    1 Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua 
    2 =================================================================== 
    3 --- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua 
    4 +++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua 
     1--- a/builders/cmake/crtmpserver/crtmpserver.lua 
     2+++ b/builders/cmake/crtmpserver/crtmpserver.lua 
    53@@ -44,7 +44,7 @@ configuration= 
    64        { 
    75                -- this is the root directory of all applications 
  • packages/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch

     
    1 Index: crtmpserver-r726/builders/make/compile.mk 
    2 =================================================================== 
    3 --- crtmpserver-r726.orig/builders/make/compile.mk 
    4 +++ crtmpserver-r726/builders/make/compile.mk 
    5 @@ -43,10 +43,16 @@ FEATURES_DEFINES = \ 
     1--- a/builders/make/compile.mk 
     2+++ b/builders/make/compile.mk 
     3@@ -43,17 +43,23 @@ FEATURES_DEFINES = \ 
    64        -DHAS_PROTOCOL_RTP \ 
    75        -DHAS_PROTOCOL_TS \ 
    86        -DHAS_PROTOCOL_VAR \ 
     
    2018  
    2119  
    2220 DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES) 
     21  
     22 #library paths 
     23 SSL_INCLUDE=-I$(SSL_BASE)/include 
     24-SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto 
     25+SSL_LIB=-L$(SSL_BASE)/lib -lssl -lcrypto -ldl 
     26  
     27 #lua 
     28 LUA_INCLUDE=-I$(PROJECT_BASE_PATH)/3rdparty/lua-dev 
     29@@ -67,25 +73,25 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny 
     30  
     31 #common 
     32 COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include 
     33-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt 
     34+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) $(PROJECT_BASE_PATH)/builders/make/output/dynamic/liblua.so -ltinyxml -lcrypt -ldl 
     35 COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp") 
     36 COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o) 
     37  
     38 #thelib 
     39 THELIB_INCLUDE=$(COMMON_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/thelib/include 
     40-THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon 
     41+THELIB_LIBS=$(COMMON_LIBS) -L$(OUTPUT_DYNAMIC) -lcommon -ldl 
     42 THELIB_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/thelib/src -type f -name "*.cpp") 
     43 THELIB_OBJS = $(THELIB_SRCS:.cpp=.thelib.o) 
     44  
     45 #tests 
     46 TESTS_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/tests/include 
     47-TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib 
     48+TESTS_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl 
     49 TESTS_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/tests/src -type f -name "*.cpp") 
     50 TESTS_OBJS=$(TESTS_SRCS:.cpp=.tests.o) 
     51  
     52 #crtmpserver 
     53 CRTMPSERVER_INCLUDE=$(THELIB_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/crtmpserver/include 
     54-CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib 
     55+CRTMPSERVER_LIBS=$(THELIB_LIBS) -L$(OUTPUT_DYNAMIC) -lthelib -ldl 
     56 CRTMPSERVER_SRCS=$(shell find $(PROJECT_BASE_PATH)/sources/crtmpserver/src -type f -name "*.cpp") 
     57 CRTMPSERVER_OBJS_DYNAMIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_dynamic.o) 
     58 CRTMPSERVER_OBJS_STATIC=$(CRTMPSERVER_SRCS:.cpp=.crtmpserver_static.o) 
  • packages/multimedia/crtmpserver/patches/040-use-select.patch

     
    1 Index: crtmpserver-r726/builders/make/linux.mk 
    2 =================================================================== 
    3 --- crtmpserver-r726.orig/builders/make/linux.mk 
    4 +++ crtmpserver-r726/builders/make/linux.mk 
     1--- a/builders/make/linux.mk 
     2+++ b/builders/make/linux.mk 
    53@@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT 
    64 PLATFORM_DEFINES = \ 
    75        -DLINUX \ 
  • packages/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch

     
    1 Index: crtmpserver-r692/builders/make/compile.mk 
    2 =================================================================== 
    3 --- crtmpserver-r692.orig/builders/make/compile.mk 
    4 +++ crtmpserver-r692/builders/make/compile.mk 
     1--- a/builders/make/compile.mk 
     2+++ b/builders/make/compile.mk 
    53@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny 
    64  
    75 #common 
  • packages/multimedia/crtmpserver/Makefile

     
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=crtmpserver 
    11 PKG_REV:=726 
     11PKG_REV:=736 
    1212PKG_VERSION:=r$(PKG_REV) 
    1313PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    16 PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/trunk 
     16PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/branches/1.0 
    1717PKG_SOURCE_SUBDIR:=crtmpserver-$(PKG_VERSION) 
    1818PKG_SOURCE_VERSION:=$(PKG_REV) 
    1919PKG_SOURCE_PROTO:=svn