crtmpserver: fix multiple issues

 - 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>

diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile
index 5f2a31eb427bae4139f58940b29faba49dddbdc9..972fff837a6adf41d60feb2fd46a03896f2f0cc2 100644 (file)
--- a/multimedia/crtmpserver/Makefile
+++ b/multimedia/crtmpserver/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crtmpserver
-PKG_REV:=811
-PKG_VERSION:=r$(PKG_REV)
+PKG_REV:=b6fdcdb
+PKG_VERSION:=2012-07-18+git-$(PKG_REV)
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=2
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
@@ -17,10 +17,10 @@ PKG_LICENSE:=GPL-3.0
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=--username=anonymous --password= https://svn.rtmpd.com/crtmpserver/branches/1.0
+PKG_SOURCE_URL:=https://github.com/j0sh/crtmpserver.git
 PKG_SOURCE_SUBDIR:=crtmpserver-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_PROTO:=git
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -66,6 +66,9 @@ define Build/Configure
                        -e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \
                        -e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \
                        linux-openwrt-uclibc.mk)
+       (cd $(PKG_BUILD_DIR)/sources/common/include/; \
+               echo '#define CRTMPSERVER_VERSION_RELEASE_NUMBER "$(PKG_VERSION)\n"' > version.h; \
+               echo '#define CRTMPSERVER_VERSION_CODE_NAME "Git\n"'                >> version.h)
 endef
 
 define Build/Compile

diff --git a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
index ec758188eccc1605f2f183ff313b366579002b98..cc49523aec3513aa24ad8aaa0d396b8a120d39e5 100644 (file)
--- a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
+++ b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch
@@ -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

diff --git a/multimedia/crtmpserver/patches/030-default-config.patch b/multimedia/crtmpserver/patches/030-default-config.patch
index c37644ce97e7272155ce77366208b87498148438..2975f000c4dc578d2a9862cb3ed2ff18f806f2f4 100644 (file)
--- a/multimedia/crtmpserver/patches/030-default-config.patch
+++ b/multimedia/crtmpserver/patches/030-default-config.patch
@@ -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",

diff --git a/multimedia/crtmpserver/patches/040-use-select.patch b/multimedia/crtmpserver/patches/040-use-select.patch
index 466f86c9e698ec92e4adf3f70346b9a29e0b3178..380208e803c69659458245efc5bcd00fa8e6176c 100644 (file)
--- a/multimedia/crtmpserver/patches/040-use-select.patch
+++ b/multimedia/crtmpserver/patches/040-use-select.patch
@@ -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 \

diff --git a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
index f9ff617b9a0f688fc3e7be813092a1894416f9b9..25694b8f70f70fb15c391c51caeb28cc16dd4965 100644 (file)
--- a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
+++ b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch
@@ -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

diff --git a/multimedia/crtmpserver/patches/060-add-missing-includes.patch b/multimedia/crtmpserver/patches/060-add-missing-includes.patch
index 505b5f33786d832ff3728631709088c576d2b813..7b9da39a2b36a3a99e2745e224b38e70d2f14a9f 100644 (file)
--- a/multimedia/crtmpserver/patches/060-add-missing-includes.patch
+++ b/multimedia/crtmpserver/patches/060-add-missing-includes.patch
@@ -23,4 +23,4 @@
 +
  #include "utils/logging/fileloglocation.h"
  #include "utils/lua/luautils.h"
- 
+ #include "utils/misc/file.h"

diff --git a/multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch b/multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
index 94d80e79326d56f985aac177cdd6fb863b036375..534046f07507fad6a28b404afa6c69b2a6996ac9 100644 (file)
--- a/multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
+++ b/multimedia/crtmpserver/patches/070-missing-include-gcc-47.patch
@@ -5,6 +5,6 @@
  #include <iostream>
  #include <sstream>
 +#include "lstate.h"
+ using namespace std;
  
  // Help out windows:
- #if defined( _DEBUG ) && !defined( DEBUG )