HTML5 player v2.35.5.

kaltura · Oct 9, 2015 · 6ef47d0 · 6ef47d0
1 parent 81a866d
commit 6ef47d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/deb/kaltura-html5lib/debian/changelog b/deb/kaltura-html5lib/debian/changelog
@@ -1,3 +1,10 @@
+kaltura-html5lib (2.35.5-1) jupiter; urgency=low
+
+  * IVQ release
+
+
+ -- Jess Portnoy <jess.portnoy@kaltura.org>  Fri, 09 Oct 2015 11:43:52 +0000
+
 kaltura-html5lib (2.35-1) jupiter; urgency=low
 
   * FEC-4021 - Video is not playing on IOS9 while it has overly

diff --git a/deb/kaltura-kmc/debian/changelog b/deb/kaltura-kmc/debian/changelog
@@ -1,3 +1,9 @@
+kaltura-kmc (5.39.9-2) jupiter; urgency=low
+
+  * Version bounce to align with kaltura-html5lib v2.35.5. 
+
+ -- Jess Portnoy <jess.portnoy@kaltura.org>  Fri, 09 Oct 2015 11:52:05 +0000
+
 kaltura-kmc (5.39.9-1) jupiter; urgency=low
 
   * Update KMC listing of live streaming ingest points to use _1 instead of _%i

diff --git a/deb/kaltura-nginx/debian/rules b/deb/kaltura-nginx/debian/rules
@@ -8,6 +8,7 @@ KALTURA_NGINX_VOD_VERSION ?= $(shell egrep '^KALTURA_NGINX_VOD_VERSION=' $(RC_FI
 KALTURA_NGINX_AKAMAI_TOKEN_VALIDATE_VERSION ?= $(shell egrep '^KALTURA_NGINX_AKAMAI_TOKEN_VALIDATE_VERSION=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 KALTURA_NGINX_SECURE_TOKEN_VERSION ?= $(shell egrep '^KALTURA_NGINX_SECURE_TOKEN_VERSION=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 SOURCE_PACKAGING_DIR ?= $(shell egrep '^RPM_SOURCES_DIR=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
+FFMPEG_VERSION ?= $(shell egrep '^FFMPEG_VERSION=' $(RC_FILE) | cut -d = -f 2| sed 's@"@@g')
 include ../includes/build-revision.mk
 tree := nginx-$(NGINX_VERSION)
 archive := $(SOURCE_PACKAGING_DIR)/kaltura-$(tree).tar.gz
@@ -25,15 +26,15 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += -Wall
-LDFLAGS = `dpkg-buildflags --get LDFLAGS -L/opt/kaltura/ffmpeg-2.1.3/lib`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS -L/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib`
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
-#LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib 
-#LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib 
-#C_INCLUDE_PATH=/opt/kaltura/ffmpeg-2.1.3/include
+#LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib 
+#LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib 
+#C_INCLUDE_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/include
 #export LD_LIBRARY_PATH LIBRARY_PATH C_INCLUDE_PATH
 $(archive):
 	~/sources/platform-install-packages/build/package_kaltura_nginx.sh
@@ -52,7 +53,7 @@ config.status: $(tree)
 	unzip -o $(secure_token_module_archive) -d $(tree) 
 	unzip -o $(akamai_token_validate_module_archive) -d $(tree)
 	dh_testdir
-	cd $(tree) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-2.1.3/include ./configure \
+	cd $(tree) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/include ./configure \
         --prefix=/$(BASE_PREFIX) \
         --error-log-path=/opt/kaltura/log/nginx/error.log \
         --http-log-path=/opt/kaltura/log/nginx/access.log \
@@ -87,7 +88,7 @@ build-stamp:  config.status
 	#dh_quilt_patch
 	dh_testdir
 
-	cd $(tree) && LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-2.1.3/include  $(MAKE)
+	cd $(tree) && LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/include  $(MAKE)
 
 	touch build-stamp
 
@@ -104,7 +105,7 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	cd $(tree) && LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-2.1.3/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-2.1.3/include $(MAKE) -C . install DESTDIR=$(CURDIR)/debian/$(tree)/
+	cd $(tree) && LD_LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib LIBRARY_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/lib C_INCLUDE_PATH=/opt/kaltura/ffmpeg-$(FFMPEG_VERSION)/include $(MAKE) -C . install DESTDIR=$(CURDIR)/debian/$(tree)/
 
 
 # Build architecture-independent files here.