cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.0.6

Browse Source
This commit is contained in:
dcoppa 2012-04-10 13:29:33 +00:00
parent 5dde8f799e
commit 301285c09e
12 changed files with 23 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/gecko-mediaplayer/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.30 2012/03/26 14:41:51 dcoppa Exp $
# $OpenBSD: Makefile,v 1.31 2012/04/10 13:31:31 dcoppa Exp $
COMMENT = gnome-mplayer browser media plugin
V = 1.0.6beta1
DISTNAME = gecko-mediaplayer-1.0.6b1
PKGNAME = gecko-mediaplayer-${V}
V = 1.0.6
DISTNAME = gecko-mediaplayer-${V}
CATEGORIES = www
MAINTAINER = David Coppa <dcoppa@openbsd.org>

10
www/gecko-mediaplayer/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gecko-mediaplayer-1.0.6b1.tar.gz) = dr2JfzoEe4RI+hxUhFIYWg==
RMD160 (gecko-mediaplayer-1.0.6b1.tar.gz) = J4dwW399CL+Awzn3SaQr8NEF41Y=
SHA1 (gecko-mediaplayer-1.0.6b1.tar.gz) = 9NusTXii7G7j8mRtVT+KUI1yqAQ=
SHA256 (gecko-mediaplayer-1.0.6b1.tar.gz) = av1AREDRhormMEaW90tJ3T1B9c4KiAeTQuFeAfccM+8=
SIZE (gecko-mediaplayer-1.0.6b1.tar.gz) = 262818
MD5 (gecko-mediaplayer-1.0.6.tar.gz) = dnXIYixH/4zNIraFxIY1+A==
RMD160 (gecko-mediaplayer-1.0.6.tar.gz) = OtzL2EXYXBInNDDmXGDDDglAJuU=
SHA1 (gecko-mediaplayer-1.0.6.tar.gz) = J4llhKVSchWFonb3pIJey3nSmAw=
SHA256 (gecko-mediaplayer-1.0.6.tar.gz) = AJDXX1YCAg+Z18O/BsiGzci6n/XYLLW2OGa/f64qCSA=
SIZE (gecko-mediaplayer-1.0.6.tar.gz) = 262827

6
x11/gmtk/Makefile
View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2012/04/06 10:13:55 dcoppa Exp $
# $OpenBSD: Makefile,v 1.7 2012/04/10 13:29:33 dcoppa Exp $
COMMENT = gnome-mplayer toolkit
DISTNAME = gmtk-1.0.6b1
PKGNAME = ${DISTNAME:S/b1/beta1/}
REVISION = 0
DISTNAME = gmtk-1.0.6
SHARED_LIBS = gmlib 0.0 \
gmtk 0.0

10
x11/gmtk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gmtk-1.0.6b1.tar.gz) = EQlNGmZ+zizIaiS9N8HzlA==
RMD160 (gmtk-1.0.6b1.tar.gz) = mbVd/luvE5EmbSA2/sLCmcVW80U=
SHA1 (gmtk-1.0.6b1.tar.gz) = ZSeBPzPy8Xd0rBrpw42SfbdXzAs=
SHA256 (gmtk-1.0.6b1.tar.gz) = k82ob+Z4FlVvqR1OEWima0D5vjkzrHUL5HvvDU/WhJM=
SIZE (gmtk-1.0.6b1.tar.gz) = 393594
MD5 (gmtk-1.0.6.tar.gz) = a/HGN4hUEnJxf2PsNw9rbA==
RMD160 (gmtk-1.0.6.tar.gz) = aDweZi/ozMSfcxu5NraaqS0w5PI=
SHA1 (gmtk-1.0.6.tar.gz) = y/OoYgMnzQbzJeBbaMfXhYwHBFU=
SHA256 (gmtk-1.0.6.tar.gz) = tFkZP0h2zqpltgX7L4rY8T87TZRqr0RFgnVIYiRF6oI=
SIZE (gmtk-1.0.6.tar.gz) = 394303

318
x11/gmtk/patches/patch-src_gmtk_media_player_c
View File

