Media Hub

Merge lp:~phablet-team/media-hub/snap-packaging into lp:media-hub

  1. snap-packaging
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Simon Fels
Approved revision: 210
Merged at revision: 210
Proposed branch: lp:~phablet-team/media-hub/snap-packaging
Merge into: lp:media-hub
Diff against target: 102 lines (+85/-1)
2 files modified
snapcraft.yaml (+80/-0)
src/core/media/telephony/call_monitor.cpp (+5/-1)
To merge this branch: bzr merge lp:~phablet-team/media-hub/snap-packaging
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+303825@code.launchpad.net

Commit message

* Add initial version of Snappy package for media-hub-server
* Don't try and connect to TelepathyQt forever in call_monitor

Description of the change

* Add initial version of Snappy package for media-hub-server
* Don't try and connect to TelepathyQt forever in call_monitor

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) :
review: Needs Fixing
Revision history for this message
Jim Hodapp (jhodapp) :
lp:~phablet-team/media-hub/snap-packaging updated
208. By Jim Hodapp

Address review comments

Revision history for this message
Simon Fels (morphis) wrote :

Two minor notes.

review: Approve
lp:~phablet-team/media-hub/snap-packaging updated
209. By Jim Hodapp

Address final review comments

210. By Jim Hodapp

Reduce size of resulting snap package

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'snapcraft.yaml'
2--- snapcraft.yaml 1970-01-01 00:00:00 +0000
3+++ snapcraft.yaml 2016-09-08 20:10:41 +0000
4@@ -0,0 +1,80 @@
5+name: media-hub
6+version: 4.6.0-1
7+summary: Server and client sides of media-hub
8+description: |
9+ Media Hub is a simple and lightweight service for media playback using
10+ DBus. Please find the source code at:
11+ https://code.launchpad.net/media-hub
12+confinement: strict
13+
14+apps:
15+ service:
16+ command: usr/bin/media-hub-server
17+ slots: [mpris]
18+ plugs: [pulseaudio]
19+
20+parts:
21+ service:
22+ plugin: cmake
23+ source: .
24+
25+ build-packages:
26+ - build-essential
27+ - dbus-test-runner
28+ - debhelper
29+ - dh-apparmor
30+ - doxygen
31+ - google-mock
32+ - graphviz
33+ - gstreamer1.0-plugins-good
34+ - libboost-dev
35+ - libboost-filesystem-dev
36+ - libboost-log-dev
37+ - libboost-program-options-dev
38+ - libboost-system-dev
39+ - libdbus-1-dev
40+ - libdbus-cpp-dev
41+ - libgoogle-glog-dev
42+ - libgstreamer1.0-dev
43+ - libgstreamer-plugins-base1.0-dev
44+ - libhybris-dev
45+ - libprocess-cpp-dev
46+ - libproperties-cpp-dev
47+ - libpulse-dev
48+ - libtelepathy-qt5-dev
49+ - lsb-release
50+ - pkg-config
51+ - qtbase5-dev
52+
53+ stage-packages:
54+ # Ok to ship by default since Ubuntu has an mp3 license
55+ - gstreamer1.0-fluendo-mp3
56+
57+ configflags:
58+ - -DCMAKE_INSTALL_PREFIX:PATH=/usr
59+ - -DCMAKE_LIBRARY_PATH=/usr/lib
60+
61+ filesets:
62+ unwanted:
63+ # Files that we don't want/need in the final snap package
64+ - -etc
65+ - -usr/lib/debug
66+ - -usr/lib/*/libogg*
67+ - -usr/lib/*/libpulse*
68+ - -usr/lib/python*
69+ - -usr/share/apport
70+ - -usr/share/bug
71+ - -usr/share/doc
72+ - -usr/share/fonts
73+ - -usr/share/libwacom
74+ - -usr/share/lintian
75+ - -usr/share/man
76+ - -usr/share/X11
77+ - -usr/lib/*.a
78+ - -usr/lib/*/*.a
79+ - -usr/lib/*.la
80+ - -usr/lib/*/*.la
81+ - -usr/lib/*/*.o
82+
83+ snap:
84+ - $unwanted
85
86=== modified file 'src/core/media/telephony/call_monitor.cpp'
87--- src/core/media/telephony/call_monitor.cpp 2016-04-04 20:29:29 +0000
88+++ src/core/media/telephony/call_monitor.cpp 2016-09-08 20:10:41 +0000
89@@ -96,9 +96,13 @@
90 }
91
92 void accountManagerReady(Tp::PendingOperation* operation) {
93+ static uint8_t retries = 0;
94 if (operation->isError()) {
95 MH_ERROR("TelepathyBridge: Operation failed (accountManagerReady)");
96- QTimer::singleShot(1000, this, SLOT(accountManagerSetup())); // again
97+ if (retries < 10) {
98+ QTimer::singleShot(1000, this, SLOT(accountManagerSetup())); // again
99+ ++retries;
100+ }
101 return;
102 }
103

Subscribers

People subscribed via source and target branches

to all changes: