Skip to content

Commit

Permalink
OM version updated to 3.3.0; ffmpeg script is updated to work with 17.04
Browse files Browse the repository at this point in the history
  • Loading branch information
solomax committed Jul 25, 2017
1 parent 782fe14 commit 1a83889
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -16,8 +16,8 @@ FROM ubuntu:16.04
MAINTAINER Apache OpenMeetings dev team version: 3.2.1 <dev@openmeetings.apache.org>

ENV OM_VER_MAJ '3'
ENV OM_VER_MIN '2'
ENV OM_VER_MIC '1'
ENV OM_VER_MIN '3'
ENV OM_VER_MIC '0'
ENV OM_VERSION "${OM_VER_MAJ}.${OM_VER_MIN}.${OM_VER_MIC}"
ENV DB_ROOT_PASS '12345'
ENV OM_DB_NAME "open${OM_VER_MAJ}_${OM_VER_MIN}_${OM_VER_MIC}"
Expand Down
12 changes: 1 addition & 11 deletions scripts/ffmpeg-ubuntu-debian.sh 100644 → 100755
Expand Up @@ -15,7 +15,7 @@
# FFmpeg compilation for Ubuntu and Debian.
# https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu

apt install -y autoconf automake build-essential libass-dev libfreetype6-dev libtheora-dev libtool libvorbis-dev pkg-config texi2html zlib1g-dev mercurial cmake yasm libx264-dev libmp3lame-dev libopus-dev
apt install -y autoconf automake build-essential libass-dev libfreetype6-dev libtheora-dev libtool libvorbis-dev pkg-config texinfo wget zlib1g-dev git mercurial cmake yasm libx264-dev libmp3lame-dev libopus-dev libvpx-dev

# Create a directory for sources.
FFMPEG=${work}/ffmpeg
Expand Down Expand Up @@ -46,16 +46,6 @@ make install
make distclean


cd ${SOURCES}
wget http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2
tar xjvf libvpx-1.5.0.tar.bz2
cd libvpx-1.5.0
PATH="${BIN}:$PATH" ./configure --prefix="${BUILD}" --disable-examples --disable-unit-tests
PATH="${BIN}" make
make install
make clean


cd ${SOURCES}
wget http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
tar xjvf ffmpeg-snapshot.tar.bz2
Expand Down
Empty file modified scripts/om.sh 100644 → 100755
Empty file.
Empty file modified scripts/om_install.sh 100644 → 100755
Empty file.

0 comments on commit 1a83889

Please sign in to comment.