[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] /: Kamoso needs qt-gstreamer.
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2015-04-01 14:57:10
Message-ID: E1YdK4s-00051a-N3 () scm ! kde ! org
[Download RAW message or body]

Git commit 910731df63aa4f2bccb6ab43658d9bc9f6c250d5 by Scarlett Clark.
Committed on 01/04/2015 at 14:56.
Pushed by scarlettclark into branch 'sok-work'.

Kamoso needs qt-gstreamer.

M  +1    -0    config/base/kf5-qt5
M  +1    -1    docker/ubuntu-slave/Dockerfile

http://commits.kde.org/websites/build-kde-org/910731df63aa4f2bccb6ab43658d9=
bc9f6c250d5

diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
index b63fa66..0ee3cc7 100644
--- a/config/base/kf5-qt5
+++ b/config/base/kf5-qt5
@@ -35,6 +35,7 @@ extragear/office/skrooge: general/grantlee
 extragear/libs/libkface: general/opencv
 extragear/kdevelop/kdevplatform: general/grantlee
 extragear/multimedia/plasma-mediacenter: general/mockcpp
+extragear/multimedia/kamoso: general/qt-gstreamer
 =

 # Playground/Base
 playground/base/kdeconnect-kde: kdesupport/qca
diff --git a/docker/ubuntu-slave/Dockerfile b/docker/ubuntu-slave/Dockerfile
index e34ffbd..e390171 100644
--- a/docker/ubuntu-slave/Dockerfile
+++ b/docker/ubuntu-slave/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Scarlett Clark <sgclark@kubuntu.org>
 =

 #Install Essentials up to qt5
 RUN apt-get update && apt-get -y install openssh-server sudo wget build-es=
sential openjdk-6-jre-headless git python-lxml xvfb openbox dbus-x11 psmisc=
 doxygen bzr cppcheck gperf bison ruby flex libpolkit-agent-1-dev libpolkit=
-backend-1-dev libpolkit-gobject-1-dev libxslt1-dev docbook-xml docbook-xsl=
 libgcrypt-dev libboost1.55-dev gcovr libnm-glib-dev libnm-util-dev libopen=
al-dev  libsndfile1-dev libexiv2-dev libattr1-dev libxapian-dev xsltproc li=
bgpgme11-dev libsasl2-dev libdmtx-dev libqrencode-dev libldap2-dev =

-libical-dev libxcb-composite0-dev libxcb-damage0-dev lib-gtk-3-dev modemma=
nager-qt libxcb-dpms0-dev libraw-dev libxcb-image0-dev libxcb-xkb-dev libxk=
bfile-dev libboost-system1.55-dev libavcodec-dev libavformat-dev libavutil-=
dev libswscale-dev libtag1-dev && apt-get -y build-dep qtbase5-dev
+libical-dev libxcb-composite0-dev libxcb-damage0-dev lib-gtk-3-dev modemma=
nager-qt libxcb-dpms0-dev libraw-dev libxcb-image0-dev libxcb-xkb-dev libxk=
bfile-dev libboost-system1.55-dev libavcodec-dev libavformat-dev libavutil-=
dev libswscale-dev libtag1-dev libsamplerate0-dev && apt-get -y build-dep q=
tbase5-dev
 =

 #SSH I have master and slave on the same host so I had to get creative wit=
h ssh ports. update as needed.
 EXPOSE 22
[prev in list] [next in list] [prev in thread] [next in thread]