Version bump and fix bug #324237

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 91 insertions, 0 deletions

diff --git a/media-video/totem/files/totem-2.30.2-init-gtype.patch b/media-video/totem/files/totem-2.30.2-init-gtype.patch
new file mode 100644
index 000000000000..18e73dc2465c
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-init-gtype.patch
@@ -0,0 +1,38 @@
+From dc894da891c37c30b0acb648da9d49e2bc9c6d61 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 16 Jun 2010 13:49:14 +0000
+Subject: Initialise the GType system when called into
+
+Add calls to g_type_init() in the plugin entry points so that
+GThread is initialised if not already, so that GIO calls work
+as expected.
+
+Note that this requires GLib 2.24 to work properly, so only
+done in master (gnome-2-30 depends on GLib 2.22)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=621771
+---
+diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
+index fc5afc1..f14b913 100644
+--- a/browser-plugin/totemPluginGlue.cpp
++++ b/browser-plugin/totemPluginGlue.cpp
+@@ -315,6 +315,8 @@ NP_GetMIMEDescription (void)
+ 	if (mime_list != NULL)
+ 		return mime_list;
+ 
++	g_type_init ();
++
+ 	list = g_string_new (NULL);
+ 
+ 	/* Load the configuration files for the enabled plugins */
+@@ -396,6 +398,8 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
+ {
+ 	g_debug ("NP_Initialize");
+ 
++	g_type_init ();
++
+ 	if (aMozillaVTable == NULL || aPluginVTable == NULL)
+ 		return NPERR_INVALID_FUNCTABLE_ERROR;
+ 
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.2-mp2t-support.patch b/media-video/totem/files/totem-2.30.2-mp2t-support.patch
new file mode 100644
index 000000000000..80724429d327
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-mp2t-support.patch
@@ -0,0 +1,21 @@
+From 046920a4b1a1e4b085e1faded57d47e45492d368 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@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
diff --git a/media-video/totem/files/totem-2.30.2-webm-support.patch b/media-video/totem/files/totem-2.30.2-webm-support.patch
new file mode 100644
index 000000000000..e82a02116680
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-webm-support.patch
@@ -0,0 +1,32 @@
+From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@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