Author: goetz
Date: Thu Feb 8 07:46:45 2007
New Revision: 117370
Modified:
packages/cooker/totem/current/SOURCES/totem-2.17.90-xine-thumbnailer.patch
packages/cooker/totem/current/SPECS/totem.spec
Log:
fix the patch by using the upstream svn version
Modified:
packages/cooker/totem/current/SOURCES/totem-2.17.90-xine-thumbnailer.patch
==============================================================================
--- packages/cooker/totem/current/SOURCES/totem-2.17.90-xine-thumbnailer.patch
(original)
+++ packages/cooker/totem/current/SOURCES/totem-2.17.90-xine-thumbnailer.patch
Thu Feb 8 07:46:45 2007
@@ -1,13 +1,47 @@
---- totem-2.17.90/src/backend/bacon-video-widget-xine.c~ 2007-01-24
15:17:14.000000000 +0100
-+++ totem-2.17.90/src/backend/bacon-video-widget-xine.c 2007-02-07
17:28:22.000000000 +0100
-@@ -3997,8 +3997,8 @@
+--- trunk/src/backend/bacon-video-widget-xine.c 2007/02/01 23:33:57
3986
++++ trunk/src/backend/bacon-video-widget-xine.c 2007/02/08 00:05:37
4011
+@@ -474,7 +474,7 @@
+ bvw->priv->cursor = NULL;
+ }
+ if (bvw->priv->logo_pixbuf != NULL) {
+- gdk_pixbuf_unref (bvw->priv->logo_pixbuf);
++ g_object_unref (bvw->priv->logo_pixbuf);
+ bvw->priv->logo_pixbuf = NULL;
+ }
+ g_free (bvw->priv->vis_name);
+@@ -1824,7 +1824,7 @@
+ (w_height - s_height) / 2,
+ s_width, s_height, GDK_RGB_DITHER_NONE, 0, 0);
+
+- gdk_pixbuf_unref (logo);
++ g_object_unref (logo);
+ }
+
+ return TRUE;
+@@ -4000,8 +4000,15 @@
break;
case XINE_IMGFMT_YV12:
y = yuv;
- u = yuv + width * height;
- v = yuv + width * height * 5 / 4;
-+ v = yuv + width * height;
-+ u = yuv + width * height * 5 / 4;
++ /* XXX Work-around xine-lib bug, u and v channels are swapped
++ * when using xine_get_current_frame */
++ if (bvw->priv->type != BVW_USE_TYPE_CAPTURE) {
++ u = yuv + width * height;
++ v = yuv + width * height * 5 / 4;
++ } else {
++ v = yuv + width * height;
++ u = yuv + width * height * 5 / 4;
++ }
break;
default:
g_warning ("Format '%.4s' unsupported", (char *) &format);
+@@ -4052,7 +4059,7 @@
+ width, (int) (width * ratio / 10000),
+ GDK_INTERP_BILINEAR);
+
+- gdk_pixbuf_unref (pixbuf);
++ g_object_unref (pixbuf);
+
+ return tmp;
+ }
Modified: packages/cooker/totem/current/SPECS/totem.spec
==============================================================================
--- packages/cooker/totem/current/SPECS/totem.spec (original)
+++ packages/cooker/totem/current/SPECS/totem.spec Thu Feb 8 07:46:45 2007
@@ -12,7 +12,7 @@
Summary: Movie player for GNOME 2
Name: totem
Version: 2.17.90
-Release: %mkrel 3
+Release: %mkrel 4
Source0:
http://ftp.gnome.org/pub/GNOME/sources/totem/%{name}-%{version}.tar.bz2
Source1: %name-16.png
Source2: %name-32.png
