Merge branch 'v0.04' of https://code.google.com/p/libremediaserver into v0.04
Conflicts: scripts/install_precise.sh src/libremediaserver.h
This commit is contained in:
commit
ce23413cd1
3 changed files with 7 additions and 1 deletions
|
@ -22,6 +22,10 @@ You should have received a copy of the GNU General Public License along with thi
|
||||||
Lbre Media Server ChangeLog
|
Lbre Media Server ChangeLog
|
||||||
|
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
|
V 0.04-3-DebianWheezy
|
||||||
|
|
||||||
|
- Added flext binaries
|
||||||
|
- Added some missing dependencies on install_wheezy.sh
|
||||||
|
|
||||||
V 0.04-3-UbuntuPrecise
|
V 0.04-3-UbuntuPrecise
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,9 @@ if [ "$output" -eq "0" ]; then
|
||||||
echo "deb http://apt.openlighting.org/ubuntu/ precise main" >> /etc/apt/sources.list
|
echo "deb http://apt.openlighting.org/ubuntu/ precise main" >> /etc/apt/sources.list
|
||||||
fi
|
fi
|
||||||
apt-get update
|
apt-get update
|
||||||
|
|
||||||
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libqt4-script libqt4-network libqt4-webkit libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2
|
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libqt4-script libqt4-network libqt4-webkit libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2
|
||||||
|
|
||||||
if [ "$?" -eq "0" ]; then
|
if [ "$?" -eq "0" ]; then
|
||||||
echo "apt-get finish ok"
|
echo "apt-get finish ok"
|
||||||
else "apt-get return errors!"
|
else "apt-get return errors!"
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
dpkg -i ola_0.8.26-1_i386.deb
|
dpkg -i ola_0.8.26-1_i386.deb
|
||||||
# Install Pure Data y OLA
|
# Install Pure Data y OLA
|
||||||
# libav para generar thumbs
|
# libav para generar thumbs
|
||||||
apt-get -y --force-yes install libav-tools libqtcore4 libqtgui4 libmagick++5
|
apt-get -y --force-yes install libqtcore4 libqtgui4 libqtwebkit4 libqt4-script libqt4-network libmagick++5 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1 libquicktime2
|
||||||
if [ "$?" -eq "0" ]; then
|
if [ "$?" -eq "0" ]; then
|
||||||
echo "apt-get finish ok"
|
echo "apt-get finish ok"
|
||||||
else "apt-get return errors!"
|
else "apt-get return errors!"
|
||||||
|
|
Loading…
Add table
Reference in a new issue