Take nginx-rtmp-module from the kaltura fork as I fixed some compliat…

…ion issues there

RPM/SPECS/kaltura-ffmpeg-aux.spec

@@ -47,7 +47,7 @@ BuildRequires: zlib-devel
 #BuildRequires: schroedinger-devel
 BuildRequires: libtheora-devel
 BuildRequires: libvorbis-devel
-BuildRequires: xvidcore
+BuildRequires: libxvidcore4-devel
 BuildRequires: x265-devel
 BuildRequires: gnutls-devel
 BuildRequires: kaltura-a52dec-devel
@@ -56,26 +56,27 @@ BuildRequires: libvdpau-devel
 BuildRequires: openjpeg2-devel
 %{!?_without_nut:BuildRequires: libnut-devel}
 %{!?_without_opencore_amr:BuildRequires: kaltura-libopencore-amr-devel}
-BuildRequires: kaltura-librtmp-devel
+BuildRequires: librtmp-devel
 #%{!?_without_schroedinger:BuildRequires: schroedinger-devel}
 %{!?_without_texi2html:BuildRequires: texi2html}
 %{!?_without_theora:BuildRequires: libogg-devel, libtheora-devel}
 %{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel}
 BuildRequires: kaltura-libvpx-devel >= 1.7.0
-BuildRequires: kaltura-x264-devel
-BuildRequires: xvidcore-devel
+BuildRequires: x264-devel
+BuildRequires: libxvidcore4-devel
 Requires: a52dec
 BuildRequires: libass-devel 
-BuildRequires: kaltura-x264-devel 
+BuildRequires: x264-devel 
 BuildRequires: gsm-devel
 BuildRequires: speex-devel
 #BuildRequires: schroedinger-devel 
 BuildRequires: libtheora-devel
-BuildRequires: xvidcore-devel >= 1.3.2
-Requires:kaltura-a52dec,libass,kaltura-x264
+BuildRequires: libxvidcore4-devel
+Requires:kaltura-a52dec,libass,x264
 Requires: kaltura-libvpx >= 1.7.0
 Requires: x265-libs
 Requires: gnutls
+Requires: libxvidcore4
 
 %description
 FFmpeg is a very fast video and audio converter. It can also grab from a
@@ -90,17 +91,17 @@ quality polyphase filter.
 Summary: Header files and static library for the ffmpeg codec library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig,kaltura-x264
+Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig,x264
 %{!?_without_a52dec:Requires: kaltura-a52dec-devel}
 #%{!?_without_faad:Requires: faad2-devel}
 %{!?_without_gsm:Requires: gsm-devel}
 %{!?_without_lame:Requires: kaltura-lame-devel}
-%{!?_without_rtmp:Requires: kaltura-librtmp-devel}
+%{!?_without_rtmp:Requires: librtmp-devel}
 #%{!?_without_schroedinger:Requires: schroedinger-devel}
 %{!?_without_vorbis:Requires: libogg-devel, libvorbis-devel}
 %{!?_without_vpx:Requires: kaltura-libvpx-devel}
-%{!?_without_x264:Requires: kaltura-x264-devel}
-%{!?_without_xvid:Requires: xvidcore-devel}
+%{!?_without_x264:Requires: x264-devel}
+%{!?_without_xvid:Requires: libxvidcore4-devel}
 
 %description devel
 FFmpeg is a very fast video and audio converter. It can also grab from a

RPM/SPECS/kaltura-nginx.spec

@@ -48,7 +48,7 @@ Requires(pre): pwdutils
 %define nginx_json_var_ver 1.0
 %define nginx_strftime_ver 1.0
 %define nginx_vts_ver 0.1.18
-%define nginx_rtmp_ver 1.2.0
+%define nginx_rtmp_ver 1.21.0
 %define ngx_aws_auth_ver 1.0.1
 %define headers_more_nginx_ver 0.33
 %define set_misc_nginx_ver 0.33

build/sources.rc

@@ -159,8 +159,8 @@ KALTURA_NGINX_AKAMAI_TOKEN_VALIDATE_URI="https://github.com/kaltura/nginx-akamai
 NGINX_VTS_VERSION=v0.1.18
 NGINX_VTS_URI="https://github.com/vozlt/nginx-module-vts/archive/$NGINX_VTS_VERSION.zip"
 
-NGINX_RTMP_VERSION=v1.2.0
-NGINX_RTMP_URI="https://github.com/arut/nginx-rtmp-module/archive/$NGINX_RTMP_VERSION.zip"
+NGINX_RTMP_VERSION=v1.21.0
+NGINX_RTMP_URI="https://github.com/kaltura/nginx-rtmp-module/archive/$NGINX_RTMP_VERSION.zip"
 
 KALTURA_NGINX_SECURE_TOKEN_VERSION=1.4
 KALTURA_NGINX_SECURE_TOKEN_URI="https://github.com/kaltura/nginx-secure-token-module/archive/$KALTURA_NGINX_SECURE_TOKEN_VERSION.zip"