@ -1,318 +0,0 @@
$OpenBSD: patch-src_gmtk_media_player_c,v 1.4 2012/04/06 10:13:55 dcoppa Exp $
Fix error when shifting protocol from mms to mmsh
(upstream svn revision r92)
Allow one decoding error restart
(upstream svn revision r93)
Only do the restart on decoding error if the position is 0
(upstream svn revision r94)
Fix a crash by resetting codecs variables to NULL after
g_free has been called (upstream svn revision r95)
Kill GTK widget oversize warning
(upstream svn revision r98)
Assign NULL to freed strings
(upstream svn revision r102)
--- src/gmtk_media_player.c.orig Mon Feb 20 21:40:13 2012
+++ src/gmtk_media_player.c Fri Apr 6 11:01:10 2012
@@ -89,13 +89,15 @@ gboolean signal_event(gpointer data)
break;
case EVENT_TYPE_ALLOCATION:
- g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
+ if (!(event->event_allocation->width >= 65535 || event->event_allocation->height >= 65535))
+ g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
break;
default:
printf("undefined event %s\n", event->event_name);
}
g_free(event->event_name);
+ event->event_name = NULL;
}
if (event)
g_free(event);
@@ -752,6 +754,7 @@ void gmtk_media_player_set_uri(GmtkMediaPlayer * playe
g_free(cmd);
if (filename != NULL) {
g_free(filename);
+ filename = NULL;
}
if (player->media_state == MEDIA_STATE_STOP) {
gmtk_media_player_set_state(player, MEDIA_STATE_PLAY);
@@ -892,6 +895,7 @@ void gmtk_media_player_send_command(GmtkMediaPlayer *
g_dgettext(GETTEXT_PACKAGE, "Frame Dropping"));
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
break;
default:
@@ -913,6 +917,7 @@ void gmtk_media_player_set_attribute_boolean(GmtkMedia
cmd = g_strdup_printf("set_property sub_visibility %i\n", value);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
if (value) {
cmd =
g_strdup_printf("osd_show_property_text \"%s\"\n",
@@ -923,6 +928,7 @@ void gmtk_media_player_set_attribute_boolean(GmtkMedia
}
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -932,6 +938,7 @@ void gmtk_media_player_set_attribute_boolean(GmtkMedia
cmd = g_strdup_printf("frame_drop %i\n", value);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -953,6 +960,7 @@ void gmtk_media_player_set_attribute_boolean(GmtkMedia
cmd = g_strdup_printf("mute %i\n", value);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1142,6 +1150,7 @@ void gmtk_media_player_set_attribute_double(GmtkMediaP
}
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1151,6 +1160,7 @@ void gmtk_media_player_set_attribute_double(GmtkMediaP
cmd = g_strdup_printf("speed_set %f\n", player->speed_multiplier);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1160,6 +1170,7 @@ void gmtk_media_player_set_attribute_double(GmtkMediaP
cmd = g_strdup_printf("sub_scale %f 1\n", player->subtitle_scale);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1169,6 +1180,7 @@ void gmtk_media_player_set_attribute_double(GmtkMediaP
cmd = g_strdup_printf("set_property sub_delay %f 1\n", player->subtitle_delay);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1178,6 +1190,7 @@ void gmtk_media_player_set_attribute_double(GmtkMediaP
cmd = g_strdup_printf("set_property audio_delay %f 1\n", player->audio_delay);
write_to_mplayer(player, cmd);
g_free(cmd);
+ cmd = NULL;
}
break;
@@ -1278,6 +1291,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_VO:
if (player->vo != NULL) {
g_free(player->vo);
+ player->vo = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->vo = NULL;
@@ -1289,6 +1303,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_AO:
if (player->ao != NULL) {
g_free(player->ao);
+ player->ao = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->ao = NULL;
@@ -1300,6 +1315,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_MEDIA_DEVICE:
if (player->media_device != NULL) {
g_free(player->media_device);
+ player->media_device = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->media_device = NULL;
@@ -1311,6 +1327,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_EXTRA_OPTS:
if (player->extra_opts != NULL) {
g_free(player->extra_opts);
+ player->extra_opts = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->extra_opts = NULL;
@@ -1322,6 +1339,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_MPLAYER_BINARY:
if (player->mplayer_binary != NULL) {
g_free(player->mplayer_binary);
+ player->mplayer_binary = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->mplayer_binary = NULL;
@@ -1334,6 +1352,7 @@ void gmtk_media_player_set_attribute_string(GmtkMediaP
case ATTRIBUTE_AUDIO_TRACK_FILE:
if (player->audio_track_file != NULL) {
g_free(player->audio_track_file);
+ player->audio_track_file = NULL;
}
if (value == NULL || strlen(value) == 0) {
player->audio_track_file = NULL;
@@ -1941,6 +1960,7 @@ gpointer launch_mplayer(gpointer data)
gchar *codecs_vdpau = NULL;
gchar *codecs_crystalhd = NULL;
gchar *codecs = NULL;
+ GmtkMediaPlayerPlaybackError last_error = NO_ERROR;
#ifdef GIO_ENABLED
GFile *file;
#endif
@@ -2086,18 +2106,23 @@ gpointer launch_mplayer(gpointer data)
codecs = g_strconcat(codecs_vdpau, codecs_crystalhd, NULL);
g_free(codecs_vdpau);
g_free(codecs_crystalhd);
+ codecs_vdpau = NULL;
+ codecs_crystalhd = NULL;
} else if (codecs_vdpau) {
codecs = g_strdup(codecs_vdpau);
g_free(codecs_vdpau);
+ codecs_vdpau = NULL;
} else if (codecs_crystalhd) {
codecs = g_strdup(codecs_crystalhd);
g_free(codecs_crystalhd);
+ codecs_crystalhd = NULL;
}
if (codecs != NULL) {
argv[argn++] = g_strdup_printf("-vc");
argv[argn++] = g_strdup_printf("%s", codecs);
g_free(codecs);
+ codecs = NULL;
}
if (player->ao != NULL) {
@@ -2535,7 +2560,7 @@ gpointer launch_mplayer(gpointer data)
break;
case ERROR_RETRY_WITH_MMSHTTP:
- tmp = gmtk_media_player_switch_protocol(player->uri, "http");
+ tmp = gmtk_media_player_switch_protocol(player->uri, "mmsh");
g_free(player->uri);
player->uri = tmp;
break;
@@ -2551,6 +2576,14 @@ gpointer launch_mplayer(gpointer data)
case ERROR_RETRY_ALSA_BUSY:
case ERROR_RETRY_VDPAU:
break;
+ case ERROR_RETRY:
+ if (last_error == NO_ERROR) {
+ last_error == ERROR_RETRY;
+ } else {
+ last_error == NO_ERROR;
+ player->playback_error == NO_ERROR;
+ }
+ break;
case ERROR_RETRY_WITHOUT_HARDWARE_CODECS:
player->enable_hardware_codecs = FALSE;
@@ -2641,7 +2674,14 @@ gboolean thread_reader_error(GIOChannel * source, GIOC
}
if (strstr(mplayer_output->str, "signal") != NULL) {
- error_msg = g_strdup(mplayer_output->str);
+ if (strstr(mplayer_output->str, "decode") != NULL) {
+ create_event_int(player, "attribute-changed", ATTRIBUTE_SIZE);
+ if (player->position == 0) {
+ player->playback_error = ERROR_RETRY;
+ }
+ } else {
+ error_msg = g_strdup(mplayer_output->str);
+ }
}
if (strstr(mplayer_output->str, "Failed creating VDPAU decoder") != NULL) {
@@ -2688,6 +2728,11 @@ gboolean thread_reader_error(GIOChannel * source, GIOC
}
}
+ if (strstr(mplayer_output->str, "MPlayer interrupted by signal 13 in module: open_stream") != NULL
+ && g_strrstr(player->uri, "mms://") != NULL) {
+ player->playback_error = ERROR_RETRY_WITH_MMSHTTP;
+ }
+
if (strstr(mplayer_output->str, "No stream found to handle url mmshttp://") != NULL) {
player->playback_error = ERROR_RETRY_WITH_HTTP;
}
@@ -2751,13 +2796,14 @@ gboolean thread_reader_error(GIOChannel * source, GIOC
create_event_int(player, "attribute-changed", ATTRIBUTE_TITLE);
}
- if (error_msg != NULL) {
+ if (error_msg != NULL && player->playback_error == NO_ERROR) {
dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE, "%s", error_msg);
gtk_window_set_title(GTK_WINDOW(dialog), g_dgettext(GETTEXT_PACKAGE, "GNOME MPlayer Error"));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
g_free(error_msg);
+ error_msg = NULL;
}
g_string_free(mplayer_output, TRUE);
@@ -3373,6 +3419,7 @@ gboolean thread_reader(GIOChannel * source, GIOConditi
}
g_free(icy);
+ icy = NULL;
g_free(message);
message = NULL;
}
@@ -3411,6 +3458,7 @@ gboolean thread_reader(GIOChannel * source, GIOConditi
}
g_free(icy);
+ icy = NULL;
g_free(message);
message = NULL;
}
@@ -3536,10 +3584,14 @@ gboolean detect_mplayer_features(GmtkMediaPlayer * pla
printf("Error when running: %s\n", error->message);
g_error_free(error);
error = NULL;
- if (out != NULL)
+ if (out != NULL) {
g_free(out);
- if (err != NULL)
+ out = NULL;
+ }
+ if (err != NULL) {
g_free(err);
+ err = NULL;
+ }
return FALSE;
}
output = g_strsplit(out, "\n", 0);
@@ -3555,7 +3607,9 @@ gboolean detect_mplayer_features(GmtkMediaPlayer * pla
}
g_strfreev(output);
g_free(out);
+ out = NULL;
g_free(err);
+ err = NULL;
player->features_detected = TRUE;
if (!ret) {

17
x11/gmtk/patches/patch-src_gmtk_media_player_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_gmtk_media_player_h,v 1.1 2012/04/06 10:13:55 dcoppa Exp $
Allow one decoding error restart
(upstream svn revision r93)
--- src/gmtk_media_player.h.orig Mon Feb 20 21:40:13 2012
+++ src/gmtk_media_player.h Fri Apr 6 11:01:10 2012
@@ -75,7 +75,8 @@ typedef enum {
ERROR_RETRY_WITHOUT_XVMC,
ERROR_RETRY_ALSA_BUSY,
ERROR_RETRY_VDPAU,
- ERROR_RETRY_WITHOUT_HARDWARE_CODECS
+ ERROR_RETRY_WITHOUT_HARDWARE_CODECS,
+ ERROR_RETRY
} GmtkMediaPlayerPlaybackError;
typedef enum {

8
x11/gnome-mplayer/Makefile
View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.58 2012/04/06 10:14:44 dcoppa Exp $
# $OpenBSD: Makefile,v 1.59 2012/04/10 13:30:37 dcoppa Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
V = 1.0.6beta1
DISTNAME = gnome-mplayer-1.0.6b1
PKGNAME = gnome-mplayer-${V}
REVISION = 1
V = 1.0.6
DISTNAME = gnome-mplayer-${V}
CATEGORIES = x11 multimedia
MAINTAINER = David Coppa <dcoppa@openbsd.org>

10
x11/gnome-mplayer/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome-mplayer-1.0.6b1.tar.gz) = 4DxbUGnrGRbuA2EiIX+Ukw==
RMD160 (gnome-mplayer-1.0.6b1.tar.gz) = a0ja09RFoUX9SxfIt4gevG0D+1o=
SHA1 (gnome-mplayer-1.0.6b1.tar.gz) = vSqCQQ1aFI/WW4RNEpdyFL6csg0=
SHA256 (gnome-mplayer-1.0.6b1.tar.gz) = M41/UbrLyNGdDwaZCquEteMdOd8LQm5MfbtfLpKXI6o=
SIZE (gnome-mplayer-1.0.6b1.tar.gz) = 1027400
MD5 (gnome-mplayer-1.0.6.tar.gz) = wfwj+vcPO7wj2vYPmzSDLQ==
RMD160 (gnome-mplayer-1.0.6.tar.gz) = vE1CdbxSW44BbR8jGOE6oeL5iQc=
SHA1 (gnome-mplayer-1.0.6.tar.gz) = NutTajZWr6tFZPg1qoa6tmdyQSk=
SHA256 (gnome-mplayer-1.0.6.tar.gz) = hyp4ZEP1apgmW0sW4wuyVnnCMc2IlZDUM6JYOZJDXX0=
SIZE (gnome-mplayer-1.0.6.tar.gz) = 1027857

17
x11/gnome-mplayer/patches/patch-src_common_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_common_h,v 1.6 2012/04/06 10:14:44 dcoppa Exp $
Remove deprecated slide_away code to unbreak with glib-2.32
(upstream svn revision r2234)
--- src/common.h.orig Fri Apr 6 08:48:38 2012
+++ src/common.h Fri Apr 6 08:49:16 2012
@@ -432,9 +432,6 @@ gint tv_width;
gint tv_height;
gint tv_fps;
-GMutex *slide_away;
-GCond *mplayer_complete_cond;
-
GThreadPool *retrieve_metadata_pool;
gboolean use_mediakeys;

148
x11/gnome-mplayer/patches/patch-src_gui_c
View File

@ -1,148 +0,0 @@
$OpenBSD: patch-src_gui_c,v 1.24 2012/04/06 10:14:44 dcoppa Exp $
Separate delete and destroy events
(upstream svn revisions r2232 & r2233)
Remove deprecated slide_away code to unbreak with glib-2.32
(upstream svn revision r2234)
--- src/gui.c.orig Thu Mar 22 05:58:16 2012
+++ src/gui.c Fri Apr 6 11:44:16 2012
@@ -1274,6 +1274,7 @@ gboolean set_quit(void *data)
{
delete_callback(NULL, NULL, NULL);
+ g_idle_add(set_destroy, NULL);
return FALSE;
}
@@ -1516,6 +1517,18 @@ gboolean notification_handler(GtkWidget * widget, GdkE
return FALSE;
}
+gboolean set_destroy(gpointer data)
+{
+ gtk_widget_destroy(window);
+ return FALSE;
+}
+
+
+static void destroy_callback(GtkWidget * widget, gpointer data)
+{
+ gtk_main_quit();
+}
+
gboolean delete_callback(GtkWidget * widget, GdkEvent * event, void *data)
{
loop = 0;
@@ -1568,7 +1581,6 @@ gboolean delete_callback(GtkWidget * widget, GdkEvent
if (use_defaultpl && embed_window == 0)
save_playlist_pls(default_playlist);
- gtk_main_quit();
return FALSE;
}
@@ -1940,6 +1952,7 @@ gboolean window_key_callback(GtkWidget * widget, GdkEv
return FALSE;
case GDK_q:
delete_callback(NULL, NULL, NULL);
+ g_idle_add(set_destroy, NULL);
return FALSE;
case GDK_v:
/*
@@ -1980,6 +1993,7 @@ gboolean window_key_callback(GtkWidget * widget, GdkEv
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_fullscreen), !fullscreen);
} else {
delete_callback(NULL, NULL, NULL);
+ g_idle_add(set_destroy, NULL);
}
return FALSE;
case GDK_f:
@@ -2453,51 +2467,6 @@ void vol_button_value_changed_callback(GtkScaleButton
}
#endif
-gboolean slide_panel_away(gpointer data)
-{
- if (!showcontrols)
- return FALSE;
-
- if (fs_controls == NULL) {
- return FALSE;
- }
-
- if (!(fullscreen || always_hide_after_timeout)) {
- //gtk_widget_set_size_request(fs_controls, -1, -1);
- return FALSE;
- }
-
- if (g_mutex_trylock(slide_away)) {
- // mutex is locked now, unlock it and exit function
- g_mutex_unlock(slide_away);
- return FALSE;
- }
- // mutex was already locked, this is good since we only want to do the animation if locked
-
- if (GTK_IS_WIDGET(fs_controls) && gmtk_get_visible(fs_controls) && mouse_over_controls == FALSE) {
- gtk_widget_hide(fs_controls);
- g_mutex_unlock(slide_away);
- return FALSE;
- /*
- if (fs_controls->allocation.height <= 1) {
- gtk_widget_hide(fs_controls);
- g_mutex_unlock(slide_away);
- return FALSE;
- } else {
- //if (disable_animation) {
- gtk_widget_set_size_request(fs_controls, fs_controls->allocation.width, 0);
- //} else {
- // gtk_widget_set_size_request(fs_controls, fs_controls->allocation.width,
- // fs_controls->allocation.height - 1);
- //}
- return TRUE;
- }
- */
- }
- g_mutex_unlock(slide_away);
- return FALSE;
-}
-
gboolean make_panel_and_mouse_invisible(gpointer data)
{
GTimeVal currenttime;
@@ -2515,10 +2484,6 @@ gboolean make_panel_and_mouse_invisible(gpointer data)
g_get_current_time(&currenttime);
g_time_val_add(&currenttime, -auto_hide_timeout * G_USEC_PER_SEC);
if (last_movement_time > 0 && currenttime.tv_sec > last_movement_time) {
- //if (g_mutex_trylock(slide_away)) {
- // g_timeout_add(40, slide_panel_away, NULL);
- //}
- // gtk_widget_hide(controls_box);
hide_fs_controls();
}
@@ -2569,7 +2534,6 @@ gboolean make_panel_and_mouse_invisible(gpointer data)
gboolean make_panel_and_mouse_visible(gpointer data)
{
- g_mutex_unlock(slide_away);
if (showcontrols && GTK_IS_WIDGET(controls_box)) {
//gtk_widget_set_size_request(controls_box, -1, -1);
//gtk_widget_show(controls_box);
@@ -3247,6 +3211,7 @@ void menuitem_save_callback(GtkMenuItem * menuitem, vo
void menuitem_quit_callback(GtkMenuItem * menuitem, void *data)
{
delete_callback(NULL, NULL, NULL);
+ gtk_widget_destroy(window);
}
void menuitem_prev_callback(GtkMenuItem * menuitem, void *data)
@@ -6888,6 +6853,7 @@ GtkWidget *create_window(gint windowid)
gtk_widget_add_events(window, GDK_STRUCTURE_MASK);
gtk_widget_add_events(window, GDK_POINTER_MOTION_MASK);
delete_signal_id = g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(delete_callback), NULL);
+ g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(destroy_callback), NULL);
g_signal_connect(G_OBJECT(window), "motion_notify_event", G_CALLBACK(motion_notify_callback), NULL);
g_signal_connect(G_OBJECT(window), "window_state_event", G_CALLBACK(window_state_callback), NULL);
g_signal_connect(G_OBJECT(window), "configure_event", G_CALLBACK(configure_callback), NULL);

12
x11/gnome-mplayer/patches/patch-src_gui_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_gui_h,v 1.5 2012/04/06 10:14:44 dcoppa Exp $
Separate delete and destroy events
(upstream svn revisions r2232 & r2233)
--- src/gui.h.orig Tue Feb 21 19:04:44 2012
+++ src/gui.h Fri Apr 6 11:42:28 2012
@@ -362,3 +362,4 @@ gint get_index_from_key_and_modifier(guint key, GdkMod
void show_fs_controls();
void hide_fs_controls();
+gboolean set_destroy(gpointer data);

35
x11/gnome-mplayer/patches/patch-src_main_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-src_main_c,v 1.19 2012/04/06 10:14:44 dcoppa Exp $
Separate delete and destroy events
(upstream svn revisions r2232 & r2233)
Remove deprecated slide_away code to unbreak with glib-2.32
(upstream svn revision r2234)
--- src/main.c.orig Thu Mar 22 05:58:16 2012
+++ src/main.c Fri Apr 6 11:42:28 2012
@@ -594,6 +594,7 @@ static void hup_handler(int signum)
{
// printf("handling signal %i\n",signum);
delete_callback(NULL, NULL, NULL);
+ g_idle_add(set_destroy, NULL);
}
#endif
@@ -734,7 +735,6 @@ int main(int argc, char *argv[])
subtitle_fuzziness = 0;
disable_embeddedfonts = FALSE;
quit_on_complete = FALSE;
- slide_away = NULL;
verbose = 0;
reallyverbose = 0;
embedding_disabled = FALSE;
@@ -1066,8 +1066,6 @@ int main(int argc, char *argv[])
create_window(embed_window);
autopause = FALSE;
- slide_away = g_mutex_new();
- mplayer_complete_cond = g_cond_new();
#ifdef GIO_ENABLED
idledata->caching = g_mutex_new();
idledata->caching_complete = g_cond_new();