Changeset 29785


Ignore:
Timestamp:
2012-01-19T02:08:19+01:00 (6 years ago)
Author:
jow
Message:

[packages] crtmpserver: update to r726

  • 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
Location:
packages/multimedia/crtmpserver
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • packages/multimedia/crtmpserver/Makefile

    r27580 r29785  
    99 
    1010PKG_NAME:=crtmpserver 
    11 PKG_REV:=346 
     11PKG_REV:=726 
    1212PKG_VERSION:=r$(PKG_REV) 
    1313PKG_RELEASE:=1 
     
    5454                $(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TS_BASE),' \ 
    5555                        -e 's,^TOOLCHAIN_PREFIX[[:space:]]*=.*,TOOLCHAIN_PREFIX=$(TARGET_CROSS),' \ 
     56                        -e 's,^CCOMPILER[[:space:]]*=.*,CCOMPILER=$(TARGET_CC),' \ 
     57                        -e 's,^CXXCOMPILER[[:space:]]*=.*,CXXCOMPILER=$(TARGET_CXX),' \ 
    5658                        -e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \ 
    5759                        -e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \ 
     
    6668define Package/crtmpserver/install 
    6769        $(INSTALL_DIR) $(1)/usr/bin 
    68         $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver $(1)/usr/bin/ 
    69         $(INSTALL_DIR) $(1)/usr/lib/rtmpserver 
    70         $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/rtmpserver/ 
     70        $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver $(1)/usr/bin/ 
     71        $(INSTALL_DIR) $(1)/usr/lib/crtmpserver 
     72        $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/crtmpserver/ 
    7173        $(foreach app,flvplayback samplefactory admin stresstest appselector vptests applestreamingclient proxypublish, \ 
    72                 $(INSTALL_DIR) $(1)/usr/lib/rtmpserver/$(app); \ 
     74                $(INSTALL_DIR) $(1)/usr/lib/crtmpserver/$(app); \ 
    7375                $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/applications/$(app)/lib$(app).so \ 
    74                         $(1)/usr/lib/rtmpserver/$(app)/; \ 
     76                        $(1)/usr/lib/crtmpserver/$(app)/; \ 
    7577        ) 
    7678        $(INSTALL_DIR) $(1)/etc 
    77         $(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver.lua $(1)/etc/ 
    78         $(INSTALL_DIR) $(1)/usr/share/rtmpserver/appselector 
    79         $(INSTALL_DIR) $(1)/usr/share/rtmpserver/media 
     79        $(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver.lua $(1)/etc/ 
     80        $(INSTALL_DIR) $(1)/usr/share/crtmpserver/appselector 
     81        $(INSTALL_DIR) $(1)/usr/share/crtmpserver/media 
    8082endef 
    8183 
  • packages/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch

    r25679 r29785  
    1 --- a/builders/make/compile.mk 
    2 +++ b/builders/make/compile.mk 
    3 @@ -65,7 +65,7 @@ LUA_OBJS = $(LUA_SRCS:.c=.lua.o) 
     1Index: crtmpserver-r692/builders/make/compile.mk 
     2=================================================================== 
     3--- crtmpserver-r692.orig/builders/make/compile.mk 
     4+++ crtmpserver-r692/builders/make/compile.mk 
     5@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny 
    46  
    57 #common 
    6  COMMON_INCLUDE=$(LUA_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include 
    7 -COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua 
    8 +COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -lcrypt 
     8 COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include 
     9-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml 
     10+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt 
    911 COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp") 
    1012 COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o) 
  • packages/multimedia/crtmpserver/patches/020-add-rpath.patch

    r25679 r29785  
    1 Index: crtmpserver-r219/builders/make/linux.mk 
     1Index: crtmpserver-r692/builders/make/linux.mk 
    22=================================================================== 
    3 --- crtmpserver-r219.orig/builders/make/linux.mk 
    4 +++ crtmpserver-r219/builders/make/linux.mk 
    5 @@ -29,8 +29,8 @@ OPTIMIZATIONS = -O3 
    6  COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) 
     3--- crtmpserver-r692.orig/builders/make/linux.mk 
     4+++ crtmpserver-r692/builders/make/linux.mk 
     5@@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3 
     6 COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS) 
    77  
    88 #linking flags 
    99-dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,"\$$ORIGIN" 
    1010-dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,"\$$ORIGIN" 
    11 +dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/rtmpserver 
    12 +dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/rtmpserver 
     11+dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/crtmpserver 
     12+dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/crtmpserver 
    1313  
    1414 #compile switches 
  • packages/multimedia/crtmpserver/patches/030-default-config.patch

    r25679 r29785  
    1 --- a/builders/cmake/rtmpserver/rtmpserver.lua 
    2 +++ b/builders/cmake/rtmpserver/rtmpserver.lua 
    3 @@ -4,7 +4,7 @@ configuration= 
    4  { 
    5         -- if true, the server will run as a daemon. 
    6         -- NOTE: all console appenders will be ignored if this is a daemon 
    7 -       daemon=false, 
    8 +       daemon=true, 
    9         -- the OS's path separator. Used in composing paths 
    10         pathSeparator="/", 
    11         -- this is the async DNS resolver. This is a "clinet" connection 
    12 @@ -58,7 +58,7 @@ configuration= 
     1Index: 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 
     5@@ -44,7 +44,7 @@ configuration= 
    136        { 
    147                -- this is the root directory of all applications 
    158                -- usually this is relative to the binary execuable 
    169-               rootDirectory="applications", 
    17 +               rootDirectory="/usr/lib/rtmpserver", 
     10+               rootDirectory="/usr/lib/crtmpserver", 
    1811                 
    1912                 
    2013                --this is where the applications array starts 
    21 @@ -82,7 +82,7 @@ configuration= 
     14@@ -68,7 +68,7 @@ configuration= 
    2215                        -- this is the folder from where the current application gets it's content. 
    2316                        -- It is optional. If not specified, it will be defaulted to: 
    2417                        -- <rootDirectory>/<name>/mediaFolder 
    2518-                       -- mediaFolder="/some/directory/where/media/files/are/stored" 
    26 +                       mediaFolder="/usr/share/rtmpserver/appselector", 
     19+                       mediaFolder="/usr/share/crtmpserver/appselector", 
    2720                        -- the application will also be known by that names. It is optional 
    2821                        --aliases= 
    2922                        --{ 
    30 @@ -119,6 +119,7 @@ configuration= 
     23@@ -89,13 +89,6 @@ configuration= 
     24                                }, 
     25                                { 
     26                                        ip="0.0.0.0", 
     27-                                       port=8081, 
     28-                                       protocol="inboundRtmps", 
     29-                                       sslKey="server.key", 
     30-                                       sslCert="server.crt" 
     31-                               }, 
     32-                               { 
     33-                                       ip="0.0.0.0", 
     34                                        port=8080, 
     35                                        protocol="inboundRtmpt" 
     36                 }, 
     37@@ -105,7 +98,7 @@ configuration= 
    3138                        description="FLV Playback Sample", 
    3239                        name="flvplayback", 
    3340                        protocol="dynamiclinklibrary", 
    34 +                       mediaFolder="/usr/share/rtmpserver/media", 
     41-                       mediaFolder="/Volumes/android/backup/media/", 
     42+                       mediaFolder="/media/", 
    3543                        aliases= 
    3644                        { 
    3745                                "simpleLive", 
     46@@ -183,6 +176,7 @@ configuration= 
     47                        name="samplefactory", 
     48                        description="asdsadasdsa", 
     49                        protocol="dynamiclinklibrary", 
     50+                       mediaFolder="/usr/share/ctmpserver/media", 
     51                        aliases= 
     52                        { 
     53                                "httpOutboundTest" 
  • packages/multimedia/crtmpserver/patches/040-use-select.patch

    r25679 r29785  
    1 --- a/builders/make/linux.mk 
    2 +++ b/builders/make/linux.mk 
    3 @@ -36,7 +36,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT 
     1Index: crtmpserver-r726/builders/make/linux.mk 
     2=================================================================== 
     3--- crtmpserver-r726.orig/builders/make/linux.mk 
     4+++ crtmpserver-r726/builders/make/linux.mk 
     5@@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT 
    46 PLATFORM_DEFINES = \ 
    57        -DLINUX \ 
Note: See TracChangeset for help on using the changeset viewer.