diff -Nru media-hub-4.6.0+17.04.20170321.1/debian/changelog media-hub-4.6.0+17.04.20170323/debian/changelog --- media-hub-4.6.0+17.04.20170321.1/debian/changelog 2017-03-23 14:02:09.000000000 +0000 +++ media-hub-4.6.0+17.04.20170323/debian/changelog 2017-03-23 14:02:09.000000000 +0000 @@ -1,14 +1,14 @@ -media-hub (4.6.0+17.04.20170321.1-0ubuntu1) zesty; urgency=medium +media-hub (4.6.0+17.04.20170323-0ubuntu1) zesty; urgency=medium [ Alfonso Sanchez-Beato ] * Initial documentation for media-hub snap. * Use caps instead of custom properties to retrieve video dimensions [ Chunsang Jeong ] - * Enable to make media-hub as snap and play media along with media-hub + * Enable media-hub as a snap enabling media playback with media-hub clients e.g. mediaplayer-app - -- Alfonso Sanchez-Beato Tue, 21 Mar 2017 09:21:06 +0000 + -- Alfonso Sanchez-Beato Thu, 23 Mar 2017 13:58:57 +0000 media-hub (4.6.0+17.04.20170217-0ubuntu1) zesty; urgency=medium diff -Nru media-hub-4.6.0+17.04.20170321.1/snapcraft.yaml media-hub-4.6.0+17.04.20170323/snapcraft.yaml --- media-hub-4.6.0+17.04.20170321.1/snapcraft.yaml 2017-03-21 09:21:06.000000000 +0000 +++ media-hub-4.6.0+17.04.20170323/snapcraft.yaml 2017-03-23 13:58:57.000000000 +0000 @@ -1,5 +1,5 @@ name: media-hub -version: 4.6.0+17.04.20170321.1-0ubuntu1 +version: 4.6.0+17.04.20170323-0ubuntu1 summary: Server and client sides of media-hub description: | Media Hub is a simple and lightweight service for media playback using @@ -111,6 +111,9 @@ prime: - $unwanted + # media-hub-overlay includes + # - ubuntu-app-platform to bind link ubuntu-app-platform snap when connected + # - bin/media-hub-wrapper to include environment variables media-hub-overlay: source: overlay/ plugin: dump diff -Nru media-hub-4.6.0+17.04.20170321.1/src/core/media/apparmor/ubuntu.cpp media-hub-4.6.0+17.04.20170323/src/core/media/apparmor/ubuntu.cpp --- media-hub-4.6.0+17.04.20170321.1/src/core/media/apparmor/ubuntu.cpp 2017-03-21 09:19:57.000000000 +0000 +++ media-hub-4.6.0+17.04.20170323/src/core/media/apparmor/ubuntu.cpp 2017-03-23 13:57:52.000000000 +0000 @@ -76,9 +76,10 @@ static const std::string unity_name{"unity8-dash"}; static const std::string unity8_snap_name{"snap.unity8-session.unity8-session"}; -// ad-hoc for mediaplayer-app until it settles down with proper handling +// ad-hoc for mediaplayer-app/music-app until it settles down with proper handling // Bug #1642611 static const std::string mediaplayer_snap_name{"snap.mediaplayer-app.mediaplayer-app"}; +static const std::string music_snap_name{"snap.music-app.music-app"}; // Returns true if the context name is a valid Ubuntu app id. // If it is, out is populated with the package and app name. bool process_context_name(const std::string& s, std::smatch& out, @@ -89,7 +90,8 @@ static const std::regex full_re{"(.*)_(.*)_(.*)"}; static const std::regex trust_store_re{"(.*)-(.*)"}; - if ((s == "messaging-app" or s == unity_name or s == unity8_snap_name or s == mediaplayer_snap_name) + if ((s == "messaging-app" or s == unity_name or s == unity8_snap_name or + s == mediaplayer_snap_name or s == music_snap_name) and std::regex_match(s, out, trust_store_re)) { pkg_name = s; @@ -212,7 +214,7 @@ // then remove the explicit whitelist of the music-app, and gallery-app else if ((context.package_name() == "com.ubuntu.music" || context.package_name() == "com.ubuntu.gallery" || context.profile_name() == unity_name || context.profile_name() == unity8_snap_name || - context.profile_name() == mediaplayer_snap_name) && + context.profile_name() == mediaplayer_snap_name || context.profile_name() == music_snap_name) && (parsed_uri.path.find(std::string("Music/")) != std::string::npos || parsed_uri.path.find(std::string("Videos/")) != std::string::npos || parsed_uri.path.find(std::string("/media")) != std::string::npos))