camera-app

Merge lp:~renatofilho/camera-app/use-platform-plugin into lp:camera-app

  1. use-platform-plugin
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Rejected
Rejected by: Florian Boucault
Proposed branch: lp:~renatofilho/camera-app/use-platform-plugin
Merge into: lp:camera-app
Diff against target: 85 lines (+17/-19)
3 files modified
debian/control (+1/-0)
snap/camera.wrapper (+4/-1)
snapcraft.yaml (+12/-18)
To merge this branch: bzr merge lp:~renatofilho/camera-app/use-platform-plugin
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Florian Boucault Pending
Ubuntu Phablet Team Pending
Review via email: mp+311323@code.launchpad.net

Commit message

Use 'ubuntu-app-platform' content share for snap package.

To post a comment you must log in.
lp:~renatofilho/camera-app/use-platform-plugin updated
676. By Renato Araujo Oliveira Filho

Add empty dir used to mount platform shared content.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:676
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2015/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2018
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1848/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1848/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)
lp:~renatofilho/camera-app/use-platform-plugin updated
677. By Renato Araujo Oliveira Filho

Add missing library path on LD_LIBRARY_PATH.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:677
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2016/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2019
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1849/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1849/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-camera-app-ci/6/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

This change was merged into staging and staging is proposed for release at https://code.launchpad.net/~phablet-team/camera-app/staging/+merge/311741

This MR can be closed

Revision history for this message
Florian Boucault (fboucault) wrote :

> This change was merged into staging and staging is proposed for release at
> https://code.launchpad.net/~phablet-team/camera-app/staging/+merge/311741
>
> This MR can be closed

Please ignore entirely this comment

Revision history for this message
Florian Boucault (fboucault) wrote :

This change was merged into staging and staging is proposed for release at
https://code.launchpad.net/~phablet-team/camera-app/staging/+merge/311748

This MR can be closed

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-22 17:27:05 +0000
3+++ debian/control 2016-11-19 21:43:18 +0000
4@@ -45,6 +45,7 @@
5 qtdeclarative5-ubuntu-content1,
6 qml-module-ubuntu-thumbnailer0.1,
7 qml-module-qtpositioning,
8+ qtdeclarative5-qtsensors-plugin,
9 qtdeclarative5-ubuntu-ui-extras0.2,
10 ${misc:Depends},
11 ${shlibs:Depends},
12
13=== added directory 'snap'
14=== renamed file 'camera.wrapper' => 'snap/camera.wrapper'
15--- camera.wrapper 2016-09-29 13:47:52 +0000
16+++ snap/camera.wrapper 2016-11-19 21:43:18 +0000
17@@ -1,5 +1,8 @@
18 #!/bin/sh
19
20+#FIXME: (ubuntu-app-platform) missing pulse path on LD_LIBRARY_PATH
21+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/ubuntu-app-platform/usr/lib/x86_64-linux-gnu/pulseaudio
22+
23 # FIXME: this is a workaround for XDG variables
24 # not being set adequately
25 # Ref.: https://bugs.launchpad.net/snappy/+bug/1577471
26@@ -27,4 +30,4 @@
27 mkdir -p $HOME/.config/
28 ln -s /home/$USER/.config/user-dirs.dirs $HOME/.config/user-dirs.dirs
29
30-exec "$SNAP/bin/desktop-launch" "camera-app" --desktop_file_hint=unity8 "$@"
31+exec "$SNAP/usr/bin/camera-app" --desktop_file_hint=unity8 "$@"
32
33=== added directory 'snap/ubuntu-app-platform'
34=== modified file 'snapcraft.yaml'
35--- snapcraft.yaml 2016-09-29 13:38:02 +0000
36+++ snapcraft.yaml 2016-11-19 21:43:18 +0000
37@@ -7,21 +7,23 @@
38
39 apps:
40 camera-app:
41- command: bin/camera.wrapper
42- plugs: [unity7, opengl, camera, pulseaudio, home]
43+ command: desktop-launch $SNAP/bin/camera.wrapper
44+ plugs: [unity7, opengl, camera, pulseaudio, home, platform]
45+
46+plugs:
47+ platform:
48+ interface: content
49+ content: ubuntu-app-platform1
50+ target: ubuntu-app-platform
51
52 parts:
53 wrapper:
54- source: .
55+ source: snap/
56 plugin: dump
57 organize:
58 camera.wrapper: bin/camera.wrapper
59- stage:
60- - bin/camera.wrapper
61- snap:
62- - bin/camera.wrapper
63
64- camera:
65+ camera-app:
66 source: .
67 plugin: cmake
68 configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
69@@ -37,14 +39,6 @@
70 - libusermetricsinput1-dev
71 - qtmultimedia5-dev
72 stage-packages:
73- - ubuntu-sdk-libs
74- - qtubuntu-desktop
75- - qml-module-qtpositioning
76- - qtdeclarative5-unity-action-plugin
77- - qtdeclarative5-usermetrics0.1
78- - qtdeclarative5-ubuntu-content1
79- - qtdeclarative5-ubuntu-ui-extras0.2
80- - qtdeclarative5-ubuntu-thumbnailer0.1
81 - xdg-user-dirs
82- - mir-graphics-drivers-desktop
83- after: [desktop-qt5]
84+ after:
85+ - desktop-ubuntu-app-platform

Subscribers

People subscribed via source and target branches