mc/mc-extd-video.patch
Brian White b575a4c142 Accepting request 666258 from home:adamm:branches:Base:System
- update to 4.8.22
 * Core
  - Support BTRFS's file clone operation
  - Find file: show pattern and content in the results window title
  - Find file: remember state (empty or not) of Content field
  - Improve support IBM i
  - Improve handling of hard link creation errors
  - Support user-defined prompt in the Fish subshell
 * VFS - sftp: preserve atime and mtime (#3917)
 * Editor
  - man page cleanup (#3918)
  - syntax:
        PHP - highlight keyword 'null' (#3920)
        Meson - initial implementation (#3940)
 * Misc
  - ext.d: use MPV as a fallback for mplayer -identify (#3919)
  - ext.d: improve recognition of MS Office formats (#3929)
 * Fixes
  - "Cannot create target file" when target has backslash space
    in the name (#3923)
  - Quiet single file overwrite (#3908)
  - Show error message for each not-installed program when view
    documents in MS Word and Excel formats (#3926)
  - Crash when trying some sftp connections (#3937)
  - Crash when return to filemanager from subshell (#3943)
- mc-extd-doc.patch: refreshed
- mc-extd-video.patch: refreshed
- mc-vfs-fish-deleted_source_file.patch: refreshed
- xls2csv_update.patch: refreshed

OBS-URL: https://build.opensuse.org/request/show/666258
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=124
2019-01-16 01:08:34 +00:00

35 lines
977 B
Diff

Index: misc/ext.d/video.sh
===================================================================
--- misc/ext.d/video.sh.orig
+++ misc/ext.d/video.sh
@@ -6,14 +6,27 @@
action=$1
filetype=$2
-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
+[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
+
+_xdg_open()
+{
+ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
+ gmplayer "${MC_EXT_FILENAME}"
+ elif type -p mplayer ; then
+ mplayer "${MC_EXT_FILENAME}"
+ else
+ xdg-open "${MC_EXT_FILENAME}"
+ fi
+}
do_view_action() {
filetype=$1
case "${filetype}" in
*)
- if mplayer >/dev/null 2>&1; then
+ if type -p mediainfo >/dev/null 2>&1 ; then
+ mediainfo "${MC_EXT_FILENAME}"
+ elif mplayer >/dev/null 2>&1; then
mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \
sed -n 's/^ID_//p'
elif which mpv_identify.sh >/dev/null 2>&1; then