Fix missing start icon for the player in Linux.

diff --git a/ChangeLog b/ChangeLog
index ac082c90f23c464e3669353ef22006871388bc7e..2d8234e23448ad977022ca7b88fa052d072da4d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2018-04-11  Carl Hetherington  <cth@carlh.net>
+2018-04-06  Carl Hetherington  <cth@carlh.net>
+
+       * Fix missing start icon for the player in Linux.
 
        * Fix 3D DCP handling in the player.
 

diff --git a/cscript b/cscript
index 8a44977e0fe3bf58622f4201e3f8df8029f8abcb..b64c671c326bf4584cde6232f667e9c868460422 100644 (file)
--- a/cscript
+++ b/cscript
@@ -252,6 +252,7 @@ def make_spec(filename, version, target, requires=None):
     print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
     print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)

diff --git a/platform/linux/dcpomatic_player.desktop.in b/platform/linux/dcpomatic_player.desktop.in
new file mode 100644 (file)
index 0000000..2548e8c
--- /dev/null
+++ b/platform/linux/dcpomatic_player.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_player
+Name=DCP-o-matic 2 Player
+Icon=dcpomatic2_player
+Comment=DCP player
+Categories=AudioVideo;Video

diff --git a/platform/linux/wscript b/platform/linux/wscript
index 6e96f3f790097238a09cda36cc0773b821a5a001..01238fcf8b5ef02f8cfeeddfe0efb8f2ae0284c3 100644 (file)
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -23,4 +23,10 @@ def build(bld):
     obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
     obj.VERSION = bld.env.VERSION
 
-    bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop', 'dcpomatic2_kdm.desktop'])
+    obj = bld(features='subst')
+    obj.source = 'dcpomatic_player.desktop.in'
+    obj.target = 'dcpomatic2_player.desktop'
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
+
+    bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop', 'dcpomatic2_kdm.desktop', 'dcpomatic2_player.desktop'])