Merge lp:~phablet-team/mediaplayer-app/snap-it-up into lp:mediaplayer-app

Proposed by Jim Hodapp on 2016-09-06
Status: Merged
Approved by: Arthur Mello on 2016-09-09
Approved revision: 424
Merged at revision: 421
Proposed branch: lp:~phablet-team/mediaplayer-app/snap-it-up
Merge into: lp:mediaplayer-app
Diff against target: 102 lines (+93/-0)
2 files modified
mediaplayer-app.wrapper (+23/-0)
snapcraft.yaml (+70/-0)
To merge this branch: bzr merge lp:~phablet-team/mediaplayer-app/snap-it-up
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve on 2016-09-09
Scott Sweeny (community) 2016-09-06 Approve on 2016-09-08
Review via email: mp+305045@code.launchpad.net

Commit Message

Initial snapping up of mediaplayer-app.

Description of the Change

Initial snapping up of mediaplayer-app.

To post a comment you must log in.
420. By Jim Hodapp on 2016-09-07

Add Snappy package revision number

Scott Sweeny (ssweeny) wrote :

Have you looked at what the snap contains and whether you can pare it down at all?

review: Needs Information
Jim Hodapp (jhodapp) wrote :

I haven't explicitly yet but I plan on doing that this afternoon on the media-hub one and this one.

Scott Sweeny (ssweeny) wrote :

`snapcraft cleanbuild` fails with:

cmake /root/parts/mediaplayer-app/src -DCMAKE_INSTALL_PREFIX= -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_LIBRARY_PATH=/usr/lib
-- The C compiler identification is unknown
-- The CXX compiler identification is unknown
CMake Error at CMakeLists.txt:1 (project):
  No CMAKE_C_COMPILER could be found.

  Tell CMake where to find the compiler by setting either the environment
  variable "CC" or the CMake cache entry CMAKE_C_COMPILER to the full path to
  the compiler, or to the compiler name if it is in the PATH.

CMake Error at CMakeLists.txt:1 (project):
  No CMAKE_CXX_COMPILER could be found.

  Tell CMake where to find the compiler by setting either the environment
  variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
  to the compiler, or to the compiler name if it is in the PATH.

-- Configuring incomplete, errors occurred!
See also "/root/parts/mediaplayer-app/build/CMakeFiles/CMakeOutput.log".
See also "/root/parts/mediaplayer-app/build/CMakeFiles/CMakeError.log".
Command '['/bin/sh', '/tmp/tmp0xjubywb', 'cmake', '/root/parts/mediaplayer-app/src', '-DCMAKE_INSTALL_PREFIX=', '-DCMAKE_INSTALL_PREFIX:PATH=/usr', '-DCMAKE_LIBRARY_PATH=/usr/lib']' returned non-zero exit status 1
Command '['lxc', 'exec', 'snapcraft-slowly-happy-sponge', '--', 'snapcraft', 'snap', '--output', 'mediaplayer-app_0.20.5-1_amd64.snap']' returned non-zero exit status 1

I've solved this in my snaps by adding `build-essential` to `build-packages` but you could probably get away with just explicitly adding g++ or equivalent.

review: Needs Fixing
421. By Jim Hodapp on 2016-09-07

Make sure to pass snapcraft cleanbuild

Jim Hodapp (jhodapp) wrote :

Ok fixed this and it cleanly builds on Launchpad now.

Scott Sweeny (ssweeny) wrote :

This builds cleanly for me now too.

The resulting snap is 60MB on amd64 and a quick poke inside shows plenty of potential for cleanup :)

review: Needs Fixing
422. By Jim Hodapp on 2016-09-08

Shrink the size of the resulting snap package

423. By Jim Hodapp on 2016-09-08

Make sure the copyright file gets put in place

424. By Jim Hodapp on 2016-09-08

Shrink down the package even further

Scott Sweeny (ssweeny) wrote :

This is a pretty good start.

review: Approve
Arthur Mello (artmello) wrote :

