[SCM] vlc/master: Upstream patch for auto-generated list of mime types
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Wed Jun 1 20:21:54 UTC 2016
The following commit has been merged in the master branch:
commit 01a1231cb12c21fec4331cf9c69a5422abc0d336
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Jun 1 22:05:39 2016 +0200
Upstream patch for auto-generated list of mime types
Closes: #822245
diff --git a/debian/patches/generated-mimetypes.patch b/debian/patches/generated-mimetypes.patch
new file mode 100644
index 0000000..b37b63e
--- /dev/null
+++ b/debian/patches/generated-mimetypes.patch
@@ -0,0 +1,266 @@
+Description: Use generated list of mimetypes
+Bug-Debian: https://bugs.debian.org/822245
+Origin: upstream,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=d4f1aaf5e405fbb08887bc864cb5a55f18c8ed31,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=d1888eacf1a65ab6d918b9eb01bac12acfded778,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=646d30b9cbef5bed935c156321c55799204ab340,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=cdd774d634463b7ce29a8acb4b4cc0266df2d464,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=b4f4d2f07074c91b15db3e15407dde23489f56c0,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=1cb6ce6cd2eb2c56e59d1e42c291b35e273b44d3,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=5ac90685619740ab1c03f582c77690a4e2f8de41,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=7e10b25219fb889e1f91cda73ed7e858fda940a5
+Last-Update: 2016-06-01
+
+--- vlc-2.2.4.orig/share/Makefile.am
++++ vlc-2.2.4/share/Makefile.am
+@@ -6,11 +6,12 @@ appdatadir = $(datadir)/applications
+ if !HAVE_WIN32
+ appdata_DATA = vlc.desktop
+ endif
+-EXTRA_DIST += vlc.desktop.in
++EXTRA_DIST += vlc.desktop.in vlc.desktop.mimetypes
+ CLEANFILES += $(appdata_DATA)
+
+ vlc.desktop: vlc.desktop.in $(top_builddir)/config.status
+ $(AM_V_GEN)sed -e 's,\@bindir\@,$(bindir),g' < "$<" > tmp-$@
++ $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; sed -ie "s,\@MIMETYPES\@,$$mimetypes,g" tmp-$@
+ $(AM_V_at)$(DESKTOP_FILE_VALIDATE) tmp-$@
+ $(AM_V_at)mv -f tmp-$@ $@
+
+--- vlc-2.2.4.orig/share/vlc.desktop.in
++++ vlc-2.2.4/share/vlc.desktop.in
+@@ -88,6 +88,6 @@ Icon=vlc
+ Terminal=false
+ Type=Application
+ Categories=AudioVideo;Player;Recorder;
+-MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;audio/ogg;video/ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;video/vnd.mpegurl;
++MimeType=@MIMETYPES@
+ X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+ Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;
+--- /dev/null
++++ vlc-2.2.4/share/vlc.desktop.mimetypes
+@@ -0,0 +1,224 @@
++# List of MIME types to announce in the desktop file, to let desktop
++# environments and browsers know which file types to pass on to VLC.
++
++# Ogg Vorbis and Theora (Xiph family)
++application/ogg # IANA-registered
++application/x-ogg
++audio/ogg # IANA-registered
++audio/x-vorbis
++audio/x-vorbis+ogg
++video/ogg # IANA-registered
++video/x-ogm+ogg
++video/x-theora+ogg
++video/x-theora
++audio/x-speex
++audio/opus # IANA-registered
++
++# FLAC lossless audio
++application/x-flac
++audio/flac
++audio/x-flac
++
++# Microsoft audio and video
++# ASF
++audio/x-ms-asf
++audio/x-ms-asx
++audio/x-ms-wax
++audio/x-ms-wma
++video/x-ms-asf
++video/x-ms-asf-plugin
++video/x-ms-asx
++video/x-ms-wm
++video/x-ms-wmv
++video/x-ms-wmx
++video/x-ms-wvx
++# AVI et al.
++video/x-msvideo
++audio/x-pn-windows-acm
++video/divx
++video/msvideo
++video/vnd.divx
++video/x-avi
++
++# Real audio and video
++application/vnd.rn-realmedia # RM
++application/vnd.rn-realmedia-vbr # RMVB
++audio/vnd.rn-realaudio
++audio/x-pn-realaudio
++audio/x-pn-realaudio-plugin
++audio/x-real-audio
++audio/x-realaudio
++video/vnd.rn-realvideo
++
++# MPEG related audio, video and transport
++# MPEG-2
++audio/mpeg # IANA-registered
++audio/mpg # IANA-registered
++audio/mp1
++audio/mp2
++audio/mp3
++audio/x-mp1
++audio/x-mp2
++audio/x-mp3
++audio/x-mpeg
++audio/x-mpg
++video/mp2t # TS
++video/mpeg
++video/mpeg-system
++video/x-mpeg
++video/x-mpeg2
++video/x-mpeg-system
++# MP4
++application/mpeg4-iod # IANA-registered
++application/mpeg4-muxcodetable
++application/x-extension-m4a
++application/x-extension-mp4
++audio/aac
++audio/m4a
++audio/mp4 # IANA-registered
++audio/x-m4a
++audio/x-aac
++video/mp4 # IANA-registered
++video/mp4v-es
++video/x-m4v
++
++# Apple QuickTime (MOV)
++application/x-quicktime-media-link
++application/x-quicktimeplayer
++video/quicktime # IANA-registered
++
++# Matroska container format
++application/x-matroska
++audio/x-matroska
++video/x-matroska
++
++# WebM (Matroska + Vorbis/Opus + VP8/9)
++video/webm
++audio/webm
++
++# 3GPP related
++audio/3gpp # IANA-registered
++audio/3gpp2 # IANA-registered
++audio/AMR # IANA-registered
++audio/AMR-WB # IANA-registered
++audio/amr
++audio/amr-wb
++video/3gp
++video/3gpp
++video/3gpp2
++
++# URI scheme handlers (ie IP protocol support)
++x-scheme-handler/mms # MMS
++x-scheme-handler/mmsh # MMS over HTTP
++x-scheme-handler/rtsp # RSTP
++x-scheme-handler/rtp
++x-scheme-handler/rtmp
++x-scheme-handler/icy # Icecast
++x-scheme-handler/icyx # Icecast
++
++# Linux desktop environment hooks for ISOs etc.
++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
++application/ram # Realaudio Metadata
++application/xspf+xml
++audio/mpegurl
++audio/x-mpegurl
++audio/scpls
++audio/x-scpls
++text/google-video-pointer
++text/x-google-video-pointer
++video/vnd.mpegurl # IANA-registered
++application/vnd.apple.mpegurl # HLS / M3U8
++application/vnd.ms-asf # ZPL/WVX
++application/vnd.ms-wpl # WPL
++application/sdp # SDP for RT*P
++
++# Digital Video
++audio/dv # IANA-registered
++video/dv # IANA-registered
++
++# IFF related formats
++audio/x-aiff
++audio/x-pn-aiff
++video/x-anim
++
++# NullSoft video
++video/x-nsv
++
++# Autodesk animation format
++video/fli
++video/flv
++video/x-flc
++video/x-fli
++video/x-flv
++
++# Audio sample formats
++audio/wav
++audio/x-pn-au
++audio/x-pn-wav
++audio/x-wav
++
++# Raw audio
++audio/ac3 # IANA AC3
++audio/eac3 # IANA E-AC3
++audio/vnd.dts # IANA DTS Audio
++audio/vnd.dts.hd # IANA DTS-HD
++audio/vnd.dolby.heaac.1 # IANA Dolby HeAAC
++audio/vnd.dolby.heaac.2 # IANA Dolby HeAAC
++audio/vnd.dolby.mlp # IANA MLP/TrueHD
++audio/basic # IANA mulaw
++audio/midi
++# Weird audio formats
++audio/x-ape
++audio/x-gsm
++audio/x-musepack
++audio/x-tta
++audio/x-wavpack
++audio/x-shorten
++
++# Adobe Flash player related
++application/x-shockwave-flash
++application/x-flash-video
++
++# SHOUTcast 2
++misc/ultravox
++
++# RealPix
++image/vnd.rn-realpix
++
++# Modplug / GME
++audio/x-it
++audio/x-mod
++audio/x-s3m
++audio/x-xm
++
++# From the totem desktop file in Debian. These need more work.
++application/mxf # IANA-registered
++#application/smil # IANA-registered
++#application/smil+xml # IANA-registered
++#application/x-netshow-channel
++#application/x-shorten
++#application/x-smil
++#audio/prs.sid # IANA-registered
++#audio/x-sbc
++#audio/x-stm
++#image/x-pict
++#video/vivo
++#video/vnd.vivo # IANA-registered
++#video/x-flic
++#video/x-totem-stream
++#x-scheme-handler/net
++#x-scheme-handler/pnm
++#x-scheme-handler/uvox
++#
++#application/streamingmedia
++#application/x-streamingmedia
++#audio/rn-mpeg
++#audio/x-pn-windows-pcm
++#video/x-ms-afs
++#video/x-ms-wvxvideo
diff --git a/debian/patches/series b/debian/patches/series
index c804643..2877bd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
fix-translation.patch
drop-check-qt-check.patch
+generated-mimetypes.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list