[vlc-devel] [PATCH] share: add desktop files to open BR/DVD/CDA/VCD

Jean-Baptiste Kempf jb at videolan.org
Thu Jan 25 17:51:08 CET 2018


make distcheck fails:

make[3]: Entering directory '/home/jb/VideoLAN/dev/vlc/build/vlc-4.0.0-dev/_build/sub/share'
  GEN      vlc.appdata.xml
  GEN      vlc.desktop
make[3]: *** No rule to make target 'vlc-openbd.desktop', needed by 'all-am'.  Stop.


On Thu, 25 Jan 2018, at 16:23, Mathieu Velten wrote:
> ---
>  share/Makefile.am            | 5 +++--
>  share/vlc-openbd.desktop.in  | 9 +++++++++
>  share/vlc-opencda.desktop.in | 9 +++++++++
>  share/vlc-opendvd.desktop.in | 9 +++++++++
>  share/vlc-openvcd.desktop.in | 9 +++++++++
>  share/vlc.desktop.mimetypes  | 4 ----
>  6 files changed, 39 insertions(+), 6 deletions(-)
>  create mode 100644 share/vlc-openbd.desktop.in
>  create mode 100644 share/vlc-opencda.desktop.in
>  create mode 100644 share/vlc-opendvd.desktop.in
>  create mode 100644 share/vlc-openvcd.desktop.in
> 
> diff --git a/share/Makefile.am b/share/Makefile.am
> index bf81792..8e0ebf5 100644
> --- a/share/Makefile.am
> +++ b/share/Makefile.am
> @@ -5,7 +5,7 @@ EXTRA_DIST =
>  desktopdir = $(datadir)/applications
>  if !HAVE_WIN32
>  if !HAVE_DARWIN
> -desktop_DATA = vlc.desktop
> +desktop_DATA = vlc.desktop vlc-openbd.desktop vlc-opendvd.desktop vlc-
> openvcd.desktop vlc-opencda.desktop
>  appdatadir = $(datarootdir)/metainfo
>  appdata_DATA = $(appdata_in_files:.xml.in=.xml)
>  appdata_in_files = vlc.appdata.xml.in
> @@ -13,9 +13,10 @@ endif
>  endif
>  
>  EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
> ++EXTRA_DIST += vlc-openbd.desktop.in vlc-opendvd.desktop.in vlc-
> openvcd.desktop.in vlc-opencda.desktop.in
>  CLEANFILES += $(desktop_DATA) $(appdata_DATA)
>  
> -vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
> +%.desktop: %.desktop.in $(top_builddir)/config.status
>  	$(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' $(srcdir)/
> vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; \
>  	sed \
>  		-e 's,\@bindir\@,$(bindir),g' \
> diff --git a/share/vlc-openbd.desktop.in b/share/vlc-openbd.desktop.in
> new file mode 100644
> index 0000000..386eb20
> --- /dev/null
> +++ b/share/vlc-openbd.desktop.in
> @@ -0,0 +1,9 @@
> +[Desktop Entry]
> +Version=1.0
> +Name=VLC media player (Blu-ray)
> +NoDisplay=true
> +Exec=@bindir@/vlc --started-from-file bluray://%f
> +Icon=vlc
> +Terminal=false
> +Type=Application
> +MimeType=x-content/video-bluray
> diff --git a/share/vlc-opencda.desktop.in b/share/vlc-opencda.desktop.in
> new file mode 100644
> index 0000000..503d5a8
> --- /dev/null
> +++ b/share/vlc-opencda.desktop.in
> @@ -0,0 +1,9 @@
> +[Desktop Entry]
> +Version=1.0
> +Name=VLC media player (Audio CD)
> +NoDisplay=true
> +Exec=@bindir@/vlc --started-from-file cdda://%f
> +Icon=vlc
> +Terminal=false
> +Type=Application
> +MimeType=x-content/audio-cdda
> diff --git a/share/vlc-opendvd.desktop.in b/share/vlc-opendvd.desktop.in
> new file mode 100644
> index 0000000..aadc44a
> --- /dev/null
> +++ b/share/vlc-opendvd.desktop.in
> @@ -0,0 +1,9 @@
> +[Desktop Entry]
> +Version=1.0
> +Name=VLC media player (DVD)
> +NoDisplay=true
> +Exec=@bindir@/vlc --started-from-file dvd://%f
> +Icon=vlc
> +Terminal=false
> +Type=Application
> +MimeType=x-content/video-dvd
> diff --git a/share/vlc-openvcd.desktop.in b/share/vlc-openvcd.desktop.in
> new file mode 100644
> index 0000000..c6dd894
> --- /dev/null
> +++ b/share/vlc-openvcd.desktop.in
> @@ -0,0 +1,9 @@
> +[Desktop Entry]
> +Version=1.0
> +Name=VLC media player (VCD)
> +NoDisplay=true
> +Exec=@bindir@/vlc --started-from-file vcd://%f
> +Icon=vlc
> +Terminal=false
> +Type=Application
> +MimeType=x-content/video-vcd;x-content/video-svcd
> diff --git a/share/vlc.desktop.mimetypes b/share/vlc.desktop.mimetypes
> index 0d866f7..d521c6c 100644
> --- a/share/vlc.desktop.mimetypes
> +++ b/share/vlc.desktop.mimetypes
> @@ -119,10 +119,6 @@ x-scheme-handler/icyx   # Icecast
>  
>  # Linux desktop environment hooks for ISOs etc.
>  application/x-cd-image
> -x-content/video-vcd
> -x-content/video-svcd
> -x-content/video-dvd
> -x-content/audio-cdda
>  x-content/audio-player
>  
>  # Playlists / text/xml list with URLs
> -- 
> 2.14.3
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel


-- 
Jean-Baptiste Kempf -  President
+33 672 704 734


More information about the vlc-devel mailing list