diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar index b587e12fd8..85b6a45234 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar index 9f0cc3cc60..06a0be9957 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar and b/bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar differ diff --git a/bbb-screenshare/app/jws/lib/ffmpeg.jar b/bbb-screenshare/app/jws/lib/ffmpeg.jar index 46904a5869..0e7e707feb 100755 Binary files a/bbb-screenshare/app/jws/lib/ffmpeg.jar and b/bbb-screenshare/app/jws/lib/ffmpeg.jar differ diff --git a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar index 350bf97a01..5a547815b3 100755 Binary files a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar and b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar index 2723f63d9f..a9b15f362a 100755 Binary files a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar and b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh index 59be2d1e86..b4664e851f 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh @@ -1,8 +1,18 @@ FFMPEG=ffmpeg-3.0.2-1.2-linux-x86.jar -cp $FFMPEG build/libs/ffmpeg-linux-x86-0.0.1.jar mkdir workdir +cp $FFMPEG workdir/ffmpeg-linux-x86.jar rm -rf src -rm -rf workdir +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86.jar +cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources +cd .. +gradle jar cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../unsigned-jars/ffmpeg-linux-x86-unsigned.jar ant sign-jar cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../app/jws/lib/ffmpeg-linux-x86.jar +rm -rf workdir +rm -rf src + + diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar index 9a297603b3..3acd80d9ff 100755 Binary files a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar and b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar differ diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh index 2d21a8335b..3a0da8e7a7 100755 --- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh +++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh @@ -1,7 +1,17 @@ FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64.jar mkdir workdir -rm -rf workdir -cp $FFMPEG build/libs/ffmpeg-linux-x86_64-0.0.1.jar +cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar +rm -rf src +mkdir -p src/main/resources +mkdir -p src/main/java +cd workdir +jar xvf ffmpeg-linux-x86_64.jar +cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources +cd .. +gradle jar cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar ant sign-jar cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../app/jws/lib/ffmpeg-linux-x86_64.jar +rm -rf workdir +rm -rf src + diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2.jar index 1c4f64049e..8552eaf4a6 100755 Binary files a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2.jar and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar index 2723f63d9f..13638d6e08 100755 Binary files a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86-unsigned.jar differ diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar index 9a297603b3..d26edb544d 100644 Binary files a/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar and b/bbb-screenshare/jws/native-libs/unsigned-jars/ffmpeg-linux-x86_64-unsigned.jar differ