Merge lp:~ted/mediaplayer-app/url-overlays into lp:mediaplayer-app

Proposed by Ted Gould
Status: Needs review
Proposed branch: lp:~ted/mediaplayer-app/url-overlays
Merge into: lp:mediaplayer-app
Diff against target: 72 lines (+20/-2)
5 files modified
data/CMakeLists.txt (+1/-1)
debian/apparmor/mediaplayer-app (+15/-0)
debian/control (+1/-0)
debian/mediaplayer-app.install (+2/-1)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~ted/mediaplayer-app/url-overlays
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+261442@code.launchpad.net

Commit message

Setup to use the URL overlay feature

Description of the change

Use URL overlays for video:/// URLs

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

This works in that it gets started by the URL dispatcher and comes up as an overlay. But it seems that media-hub won't talk to it, I'm guessing because it has an apparmor profile it puts some restrictions on it that aren't expected. I'm not sure of the future of mediaplayer, so I'm not going to debug further, just using to it prove out the URL overlay feature.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

I'm not sure what is meant by url overlay. Can you better describe what this feature is exactly?

Revision history for this message
Ted Gould (ted) wrote :

On Tue, 2016-05-10 at 15:34 +0000, Jim Hodapp wrote:
> I'm not sure what is meant by url overlay. Can you better describe
> what this feature is exactly?
It allows it to show as an overlay to the current app instead of as an
application itself. We're removing the ability to use malformed desktop
files so the media player has become an issue again with not wanting
the app icon in the app grid. This allows it to be a URL to be called
from a scope, and show up over the dash when requested. I've built it
in a silo so you can see the behavior there: https://requests.ci-train.
ubuntu.com/#/ticket/1400

Revision history for this message
Jim Hodapp (jhodapp) wrote :

Makes sense, thanks Ted.

Unmerged revisions

364. By Ted Gould

Update to trunk

363. By Ted Gould

Adding 'attach_disconnected' for phone

362. By Ted Gould

Change to profile recommended by security

361. By Ted Gould

Move the apparmor config

360. By Ted Gould

Adding dh_apparmor dep

359. By Ted Gould

Removing unrelated comment

358. By Ted Gould

Adding an apparmor profile

357. By Ted Gould

Setup to use the URL overlay feature

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2016-01-20 15:44:22 +0000
+++ data/CMakeLists.txt 2016-05-10 15:23:33 +0000
@@ -11,7 +11,7 @@
11 )11 )
1212
13install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE}13install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE}
14 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications14 DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/url-overlays
15)15)
1616
17install(FILES ${MEDIAPLAYER_APP_ICON} ${MEDIAPLAYER_APP_SYMBOLIC_ICON}17install(FILES ${MEDIAPLAYER_APP_ICON} ${MEDIAPLAYER_APP_SYMBOLIC_ICON}
1818
=== added directory 'debian/apparmor'
=== added file 'debian/apparmor/mediaplayer-app'
--- debian/apparmor/mediaplayer-app 1970-01-01 00:00:00 +0000
+++ debian/apparmor/mediaplayer-app 2016-05-10 15:23:33 +0000
@@ -0,0 +1,15 @@
1# vim:syntax=apparmor
2#include <tunables/global>
3
4# Mostly unconfined. Don't allow capability or any mount rules. Also ensure that
5# exec inherits from this profile
6profile mediaplayer-app (attach_disconnected) {
7 network,
8 / rwkl,
9 /** rwlkm,
10 /** pix,
11 dbus,
12 signal,
13 ptrace,
14 unix,
15}
016
=== modified file 'debian/control'
--- debian/control 2016-04-28 15:02:04 +0000
+++ debian/control 2016-05-10 15:23:33 +0000
@@ -4,6 +4,7 @@
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: cmake,5Build-Depends: cmake,
6 debhelper (>= 9),6 debhelper (>= 9),
7 dh-apparmor,
7 dh-translations,8 dh-translations,
8 libgl1-mesa-dev | libgl-dev,9 libgl1-mesa-dev | libgl-dev,
9 libgles2-mesa-dev,10 libgles2-mesa-dev,
1011
=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install 2016-01-20 15:44:22 +0000
+++ debian/mediaplayer-app.install 2016-05-10 15:23:33 +0000
@@ -1,8 +1,9 @@
1/usr/share/applications/mediaplayer-app.desktop1/usr/share/url-dispatcher/url-overlays/mediaplayer-app.desktop
2/usr/bin/mediaplayer-app2/usr/bin/mediaplayer-app
3/usr/share/mediaplayer-app/mediaplayer-app.png3/usr/share/mediaplayer-app/mediaplayer-app.png
4/usr/share/mediaplayer-app/mediaplayer-app-symbolic.svg4/usr/share/mediaplayer-app/mediaplayer-app-symbolic.svg
5/usr/share/mediaplayer-app/qml/*5/usr/share/mediaplayer-app/qml/*
6/usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo6/usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
7/usr/share/url-dispatcher/urls/*7/usr/share/url-dispatcher/urls/*
8debian/apparmor/mediaplayer-app etc/apparmor.d
8/usr/share/content-hub/peers/mediaplayer-app9/usr/share/content-hub/peers/mediaplayer-app
910
=== modified file 'debian/rules'
--- debian/rules 2013-06-11 15:20:49 +0000
+++ debian/rules 2016-05-10 15:23:33 +0000
@@ -7,6 +7,7 @@
7 dh $@ --parallel --with translations7 dh $@ --parallel --with translations
88
9override_dh_install:9override_dh_install:
10 dh_apparmor --profile-name=mediaplayer-app -p mediaplayer-app
10 dh_install --fail-missing11 dh_install --fail-missing
1112
12override_dh_translations:13override_dh_translations:

Subscribers

People subscribed via source and target branches

to all changes: