version 3.53

Makefile

@@ -69,20 +69,22 @@ tgz:
 	git archive --prefix=flussonic-$(VERSION)/ master | tar x
 	mkdir -p flussonic-$(VERSION)/deps
 	[ -d deps ] && for d in deps/* ; do git clone $$d flussonic-$(VERSION)/deps/`basename $$d`; done || true
-	cd flussonic-$(VERSION) && ./rebar get-deps && ./rebar compile
+	cd flussonic-$(VERSION) && ./rebar get-deps
 	cp -f contrib/Makefile.debian flussonic-$(VERSION)/Makefile
+	perl -pi -e s,vsn_subst,$(VERSION),g flussonic-$(VERSION)/Makefile
+	rm -f flussonic-$(VERSION)/deps/mimetypes/src/mimetypes_parse.erl
 	find flussonic-$(VERSION) -name *.beam -delete
 	find flussonic-$(VERSION) -name *.so -delete
 	find flussonic-$(VERSION) -name *.o -delete
-	find flussonic-$(VERSION) -name *.app.src -delete
+	find flussonic-$(VERSION) -name *.app.src -exec perl -pi -e s,git,'"v1.0"',g {} \;
 	find flussonic-$(VERSION) -name .gitignore -delete
+	cat rebar.config |grep -v meck > flussonic-$(VERSION)/rebar.config
 	rm -rf flussonic-$(VERSION)/deps/meck
 	rm -rf flussonic-$(VERSION)/deps/cowboy/test
 	rm -rf flussonic-$(VERSION)/deps/cowboy/examples
 	rm -rf flussonic-$(VERSION)/deps/*/.git
 	rm -rf flussonic-$(VERSION)/apps/rtsp/priv
 	rm -rf flussonic-$(VERSION)/deps/lager/rebar
-	rm -rf flussonic-$(VERSION)/deps/mimetypes/post_compile.escript
 	rm -f flussonic-$(VERSION)/apps/mpegts/contrib/build_table.rb
 	rm -f flussonic-$(VERSION)/apps/flussonic/src/reloader.erl
 	rm -f flussonic-$(VERSION)/apps/flussonic/mibs-unused/ERLYVIDEO-MIB.mib

Vagrantfile

@@ -30,7 +30,7 @@ Vagrant::Config.run do |config|
   config.vm.define :centos6 do |conf|
     conf.vm.box = "centos6"
     conf.vm.box_url = "https://vagrant-centos-6.s3.amazonaws.com/centos-6.box"
-    conf.vm.provision :shell, :path => "manifests/centos6_build.sh"
+    conf.vm.provision :shell, :path => "manifests/centos6.sh"
   end
 
   # All Vagrant configuration is done here. The most common configuration

apps/flussonic/src/flussonic.app.src

