Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Mon, 26 Apr 2010 19:11:38
Message-Id: 20100426191135.8B9582C043@corvid.gentoo.org
1 ssuominen 10/04/26 19:11:35
2
3 Added: ogmrip-0.13.4-gtk.patch
4 ogmrip-0.13.4-suboptions.patch
5 Removed: ogmrip-0.13.0-no-profile.patch ogmrip-werror.patch
6 ogmrip-0.13.0-libdvdread.patch
7 Log:
8 Version bump wrt #316735 by "Footkill" and Olivier Rolland.
9 (Portage version: 2.2_rc67/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch?rev=1.1&view=markup
15 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
16
17 Index: ogmrip-0.13.4-gtk.patch
18 ===================================================================
19 Index: src/ogmrip-main.c
20 ===================================================================
21 --- src/ogmrip-main.c (révision 1960)
22 +++ src/ogmrip-main.c (copie de travail)
23 @@ -1452,7 +1452,7 @@
24
25 ogmrip_encoding_set_relative (encoding,
26 #if GTK_CHECK_VERSION(2,18,0)
27 - gtk_widget_get_sensitive (data->relative_check) &
28 + gtk_widget_is_sensitive (data->relative_check) &
29 #else
30 GTK_WIDGET_IS_SENSITIVE (data->relative_check) &
31 #endif
32 Index: src/ogmrip-options-dialog.c
33 ===================================================================
34 --- src/ogmrip-options-dialog.c (révision 1960)
35 +++ src/ogmrip-options-dialog.c (copie de travail)
36 @@ -971,13 +971,21 @@
37 gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_ENQUEUE);
38 gtk_widget_show (widget);
39
40 +#if GTK_CHECK_VERSION(2,18,0)
41 + gtk_widget_set_can_focus (widget, TRUE);
42 +#else
43 GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
44 +#endif
45
46 widget = gtk_button_new_with_image (_("E_xtract"), GTK_STOCK_CONVERT);
47 gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_EXTRACT);
48 gtk_widget_show (widget);
49
50 +#if GTK_CHECK_VERSION(2,18,0)
51 + gtk_widget_set_can_focus (widget, TRUE);
52 +#else
53 GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
54 +#endif
55
56 ogmrip_settings_bind_custom (settings, OGMRIP_GCONF_GENERAL, OGMRIP_GCONF_PROFILE,
57 G_OBJECT (OGMRIP_OPTIONS_DIALOG (dialog)->priv->profile_combo), "active",
58 @@ -1294,7 +1302,7 @@
59
60 return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->test_check)) &&
61 #if GTK_CHECK_VERSION(2,18,0)
62 - gtk_widget_get_sensitive (dialog->priv->test_check);
63 + gtk_widget_is_sensitive (dialog->priv->test_check);
64 #else
65 GTK_WIDGET_IS_SENSITIVE (dialog->priv->test_check);
66 #endif
67 Index: libogmrip-gtk/ogmrip-source-chooser-widget.c
68 ===================================================================
69 --- libogmrip-gtk/ogmrip-source-chooser-widget.c (révision 1960)
70 +++ libogmrip-gtk/ogmrip-source-chooser-widget.c (copie de travail)
71 @@ -543,7 +543,11 @@
72
73 toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
74
75 +#if GTK_CHECK_VERSION(2,18,0)
76 + if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
77 +#else
78 if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
79 +#endif
80 {
81 if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog)))
82 gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel));
83
84
85
86 1.1 media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch
87
88 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch?rev=1.1&view=markup
89 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
90
91 Index: ogmrip-0.13.4-suboptions.patch
92 ===================================================================
93 --- libogmrip/ogmrip-x264.c.orig 2010-04-13 09:21:48.000000000 +0200
94 +++ libogmrip/ogmrip-x264.c 2010-04-13 09:19:34.000000000 +0200
95 @@ -835,7 +835,7 @@
96 ogmrip_x264_check_option (const gchar *option)
97 {
98 GPtrArray *argv;
99 - gchar *options;
100 + gchar *options, *output = NULL;
101 gint status;
102
103 argv = g_ptr_array_new ();
104 @@ -843,7 +843,7 @@
105 g_ptr_array_add (argv, "mencoder");
106 g_ptr_array_add (argv, "-nocache");
107 g_ptr_array_add (argv, "-nosound");
108 - g_ptr_array_add (argv, "-really-quiet");
109 + g_ptr_array_add (argv, "-quiet");
110 g_ptr_array_add (argv, "-frames");
111 g_ptr_array_add (argv, "0");
112 g_ptr_array_add (argv, "-rawvideo");
113 @@ -863,13 +863,26 @@
114 g_ptr_array_add (argv, NULL);
115
116 g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
117 - G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
118 - NULL, NULL, NULL, NULL, &status, NULL);
119 + G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
120 + NULL, NULL, NULL, &output, &status, NULL);
121
122 g_ptr_array_free (argv, TRUE);
123
124 g_free (options);
125
126 + if (status == 0 && output != NULL)
127 + {
128 + gchar *substr;
129 +
130 + substr = g_strdup_printf ("Option x264encopts: Unknown suboption %s", option);
131 + if (strstr (output, substr))
132 + status = 1;
133 + g_free (substr);
134 + }
135 +
136 + if (output)
137 + g_free (output);
138 +
139 return status == 0;
140 }
141
142 --- libogmrip/ogmrip-xvid.c.orig 2010-04-13 09:21:23.000000000 +0200
143 +++ libogmrip/ogmrip-xvid.c 2010-04-13 09:19:39.000000000 +0200
144 @@ -851,7 +851,7 @@
145 ogmrip_xvid_check_option (const gchar *option)
146 {
147 GPtrArray *argv;
148 - gchar *options;
149 + gchar *options, *output = NULL;
150 gint status;
151
152 argv = g_ptr_array_new ();
153 @@ -859,7 +859,7 @@
154 g_ptr_array_add (argv, "mencoder");
155 g_ptr_array_add (argv, "-nocache");
156 g_ptr_array_add (argv, "-nosound");
157 - g_ptr_array_add (argv, "-really-quiet");
158 + g_ptr_array_add (argv, "-quiet");
159 g_ptr_array_add (argv, "-frames");
160 g_ptr_array_add (argv, "0");
161 g_ptr_array_add (argv, "-rawvideo");
162 @@ -879,13 +879,26 @@
163 g_ptr_array_add (argv, NULL);
164
165 g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
166 - G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
167 - NULL, NULL, NULL, NULL, &status, NULL);
168 + G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
169 + NULL, NULL, NULL, &output, &status, NULL);
170
171 g_ptr_array_free (argv, TRUE);
172
173 g_free (options);
174
175 + if (status == 0 && output != NULL)
176 + {
177 + gchar *substr;
178 +
179 + substr = g_strdup_printf ("Option xvidencopts: Unknown suboption %s", option);
180 + if (strstr (output, substr))
181 + status = 1;
182 + g_free (substr);
183 + }
184 +
185 + if (output)
186 + g_free (output);
187 +
188 return status == 0;
189 }
Report Message
Find on MARC Find on Google Groups