* [gentoo-commits] gentoo-x86 commit in media-video/ogmrip/files: ogmrip-0.13.4-gtk.patch ogmrip-0.13.4-suboptions.patch ogmrip-0.13.0-no-profile.patch ogmrip-werror.patch ogmrip-0.13.0-libdvdread.patch
@ 2010-04-26 19:11 99% Samuli Suominen (ssuominen)
0 siblings, 0 replies; 1+ results
From: Samuli Suominen (ssuominen) @ 2010-04-26 19:11 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/04/26 19:11:35
Added: ogmrip-0.13.4-gtk.patch
ogmrip-0.13.4-suboptions.patch
Removed: ogmrip-0.13.0-no-profile.patch ogmrip-werror.patch
ogmrip-0.13.0-libdvdread.patch
Log:
Version bump wrt #316735 by "Footkill" and Olivier Rolland.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch?rev=1.1&content-type=text/plain
Index: ogmrip-0.13.4-gtk.patch
===================================================================
Index: src/ogmrip-main.c
===================================================================
--- src/ogmrip-main.c (révision 1960)
+++ src/ogmrip-main.c (copie de travail)
@@ -1452,7 +1452,7 @@
ogmrip_encoding_set_relative (encoding,
#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_sensitive (data->relative_check) &
+ gtk_widget_is_sensitive (data->relative_check) &
#else
GTK_WIDGET_IS_SENSITIVE (data->relative_check) &
#endif
Index: src/ogmrip-options-dialog.c
===================================================================
--- src/ogmrip-options-dialog.c (révision 1960)
+++ src/ogmrip-options-dialog.c (copie de travail)
@@ -971,13 +971,21 @@
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_ENQUEUE);
gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(2,18,0)
+ gtk_widget_set_can_focus (widget, TRUE);
+#else
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
+#endif
widget = gtk_button_new_with_image (_("E_xtract"), GTK_STOCK_CONVERT);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_EXTRACT);
gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(2,18,0)
+ gtk_widget_set_can_focus (widget, TRUE);
+#else
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
+#endif
ogmrip_settings_bind_custom (settings, OGMRIP_GCONF_GENERAL, OGMRIP_GCONF_PROFILE,
G_OBJECT (OGMRIP_OPTIONS_DIALOG (dialog)->priv->profile_combo), "active",
@@ -1294,7 +1302,7 @@
return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->test_check)) &&
#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_sensitive (dialog->priv->test_check);
+ gtk_widget_is_sensitive (dialog->priv->test_check);
#else
GTK_WIDGET_IS_SENSITIVE (dialog->priv->test_check);
#endif
Index: libogmrip-gtk/ogmrip-source-chooser-widget.c
===================================================================
--- libogmrip-gtk/ogmrip-source-chooser-widget.c (révision 1960)
+++ libogmrip-gtk/ogmrip-source-chooser-widget.c (copie de travail)
@@ -543,7 +543,11 @@
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
+#if GTK_CHECK_VERSION(2,18,0)
+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
+#else
if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
+#endif
{
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel));
1.1 media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch?rev=1.1&content-type=text/plain
Index: ogmrip-0.13.4-suboptions.patch
===================================================================
--- libogmrip/ogmrip-x264.c.orig 2010-04-13 09:21:48.000000000 +0200
+++ libogmrip/ogmrip-x264.c 2010-04-13 09:19:34.000000000 +0200
@@ -835,7 +835,7 @@
ogmrip_x264_check_option (const gchar *option)
{
GPtrArray *argv;
- gchar *options;
+ gchar *options, *output = NULL;
gint status;
argv = g_ptr_array_new ();
@@ -843,7 +843,7 @@
g_ptr_array_add (argv, "mencoder");
g_ptr_array_add (argv, "-nocache");
g_ptr_array_add (argv, "-nosound");
- g_ptr_array_add (argv, "-really-quiet");
+ g_ptr_array_add (argv, "-quiet");
g_ptr_array_add (argv, "-frames");
g_ptr_array_add (argv, "0");
g_ptr_array_add (argv, "-rawvideo");
@@ -863,13 +863,26 @@
g_ptr_array_add (argv, NULL);
g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, NULL, NULL, &status, NULL);
+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
+ NULL, NULL, NULL, &output, &status, NULL);
g_ptr_array_free (argv, TRUE);
g_free (options);
+ if (status == 0 && output != NULL)
+ {
+ gchar *substr;
+
+ substr = g_strdup_printf ("Option x264encopts: Unknown suboption %s", option);
+ if (strstr (output, substr))
+ status = 1;
+ g_free (substr);
+ }
+
+ if (output)
+ g_free (output);
+
return status == 0;
}
--- libogmrip/ogmrip-xvid.c.orig 2010-04-13 09:21:23.000000000 +0200
+++ libogmrip/ogmrip-xvid.c 2010-04-13 09:19:39.000000000 +0200
@@ -851,7 +851,7 @@
ogmrip_xvid_check_option (const gchar *option)
{
GPtrArray *argv;
- gchar *options;
+ gchar *options, *output = NULL;
gint status;
argv = g_ptr_array_new ();
@@ -859,7 +859,7 @@
g_ptr_array_add (argv, "mencoder");
g_ptr_array_add (argv, "-nocache");
g_ptr_array_add (argv, "-nosound");
- g_ptr_array_add (argv, "-really-quiet");
+ g_ptr_array_add (argv, "-quiet");
g_ptr_array_add (argv, "-frames");
g_ptr_array_add (argv, "0");
g_ptr_array_add (argv, "-rawvideo");
@@ -879,13 +879,26 @@
g_ptr_array_add (argv, NULL);
g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, NULL, NULL, &status, NULL);
+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
+ NULL, NULL, NULL, &output, &status, NULL);
g_ptr_array_free (argv, TRUE);
g_free (options);
+ if (status == 0 && output != NULL)
+ {
+ gchar *substr;
+
+ substr = g_strdup_printf ("Option xvidencopts: Unknown suboption %s", option);
+ if (strstr (output, substr))
+ status = 1;
+ g_free (substr);
+ }
+
+ if (output)
+ g_free (output);
+
return status == 0;
}
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-04-26 19:11 99% [gentoo-commits] gentoo-x86 commit in media-video/ogmrip/files: ogmrip-0.13.4-gtk.patch ogmrip-0.13.4-suboptions.patch ogmrip-0.13.0-no-profile.patch ogmrip-werror.patch ogmrip-0.13.0-libdvdread.patch Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox