BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating screenshare

Browse Source 
Updating Red5 triggered updating of ffmpeg jars for screensharing.
This commit is contained in:
Richard Alam 2016-03-30 21:18:39 +00:00
parent 53dc204e8d
commit be050216b0
18 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-screenshare/app/build.sbt
View File

@ -49,7 +49,7 @@ libraryDependencies ++= {
"commons-codec" % "commons-codec" % "1.8", "commons-codec" % "commons-codec" % "1.8",
"redis.clients" % "jedis" % "2.7.2", "redis.clients" % "jedis" % "2.7.2",
// "org.apache.commons" % "commons-lang3" % "3.2", // "org.apache.commons" % "commons-lang3" % "3.2",
"org.red5" % "red5-server" % "1.0.7-M8", "org.red5" % "red5-server" % "1.0.7-M10",
"com.google.code.gson" % "gson" % "1.7.1", "com.google.code.gson" % "gson" % "1.7.1",
"org.springframework" % "spring-web" % springVersion, "org.springframework" % "spring-web" % springVersion,

BIN
bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar
View File

Binary file not shown.

BIN
bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar
View File

Binary file not shown.

BIN
bbb-screenshare/app/jws/lib/ffmpeg.jar
View File

Binary file not shown.

BIN
bbb-screenshare/app/jws/lib/javacpp.jar
View File

Binary file not shown.

BIN
bbb-screenshare/app/jws/lib/javacv.jar
View File

Binary file not shown.

BIN
bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/ffmpeg-3.0-1.2-SNAPSHOT-windows-x86.jar Executable file
View File

Binary file not shown.

3
bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh
View File

@ -1,5 +1,6 @@
FFMPEG=ffmpeg-3.0-1.2-SNAPSHOT-windows-x86.jar
mkdir workdir mkdir workdir
cp ffmpeg-2.8.5-1.2-SNAPSHOT-windows-x86.jar workdir/ffmpeg-windows-x86.jar cp $FFMPEG workdir/ffmpeg-windows-x86.jar
rm -rf src rm -rf src
mkdir -p src/main/resources mkdir -p src/main/resources
mkdir -p src/main/java mkdir -p src/main/java

BIN
bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/ffmpeg-3.0-1.2-SNAPSHOT-windows-x86_64.jar Executable file
View File

Binary file not shown.

2
bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/sign-jar.sh
View File

@ -1,4 +1,4 @@
FFMPEG=ffmpeg-2.8.5-1.2-SNAPSHOT-windows-x86_64.jar FFMPEG=ffmpeg-3.0-1.2-SNAPSHOT-windows-x86_64.jar
mkdir workdir mkdir workdir
cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar
rm -rf src rm -rf src

BIN
bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0-1.2-SNAPSHOT.jar Executable file
View File

Binary file not shown.

BIN
bbb-screenshare/jws/native-libs/unsigned-jars/javacpp-1.2-SNAPSHOT.jar
View File

Binary file not shown.

BIN
bbb-screenshare/jws/native-libs/unsigned-jars/javacv-1.2-20160319.154745-3.jar Executable file
View File

Binary file not shown.

3
bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh
View File

@ -1,5 +1,6 @@
FFMPEG=ffmpeg-3.0-1.2-SNAPSHOT.jar
mkdir workdir mkdir workdir
cp ffmpeg-2.8.5-1.2-SNAPSHOT.jar workdir/ffmpeg.jar cp $FFMPEG workdir/ffmpeg.jar
ant sign-ffmpeg-jar ant sign-ffmpeg-jar
cp workdir/ffmpeg.jar ../../../app/jws/lib/ cp workdir/ffmpeg.jar ../../../app/jws/lib/
rm -rf workdir rm -rf workdir

2
bbb-screenshare/jws/native-libs/unsigned-jars/sign-javacv.sh
View File

@ -1,4 +1,4 @@
JAVACV=javacv-1.2-20160211.041753-1.jar JAVACV=javacv-1.2-20160319.154745-3.jar
mkdir workdir mkdir workdir
cp $JAVACV workdir/javacv.jar cp $JAVACV workdir/javacv.jar
ant sign-javacv-jar ant sign-javacv-jar

4
bbb-video/build.gradle
View File

@ -63,8 +63,8 @@ dependencies {
providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
// Red5 // Red5
providedCompile 'org.red5:red5-server:1.0.7-M8@jar' providedCompile 'org.red5:red5-server:1.0.7-M10@jar'
providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M10@jar'
providedCompile 'org.red5:red5-io:1.0.7-M8@jar' providedCompile 'org.red5:red5-io:1.0.7-M8@jar'
// Logging // Logging

6
bbb-voice/build.gradle
View File

@ -62,9 +62,9 @@ dependencies {
providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar' providedCompile 'org.springframework:spring-context:4.2.5.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
providedCompile 'org.red5:red5-server:1.0.7-M8@jar' providedCompile 'org.red5:red5-server:1.0.7-M10@jar'
providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M10@jar'
providedCompile 'org.red5:red5-io:1.0.7-M8@jar' providedCompile 'org.red5:red5-io:1.0.7-M10@jar'
// Logging // Logging
providedCompile 'ch.qos.logback:logback-core:1.1.6@jar' providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'

4
bigbluebutton-apps/build.gradle
View File

@ -70,8 +70,8 @@ dependencies {
providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar' providedCompile 'org.springframework:spring-core:4.2.5.RELEASE@jar'
// Red5 // Red5
providedCompile 'org.red5:red5-server:1.0.7-M8@jar' providedCompile 'org.red5:red5-server:1.0.7-M10@jar'
providedCompile 'org.red5:red5-server-common:1.0.7-M8@jar' providedCompile 'org.red5:red5-server-common:1.0.7-M10@jar'
// Logging // Logging
providedCompile 'ch.qos.logback:logback-core:1.1.6@jar' providedCompile 'ch.qos.logback:logback-core:1.1.6@jar'