r24425 - in /desktop/unstable/totem/debian: changelog patches/80_webm.patch patches/81_mpegts.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Sat May 29 09:27:12 UTC 2010


Author: slomo
Date: Sat May 29 09:27:06 2010
New Revision: 24425

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24425
Log:
* debian/patches/80_webm.patch,
  debian/patches/81_mpegts.patch:
  + Patches from upstream GIT to add MPEG TS and WebM support in
    the browser plugin and to add the mimetypes to the list of
    supported mimetypes.

Added:
    desktop/unstable/totem/debian/patches/80_webm.patch
    desktop/unstable/totem/debian/patches/81_mpegts.patch
Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/patches/series

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=24425&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Sat May 29 09:27:06 2010
@@ -1,3 +1,13 @@
+totem (2.30.2-2) unstable; urgency=low
+
+  * debian/patches/80_webm.patch,
+    debian/patches/81_mpegts.patch:
+    + Patches from upstream GIT to add MPEG TS and WebM support in
+      the browser plugin and to add the mimetypes to the list of
+      supported mimetypes.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 29 May 2010 11:25:57 +0200
+
 totem (2.30.2-1) unstable; urgency=low
 
   * New upstream bugfix release:

Added: desktop/unstable/totem/debian/patches/80_webm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/80_webm.patch?rev=24425&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/80_webm.patch (added)
+++ desktop/unstable/totem/debian/patches/80_webm.patch [utf-8] Sat May 29 09:27:06 2010
@@ -1,0 +1,33 @@
+From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 20 May 2010 15:57:42 +0000
+Subject: Add WebM support to Totem and browser plugin
+
+---
+diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
+index 5382bb2..1c420f3 100644
+--- a/browser-plugin/totemPlugin.cpp
++++ b/browser-plugin/totemPlugin.cpp
+@@ -126,6 +126,7 @@ static const totemPluginMimeEntry kMimeTypes[] = {
+   { "audio/mpeg", "mp3", NULL },
+   { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
+   { "video/flv", "flv", "application/x-flash-video" },
++  { "video/webm", "webm", NULL },
+   { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
+   { "audio/midi", "mid, midi", NULL },
+ #else
+diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
+index 303bb23..a6eab04 100644
+--- a/data/mime-type-list.txt
++++ b/data/mime-type-list.txt
+@@ -82,6 +82,7 @@ video/vivo
+ video/vnd.divx
+ video/vnd.rn-realvideo
+ video/vnd.vivo
++video/webm
+ video/x-anim
+ video/x-avi
+ video/x-flc
+--
+cgit v0.8.3.1
+

Added: desktop/unstable/totem/debian/patches/81_mpegts.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/81_mpegts.patch?rev=24425&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/81_mpegts.patch (added)
+++ desktop/unstable/totem/debian/patches/81_mpegts.patch [utf-8] Sat May 29 09:27:06 2010
@@ -1,0 +1,22 @@
+From 046920a4b1a1e4b085e1faded57d47e45492d368 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Sat, 22 May 2010 11:54:18 +0000
+Subject: Add support for video/mp2t
+
+https://bugzilla.gnome.org/show_bug.cgi?id=614422
+---
+diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
+index a6eab04..8cf04e9 100644
+--- a/data/mime-type-list.txt
++++ b/data/mime-type-list.txt
+@@ -72,6 +72,7 @@ video/3gpp
+ video/dv
+ video/fli
+ video/flv
++video/mp2t
+ video/mp4
+ video/mp4v-es
+ video/mpeg
+--
+cgit v0.8.3.1
+

Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=24425&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series [utf-8] Sat May 29 09:27:06 2010
@@ -1,3 +1,5 @@
 01_fake_keypresses.patch
 70_bbc_plugin.patch
+80_webm.patch
+81_mpegts.patch
 90_autotools.patch




More information about the pkg-gnome-commits mailing list