lgtm

review: Approve
425. By Jim Hodapp on 2016-09-22

Merge with upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'mediaplayer-app.wrapper'
2--- mediaplayer-app.wrapper 1970-01-01 00:00:00 +0000
3+++ mediaplayer-app.wrapper 2016-09-22 17:42:37 +0000
4@@ -0,0 +1,23 @@
5+#!/bin/bash
6+
7+if [ "$SNAP_ARCH" == "amd64" ]; then
8+ ARCH="x86_64-linux-gnu"
9+elif [ "$SNAP_ARCH" == "armhf" ]; then
10+ ARCH="arm-linux-gnueabihf"
11+else
12+ ARCH="$SNAP_ARCH-linux-gnu"
13+fi
14+
15+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH:$LD_LIBRARY_PATH
16+
17+# Qt Libs
18+export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/qt5/libs:$LD_LIBRARY_PATH
19+
20+# Qt Modules
21+export QT_PLUGIN_PATH=$SNAP/usr/lib/$ARCH/qt5/plugins
22+export QML2IMPORT_PATH=$SNAP/usr/share/mediaplayer-app/qml/
23+export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$SNAP/usr/lib/$ARCH/qt5/qml/
24+
25+echo QT_PLUGIN_PATH=$QT_PLUGIN_PATH
26+
27+exec "$SNAP/usr/bin/mediaplayer-app" "$@"
28
29=== added file 'snapcraft.yaml'
30--- snapcraft.yaml 1970-01-01 00:00:00 +0000
31+++ snapcraft.yaml 2016-09-22 17:42:37 +0000
32@@ -0,0 +1,70 @@
33+name: mediaplayer-app
34+version: 0.20.5-1
35+summary: QML-based media player
36+description: |
37+ A QML media player that can play audio/video sources.
38+ Please find the source at:
39+ https://code.launchpad.net/mediaplayer-app
40+confinement: strict
41+
42+apps:
43+ mediaplayer-app:
44+ command: usr/bin/mediaplayer-app
45+ plugs: [mpris]
46+
47+parts:
48+ mediaplayer-app:
49+ plugin: cmake
50+ source: .
51+
52+ build-packages:
53+ - build-essential
54+ - debhelper
55+ - dh-translations
56+ - libgl1-mesa-dev
57+ - pkg-config
58+ - python3
59+ - qtbase5-dev
60+ - qtdeclarative5-dev
61+ - qtmultimedia5-dev
62+
63+ configflags:
64+ - -DCMAKE_INSTALL_PREFIX:PATH=/usr
65+ - -DCMAKE_LIBRARY_PATH=/usr/lib
66+
67+ stage-packages:
68+ - qtubuntu-media
69+ - qtdeclarative5-ubuntu-content1
70+
71+ filesets:
72+ unwanted:
73+ # Files that we don't want/need in the final snap package
74+ - -etc
75+ - -usr/lib/debug
76+ - -usr/lib/*/libclick*
77+ - -usr/lib/*/libhybris*
78+ - -usr/lib/*/libogg*
79+ - -usr/lib/*/libpulse*
80+ - -usr/lib/python*
81+ - -usr/share/apport
82+ - -usr/share/bug
83+ - -usr/share/doc
84+ - -usr/share/fonts
85+ - -usr/share/libwacom
86+ - -usr/share/lintian
87+ - -usr/share/man
88+ - -usr/share/X11
89+ - -usr/lib/*.a
90+ - -usr/lib/*/*.a
91+ - -usr/lib/*.la
92+ - -usr/lib/*/*.la
93+ - -usr/lib/*/*.o
94+
95+ snap:
96+ - $unwanted
97+
98+ environment:
99+ plugin: copy
100+ files:
101+ mediaplayer-app.wrapper: bin/mediaplayer-app
102+ debian/copyright: usr/share/doc/mediaplayer-app/copyright

Subscribers

People subscribed via source and target branches

to all changes: