[vlc-devel] [PATCH] share: add desktop files to open BR/DVD/CDA/VCD
Jean-Baptiste Kempf
jb at videolan.org
Wed Jan 24 07:52:58 CET 2018
On Wed, 24 Jan 2018, at 00:04, Mathieu Velten wrote:
> However you are right it doesn't work in KDE, I wrongly assumed it
> would do the same since it seems to be a freedesktop standard, I just
> tested and it doesn't.
Repeat after me: "freedesktop is not a standard".
The days where it was cross-desktop are long gone.
Best,
>
> I'll remove this part, thanks for the review.
>>
>>
>>> For the mimes I removed the disc corresponding ones so only the good
>>> VLC entry get returned for those mime types.>>
>> Why not.
>>
>>>
>>> Le mar. 23 janv. 2018 à 17:52, Jean-Baptiste Kempf <jb at videolan.org>
>>> a écrit :>>>> Sorry, but the removal of the SOLID support and the removal from
>>>> .mimetypes mandates a bit more explanation.>>>>
>>>> On Tue, 23 Jan 2018, at 17:48, Mathieu Velten wrote:
>>>> > ---
>>>> > configure.ac | 32 -------------------------------->>>> > share/Makefile.am | 16 ++++------------
>>>> > share/solid/vlc-openbd.desktop | 9 ---------
>>>> > share/solid/vlc-opencda.desktop | 10 ----------
>>>> > share/solid/vlc-opendvd.desktop | 10 ----------
>>>> > share/solid/vlc-openvcd.desktop | 10 ----------
>>>> > 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 ----
>>>> > 11 files changed, 40 insertions(+), 87 deletions(-)
>>>> > delete mode 100644 share/solid/vlc-openbd.desktop
>>>> > delete mode 100644 share/solid/vlc-opencda.desktop
>>>> > delete mode 100644 share/solid/vlc-opendvd.desktop
>>>> > delete mode 100644 share/solid/vlc-openvcd.desktop
>>>> > 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/configure.ac b/configure.ac
>>>> > index 11e8460..c28f635 100644
>>>> > --- a/configure.ac
>>>> > +++ b/configure.ac
>>>> > @@ -3710,14 +3710,6 @@ AC_SUBST(QT_VERSION)
>>>> > AM_CONDITIONAL(ENABLE_QT, [test "$enable_qt" != "no"])
>>>> > AM_CONDITIONAL([HAVE_QT5_X11], [test "${have_qt5_x11}" = "yes"])>>>> >
>>>> > -dnl
>>>> > -dnl detect kde4-config patch (used for kde solids).
>>>> > -dnl
>>>> > -AC_ARG_VAR([KDE4_CONFIG], [kde4-config utility])
>>>> > -AS_IF([test "x$KDE4_CONFIG" = "x"], [
>>>> > - KDE4_CONFIG="kde4-config"
>>>> > -])
>>>> > -
>>>> > dnl
>>>> > dnl Simple test for skins2 dependency
>>>> > dnl
>>>> > @@ -4157,30 +4149,6 @@ AS_IF([test "${ac_cv_c_bigendian}" =
>>>> > "yes"], [>>>> > ])
>>>> > AC_SUBST(DEFS_BIGENDIAN)
>>>> >
>>>> > -dnl
>>>> > -dnl Where to install KDE solid .desktop
>>>> > -dnl
>>>> > -AC_ARG_WITH(kde-solid,
>>>> > - AS_HELP_STRING([--with-kde-solid=PATH],
>>>> > - [KDE Solid actions directory (auto)]),, [
>>>> > -
>>>> > -if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then
>>>> > - with_kde_solid="yes"
>>>> > -fi
>>>> > -])
>>>> > -soliddatadir=""
>>>> > -AS_IF([test "${with_kde_solid}" != "no"], [
>>>> > - AS_IF([test "${with_kde_solid}" = "yes"], [
>>>> > - kde4datadir="`${KDE4_CONFIG} --install data`"
>>>> > - AS_IF([test "x$kde4datadir" = "x"],
>>>> > [kde4datadir='${datadir}/kde4/>>>> > apps'])
>>>> > - soliddatadir="${kde4datadir}/solid/actions"
>>>> > - ], [
>>>> > - soliddatadir="${with_kde_solid}"
>>>> > - ])
>>>> > -])
>>>> > -AC_SUBST(soliddatadir)
>>>> > -AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"])
>>>> > -
>>>> > dnl
>>>> > dnl Check wether we have the
>>>> > PROCESS_MITIGATION_IMAGE_LOAD_POLICY>>>> > dnl It should only be available when building for win10, but
>>>> > some SDKs>>>> > define it unconditionnaly
>>>> > diff --git a/share/Makefile.am b/share/Makefile.am
>>>> > index bf81792..b81e2eb 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' \
>>>> > @@ -52,8 +53,7 @@ endif
>>>> > EXTRA_DIST += \
>>>> > $(skins2_default_vlt_FILES) \
>>>> > $(DIST_icons) \
>>>> > - $(DIST_http_lua) \
>>>> > - $(DIST_solid)
>>>> > + $(DIST_http_lua)
>>>> >
>>>> > nobase_vlcdata_DATA =
>>>> > nobase_dist_vlcdata_DATA =
>>>> > @@ -61,9 +61,6 @@ if BUILD_SKINS
>>>> > nobase_vlcdata_DATA += skins2/default.vlt
>>>> > nobase_dist_vlcdata_DATA += $(DIST_skins2)
>>>> > endif
>>>> > -if KDE_SOLID
>>>> > -soliddata_DATA = $(DIST_solid)
>>>> > -endif
>>>> >
>>>> > DIST_icons = \
>>>> > vlc512x512.png
>>>> > @@ -299,8 +296,3 @@ EXTRA_DIST += \
>>>> > lua/sd/icecast.lua \
>>>> > lua/sd/icast.lua \
>>>> > lua/sd/jamendo.lua
>>>> > -DIST_solid = \
>>>> > - solid/vlc-openbd.desktop \
>>>> > - solid/vlc-opencda.desktop \
>>>> > - solid/vlc-opendvd.desktop \
>>>> > - solid/vlc-openvcd.desktop
>>>> > diff --git a/share/solid/vlc-openbd.desktop b/share/solid/vlc-
>>>> > openbd.desktop
>>>> > deleted file mode 100644
>>>> > index 8522d8c..0000000
>>>> > --- a/share/solid/vlc-openbd.desktop
>>>> > +++ /dev/null
>>>> > @@ -1,9 +0,0 @@
>>>> > -[Desktop Entry]
>>>> > -X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND
>>>> > OpticalDisc.availableContent & 'VideoBluRay' ]
>>>> > -Type=Service
>>>> > -Actions=open;
>>>> > -
>>>> > -[Desktop Action open]
>>>> > -Name=Open with VLC media player
>>>> > -Exec=vlc bluray://%d
>>>> > -Icon=vlc
>>>> > diff --git a/share/solid/vlc-opencda.desktop b/share/solid/vlc-
>>>> > opencda.desktop
>>>> > deleted file mode 100644
>>>> > index 866e85f..0000000
>>>> > --- a/share/solid/vlc-opencda.desktop
>>>> > +++ /dev/null
>>>> > @@ -1,10 +0,0 @@
>>>> > -[Desktop Entry]
>>>> > -X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND
>>>> > OpticalDisc.availableContent & 'Audio' ]
>>>> > -Type=Service
>>>> > -Actions=open;
>>>> > -
>>>> > -[Desktop Action open]
>>>> > -Name=Open with VLC media player
>>>> > -Exec=vlc cdda://%d
>>>> > -Icon=vlc
>>>> > -
>>>> > diff --git a/share/solid/vlc-opendvd.desktop b/share/solid/vlc-
>>>> > opendvd.desktop
>>>> > deleted file mode 100644
>>>> > index eae868e..0000000
>>>> > --- a/share/solid/vlc-opendvd.desktop
>>>> > +++ /dev/null
>>>> > @@ -1,10 +0,0 @@
>>>> > -[Desktop Entry]
>>>> > -X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND
>>>> > OpticalDisc.availableContent & 'VideoDvd' ]
>>>> > -Type=Service
>>>> > -Actions=open;
>>>> > -
>>>> > -[Desktop Action open]
>>>> > -Name=Open with VLC media player
>>>> > -Exec=vlc dvd://%d
>>>> > -Icon=vlc
>>>> > -
>>>> > diff --git a/share/solid/vlc-openvcd.desktop b/share/solid/vlc-
>>>> > openvcd.desktop
>>>> > deleted file mode 100644
>>>> > index b612107..0000000
>>>> > --- a/share/solid/vlc-openvcd.desktop
>>>> > +++ /dev/null
>>>> > @@ -1,10 +0,0 @@
>>>> > -[Desktop Entry]
>>>> > -X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND
>>>> > OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
>>>> > -Type=Service
>>>> > -Actions=open;
>>>> > -
>>>> > -[Desktop Action open]
>>>> > -Name=Open with VLC media player
>>>> > -Exec=vlc vcd://%d
>>>> > -Icon=vlc
>>>> > -
>>>> > diff --git a/share/vlc-openbd.desktop.in b/share/vlc-
>>>> > openbd.desktop.in>>>> > new file mode 100644
>>>> > index 0000000..d105324
>>>> > --- /dev/null
>>>> > +++ b/share/vlc-openbd.desktop.in
>>>> > @@ -0,0 +1,9 @@
>>>> > +[Desktop Entry]
>>>> > +Version=1.0
>>>> > +Name=Open Blu-ray with VLC media player
>>>> > +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..79bd0c5
>>>> > --- /dev/null
>>>> > +++ b/share/vlc-opencda.desktop.in
>>>> > @@ -0,0 +1,9 @@
>>>> > +[Desktop Entry]
>>>> > +Version=1.0
>>>> > +Name=Open Audio CD with VLC media player
>>>> > +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..af03b9d
>>>> > --- /dev/null
>>>> > +++ b/share/vlc-opendvd.desktop.in
>>>> > @@ -0,0 +1,9 @@
>>>> > +[Desktop Entry]
>>>> > +Version=1.0
>>>> > +Name=Open DVD with VLC media player
>>>> > +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..718f980
>>>> > --- /dev/null
>>>> > +++ b/share/vlc-openvcd.desktop.in
>>>> > @@ -0,0 +1,9 @@
>>>> > +[Desktop Entry]
>>>> > +Version=1.0
>>>> > +Name=Open VCD with VLC media player
>>>> > +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
>>
>> --
>> Jean-Baptiste Kempf - President
>> +33 672 704 734
>>
>>
>>
--
Jean-Baptiste Kempf - President
+33 672 704 734
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20180124/71711f02/attachment.html>
More information about the vlc-devel
mailing list