# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1170600205 0
# Node ID 87a6ee86fc832770d759cda9d5107555241eaa91
# Parent bced04006cac67e2d2eb2eaea22ad8a1833976bf
Get the MIME types for the desktop file from xine-lib (if possible).
A default set, generated from my build of 1.1.4, is provided as a fallback.
gxine.desktop.in has no final LF.
diff -r 87a6ee86fc832770d759cda9d5107555241eaa91 -r
bced04006cac67e2d2eb2eaea22ad8a1833976bf .hgignore
--- a/.hgignore Sun Feb 04 14:43:25 2007 +0000
+++ b/.hgignore Sat Feb 03 21:03:34 2007 +0000
@@ -13,6 +13,7 @@
^config\.(guess|log|status|sub)$
^configure$
^depcomp$
+^gxine\.desktop$
^include/config\.h(\.in|)$
^include/version\.h$
^include/stamp-h1$
diff -r 87a6ee86fc832770d759cda9d5107555241eaa91 -r
bced04006cac67e2d2eb2eaea22ad8a1833976bf Makefile.am
--- a/Makefile.am Sun Feb 04 14:43:25 2007 +0000
+++ b/Makefile.am Sat Feb 03 21:03:34 2007 +0000
@@ -6,6 +6,9 @@ EXTRA_DIST = config.rpath gxine.desktop
Applicationsdir = $(datadir)/applications
Applications_DATA = gxine.desktop
+
+BUILT_SOURCES = gxine.desktop
+CLEANFILES = $(BUILT_SOURCES)
debug:
@list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -54,4 +57,12 @@ translator: dist-pre
$(MAKE) -C $(top_builddir)/po update-po
$(MAKE) -C $(top_builddir)/misc/po update-po
+XINE_MIME = $(shell $(XINE_CONFIG) --plugindir)/mime.types
+MIME = $(if $(shell test -f $(XINE_MIME) && echo
y),$(XINE_MIME),$(srcdir)/mime.default)
+
+gxine.desktop: gxine.desktop.in $(MIME)
+ exec > $@; \
+ cat $<; \
+ awk 'BEGIN { s = "%s" } { printf s, $$1; s = ";%s" } END { print }'
<$(MIME)
+
ACLOCAL_AMFLAGS = -I m4
diff -r 87a6ee86fc832770d759cda9d5107555241eaa91 -r
bced04006cac67e2d2eb2eaea22ad8a1833976bf gxine.desktop
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/gxine.desktop Sat Feb 03 21:03:34 2007 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=gxine
+GenericName=Video Player
+Comment=Watch videos or TV and listen to audio in a variety of formats
+Exec=gxine
+X-MultipleArgs=true
+Icon=gxine
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=AudioVideo;GTK;Player;TV;
+MimeType=video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-ogg;application/ogg;audio/x-mp3;audio/x-mpeg;video/x-mpeg;video/x-fli;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-ms-asx;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;audio/mpeg;audio/x-ms-asf;audio/x-m4a;audio/x-ms-wax;video/dv;video/x-anim;video/x-flc;misc/ultravox;application/x-matroska;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;video/vnd.rn-realvideo
diff -r 87a6ee86fc832770d759cda9d5107555241eaa91 -r
bced04006cac67e2d2eb2eaea22ad8a1833976bf gxine.desktop.in
--- a/gxine.desktop.in Sun Feb 04 14:43:25 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=gxine
-GenericName=Video Player
-Comment=Watch videos or TV and listen to audio in a variety of formats
-Exec=gxine
-X-MultipleArgs=true
-Icon=gxine
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=AudioVideo;GTK;Player;TV;
-MimeType=
\ No newline at end of file
diff -r 87a6ee86fc832770d759cda9d5107555241eaa91 -r
bced04006cac67e2d2eb2eaea22ad8a1833976bf mime.default
--- a/mime.default Sun Feb 04 14:43:25 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-application/ogg
-application/vnd.ms-asf
-application/vnd.rn-realmedia
-application/x-annodex
-application/x-mplayer2
-application/x-ogg
-application/x-quicktimeplayer
-audio/168sv
-audio/8svx
-audio/aiff
-audio/basic
-audio/mp3
-audio/mpeg
-audio/mpeg2
-audio/mpeg3
-audio/mpegurl
-audio/wav
-audio/x-16sv
-audio/x-8svx
-audio/x-aiff
-audio/x-basic
-audio/x-m4a
-audio/x-mp3
-audio/x-mpeg
-audio/x-mpeg2
-audio/x-mpeg3
-audio/x-mpegurl
-audio/x-ms-wma
-audio/x-ogg
-audio/x-pn-aiff
-audio/x-pn-au
-audio/x-pn-realaudio
-audio/x-pn-realaudio-plugin
-audio/x-pn-wav
-audio/x-pn-windows-acm
-audio/x-real-audio
-audio/x-realaudio
-audio/x-speex
-audio/x-wav
-image/ilbm
-image/png
-image/x-ilbm
-image/x-png
-video/anim
-video/mkv
-video/mng
-video/mpeg
-video/msvideo
-video/quicktime
-video/x-anim
-video/x-flic
-video/x-flv
-video/x-mng
-video/x-mpeg
-video/x-ms-asf
-video/x-ms-asf-plugin
-video/x-ms-wax
-video/x-ms-wmv
-video/x-ms-wvx
-video/x-msvideo
-video/x-quicktime
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
