summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-21 09:38:12 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-21 09:38:12 +0800
commit07d32776170a45449e67ed472d93ea825f0abc6c (patch)
tree14122a1dde233abf82f227f4b16b47b92b981c83 /multimedia
parent6281207abd31b9a39384672ba6ff699814469177 (diff)
downloadmarcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar.gz
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar.bz2
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar.lz
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar.xz
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.tar.zst
marcuscom-ports-07d32776170a45449e67ed472d93ea825f0abc6c.zip
Fix gst-thumbnail with gstreamer-0.8.0. Without this patch, gst-thumbnail
creates zero-length thumbnails. Note: in order to fully fix thumbnails, you may need to do: rm -rf ~/.thumbnails/* After rebuilding nautilus-media. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2129 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/nautilus-media/Makefile1
-rw-r--r--multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c36
2 files changed, 37 insertions, 0 deletions
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index afeebc3e8..1278093c7 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nautilus-media
PORTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
diff --git a/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c
new file mode 100644
index 000000000..e1acf7681
--- /dev/null
+++ b/multimedia/nautilus-media/files/patch-thumbnail_gst-thumbnail.c
@@ -0,0 +1,36 @@
+2004-03-20 Joe Marcus Clarke <marcus@FreeBSD.org>
+
+* thumbnail/gst-thumbnail.c (*global*), (end_of_snap),
+ (gst_thumbnail_pngenc_get):
+
+Make sure the pipeline has completely finished before quitting the main
+gst event loop.
+--- thumbnail/gst-thumbnail.c.orig Sat Mar 20 19:49:01 2004
++++ thumbnail/gst-thumbnail.c Sat Mar 20 19:49:04 2004
+@@ -23,11 +23,13 @@
+ #define TIMEOUT 9999 /* how long before we give up, msec */
+
+ gboolean finished = FALSE;
++gboolean can_finish = FALSE;
+
+ void end_of_snap (GstElement *pipeline)
+ {
+ g_print ("Snapped.\n");
+- gst_element_set_state (pipeline, GST_STATE_READY);
++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
++ while (!can_finish) ;
+ gst_main_quit ();
+ finished = TRUE;
+ }
+@@ -97,9 +99,9 @@
+ /* commit suicide in due time if necessary */
+ g_timeout_add (TIMEOUT, (GSourceFunc) timeout, pipeline);
+ g_idle_add ((GSourceFunc) iterator, pipeline);
+- gst_main ();
+
+- gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
++ can_finish = TRUE;
++ gst_main ();
+ }
+ int
+ main (int argc, char *argv[])