@@ -1,7 +1,7 @@
 {application, flussonic,
  [
   {description, ""},
-  {vsn, "3.52"},
+  {vsn, "3.53"},
   {registered, []},
   {applications, [
                   kernel,

apps/rtsp/src/rtsp_protocol.erl

@@ -61,6 +61,10 @@ sync(Proto, Channel, Sync) ->
   auth,
   chan1,
   chan2,
+  chan3,
+  chan4,
+  chan5,
+  chan6,
   dump = true
 }).
 
@@ -87,10 +91,14 @@ init([Options]) ->
 
 
 handle_call({sync, Channel, Seq, Timecode}, _From, #rtsp{} = RTSP) ->
-  Chan = #rtp{decoder = Decoder} = element(#rtsp.chan1 + Channel, RTSP),
-  Decoder1 = rtp_decoder:sync(Decoder, [{seq,Seq},{rtptime,Timecode}]),
-  Chan1 = Chan#rtp{decoder = Decoder1, seq = Seq, timecode = Timecode, wall_clock = 0},
-  {reply, ok, setelement(#rtsp.chan1 + Channel, RTSP, Chan1)};
+  case element(#rtsp.chan1 + Channel, RTSP) of
+    Chan = #rtp{decoder = Decoder} ->
+      Decoder1 = rtp_decoder:sync(Decoder, [{seq,Seq},{rtptime,Timecode}]),
+      Chan1 = Chan#rtp{decoder = Decoder1, seq = Seq, timecode = Timecode, wall_clock = 0},
+      {reply, ok, setelement(#rtsp.chan1 + Channel, RTSP, Chan1)};
+    undefined ->
+      {reply, {error, no_channel}, RTSP}
+  end;
 
 handle_call(stop, _From, #rtsp{} = RTSP) ->
   {stop, normal, ok, RTSP};

contrib/Makefile.debian

@@ -1,21 +1,23 @@
-VERSION := $(shell ./contrib/version.erl)
+VERSION := vsn_subst
+REBAR := $(shell which rebar || echo ./rebar)
 
 
 all: compile
 
 
 compile:
-	ERL_LIBS=apps:deps erl -make
-
+	$(REBAR) compile
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/flussonic/deps $(DESTDIR)/etc/init.d/ $(DESTDIR)/etc/default
-	cp -r apps deps wwwroot $(DESTDIR)/usr/share/flussonic
-	cp priv/flussonic $(DESTDIR)/etc/init.d/
-	echo "FLUDIR=/usr/share/flussonic" >> $(DESTDIR)/etc/default/flussonic
-	mkdir -p $(DESTDIR)/usr/share/doc/flussonic/ $(DESTDIR)/etc/flussonic/
-	cp COPYING $(DESTDIR)/usr/share/doc/flussonic/copyright
-	cp priv/sample/flussonic.conf $(DESTDIR)/etc/flussonic/flussonic.conf
+	mkdir -p $(DESTROOT)/usr/share/flussonic/deps $(DESTROOT)/etc/init.d/ $(DESTROOT)/etc/default
+	cp -r apps deps wwwroot $(DESTROOT)/usr/share/flussonic
+	cp priv/flussonic $(DESTROOT)/etc/init.d/
+	echo "FLUDIR=/usr/share/flussonic" >> $(DESTROOT)/etc/default/flussonic
+	mkdir -p $(DESTROOT)/usr/share/doc/flussonic/ $(DESTROOT)/etc/flussonic/
+	cp COPYING $(DESTROOT)/usr/share/doc/flussonic/copyright
+	cp priv/sample/flussonic.conf $(DESTROOT)/etc/flussonic/flussonic.conf
+	mkdir -p $(DESTROOT)/var/run/flussonic
+	mkdir -p $(DESTROOT)/var/log/flussonic
 
 
 escriptize:

flussonic.spec

@@ -3,7 +3,7 @@
 
 Summary: Flussonic multiprotocol streaming server
 Name: flussonic
-Version: 3.51
+Version: 3.52
 Release: 3%{?dist}
 License: GPL
 Group: Network
@@ -53,14 +53,16 @@ make DESTROOT=%{buildroot} install
 
 %files
 %defattr(-, root, root)
-%{_bindir}/*
-%{_libdir}/erlang
+%{_sysconfdir}/default/%{name}
 %{_initrddir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/doc/%{name}
+#%{_localstatedir}/run/%{name}
+#%{_localstatedir}/log/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}
-%doc README.md
-%attr(-, %{user}, %{group}) %{_localstatedir}/lib/%{name}
+#%doc README.md
+%attr(-, %{user}, %{group}) %{_localstatedir}/run/%{name}
 %attr(-, %{user}, %{group}) %{_localstatedir}/log/%{name}
-%attr(-, %{user}, %{group}) %{_localstatedir}/cache/%{name}
 
 
 %clean

manifests/centos6.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+yum install -y http://mirror.yandex.ru/epel/6/x86_64/epel-release-6-7.noarch.rpm
+
+yum install -y mock rpm-build
+

manifests/centos6_build.sh

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-yum install -y http://mirror.yandex.ru/epel/6/x86_64/epel-release-6-7.noarch.rpm
-
-yum install -y mock rpm-build
-
 
 rpmbuild
 mkdir -p /root/rpmbuild/SPECS /root/rpmbuild/SOURCES

rebar.config

@@ -18,8 +18,8 @@
 {erl_opts, [debug_info, {i, "apps"}, {i, "apps/cowboy/include"}, {parse_transform, lager_transform}, warnings_as_errors]}.
 
 {deps, [
-	{lager, ".*", {git, "https://github.com/basho/lager", "0b797bc"}},
+  {meck, ".*", {git, "git://github.com/eproxus/meck.git", "beb8d14e59"}},
+  {lager, ".*", {git, "https://github.com/basho/lager", "0b797bc"}},
   {cowboy,    "0.6.*", {git, "git://github.com/extend/cowboy.git", {tag, "0.6.1"}}},
-  {mimetypes, ".*", {git, "git://github.com/spawngrid/mimetypes.git", {tag, "0.9"}}},
-  {meck, ".*", {git, "git://github.com/eproxus/meck.git", "beb8d14e59"}}
+  {mimetypes, ".*", {git, "git://github.com/spawngrid/mimetypes.git", {tag, "0.9"}}}
 ]}.