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

Update to 1.0.9b

Browse Source
This commit is contained in:
dcoppa 2014-01-13 11:28:03 +00:00
parent 639d977673
commit d6711b4922
8 changed files with 21 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gmtk/Makefile
View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.22 2013/11/06 07:28:25 dcoppa Exp $
# $OpenBSD: Makefile,v 1.23 2014/01/13 11:28:03 dcoppa Exp $
COMMENT = gnome-mplayer toolkit
DISTNAME = gmtk-1.0.9a
PKGNAME = gmtk-1.0.9alpha
REVISION = 0
DISTNAME = gmtk-1.0.9b
SHARED_LIBS = gmlib 2.0 \
gmtk 2.0

4
x11/gmtk/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gmtk-1.0.9a.tar.gz) = WU+/Szlm8oubtIWoTrTaLOdRlYNkYQG2tF7Z5GviLRU=
SIZE (gmtk-1.0.9a.tar.gz) = 410020
SHA256 (gmtk-1.0.9b.tar.gz) = 7BPnyXvkyFw7HlkUnIccAdCqsP03w51UmnRDTFKDxR8=
SIZE (gmtk-1.0.9b.tar.gz) = 411557

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

@ -1,54 +0,0 @@
$OpenBSD: patch-src_gmtk_media_player_c,v 1.15 2013/11/06 07:28:25 dcoppa Exp $
Fix parameter warning to gtk_widget_get_visible
(upstream svn revision r232)
Add key bindings for h tv_step_channel down and k tv_step_channel
up (upstream svn revision r228)
Only do the media player allocation event if no video is present
(upstream svn revision r233)
--- src/gmtk_media_player.c.orig Fri Aug 16 17:18:55 2013
+++ src/gmtk_media_player.c Wed Nov 6 07:58:52 2013
@@ -147,7 +147,7 @@ gboolean signal_event(gpointer data)
break;
case EVENT_TYPE_ALLOCATION:
- if (gtk_widget_get_visible(event->player)) {
+ if (gtk_widget_get_visible(GTK_WIDGET(event->player))) {
if (!(event->event_allocation->width >= 65535 || event->event_allocation->height >= 65535))
g_signal_emit_by_name(event->player, event->event_name, event->event_allocation);
}
@@ -834,6 +834,12 @@ static gboolean player_key_press_event_callback(GtkWid
case GDK_o:
write_to_mplayer(player, "osd\n");
break;
+ case GDK_h:
+ write_to_mplayer(player, "tv_step_channel -1\n");
+ break;
+ case GDK_k:
+ write_to_mplayer(player, "tv_step_channel 1\n");
+ break;
default:
gm_log(player->debug, G_LOG_LEVEL_INFO, "ignoring key %s%s%s%s",
(event->state & GDK_CONTROL_MASK) ? "Control-" : "", (event->state & GDK_MOD1_MASK) ? "Alt-" : "",
@@ -2375,7 +2381,6 @@ gpointer launch_mplayer(gpointer data)
player->seekable = FALSE;
player->has_chapters = FALSE;
- player->video_present = FALSE;
player->position = 0.0;
player->cache_percent = -1.0;
player->title_is_menu = FALSE;
@@ -3379,7 +3384,9 @@ gboolean thread_reader(GIOChannel * source, GIOConditi
create_event_int(player, "media-state-changed", player->media_state);
allocation.width = player->video_width;
allocation.height = player->video_height;
- create_event_allocation(player, "size_allocate", &allocation);
+ if (player->video_present == FALSE) {
+ create_event_allocation(player, "size_allocate", &allocation);
+ }
player->video_present = TRUE;
buf = g_strdup_printf("set_property sub_visibility %i\n", player->sub_visible);
write_to_mplayer(player, buf);

8
x11/gmtk/patches/patch-src_gmtk_pc_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_gmtk_pc_in,v 1.1 2013/10/07 10:20:29 dcoppa Exp $
--- src/gmtk.pc.in.orig Mon Oct 7 10:54:02 2013
+++ src/gmtk.pc.in Mon Oct 7 10:54:21 2013
@@ -10,7 +10,7 @@ gtk3=@ENABLE_GTK3@
$OpenBSD: patch-src_gmtk_pc_in,v 1.2 2014/01/13 11:28:03 dcoppa Exp $
--- src/gmtk.pc.in.orig Mon Nov 25 20:44:49 2013
+++ src/gmtk.pc.in Mon Jan 13 11:29:57 2014
@@ -11,7 +11,7 @@ backend=@BACKEND@
Name: gmtk
Description: Gnome Media Player Toolkit
Version: @VERSION@

8
x11/gnome-mplayer/Makefile
View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.81 2013/11/06 07:29:30 dcoppa Exp $
# $OpenBSD: Makefile,v 1.82 2014/01/13 11:28:03 dcoppa Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
V = 1.0.9alpha
DISTNAME = gnome-mplayer-1.0.9a
PKGNAME = gnome-mplayer-${V}
REVISION = 0
V = 1.0.9b
DISTNAME = gnome-mplayer-${V}
CATEGORIES = x11 multimedia
MAINTAINER = David Coppa <dcoppa@openbsd.org>

4
x11/gnome-mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome-mplayer-1.0.9a.tar.gz) = f/EqIRFNIlGhaoHvWd8LJ/JwJUfJ1btXE8qb2Fu9mSc=
SIZE (gnome-mplayer-1.0.9a.tar.gz) = 1067990
SHA256 (gnome-mplayer-1.0.9b.tar.gz) = zHJnZpNzBOlzvci6ZRdVBRgMd1Zeh0dqd8KSbi71bKg=
SIZE (gnome-mplayer-1.0.9b.tar.gz) = 1081383

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

@ -1,4 +1,7 @@
$OpenBSD: patch-src_common_h,v 1.11 2013/11/06 07:29:30 dcoppa Exp $
$OpenBSD: patch-src_common_h,v 1.12 2014/01/13 11:28:03 dcoppa Exp $
Fix problem with remembered softvol not being loaded
--- src/common.h.orig Tue Jul 23 22:36:58 2013
+++ src/common.h Wed Nov 6 08:15:39 2013
@@ -317,7 +317,6 @@ gboolean softvol;

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

@ -1,24 +1,10 @@
$OpenBSD: patch-src_gui_c,v 1.38 2013/11/06 07:29:30 dcoppa Exp $
Set window properties to be common for all the created windows
(upstream svn revision r2461)
$OpenBSD: patch-src_gui_c,v 1.39 2014/01/13 11:28:03 dcoppa Exp $
Fix problem with remembered softvol not being loaded
--- src/gui.c.orig Fri Aug 16 16:40:22 2013
+++ src/gui.c Wed Nov 6 08:16:23 2013
@@ -1377,7 +1377,9 @@ void create_folder_progress_window()
cancel_folder_load = FALSE;
folder_progress_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_modal(GTK_WINDOW(folder_progress_window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(folder_progress_window), GDK_WINDOW_TYPE_HINT_UTILITY);
+ gtk_window_set_transient_for(GTK_WINDOW(folder_progress_window), GTK_WINDOW(window));
+ gtk_window_set_position(GTK_WINDOW(folder_progress_window), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_icon(GTK_WINDOW(folder_progress_window), pb_icon);
gtk_window_set_resizable(GTK_WINDOW(folder_progress_window), FALSE);
gtk_widget_set_size_request(folder_progress_window, 400, -1);
@@ -1706,11 +1708,6 @@ gboolean set_volume(void *data)
--- src/gui.c.orig Fri Jan 3 18:08:33 2014
+++ src/gui.c Mon Jan 13 11:27:17 2014
@@ -1708,11 +1708,6 @@ gboolean set_volume(void *data)
if (!(softvol || audio_device.type == AUDIO_TYPE_SOFTVOL)) {
gm_audio_get_volume(&audio_device);
}
@ -30,36 +16,3 @@ Fix problem with remembered softvol not being loaded
gm_log(verbose, G_LOG_LEVEL_DEBUG, "data is null new volume is %f", audio_device.volume);
#ifdef GTK2_12_ENABLED
gtk_scale_button_set_value(GTK_SCALE_BUTTON(vol_slider), audio_device.volume);
@@ -3236,6 +3233,10 @@ void menuitem_open_location_callback(GtkMenuItem * men
GtkWidget *open_button;
open_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_type_hint(GTK_WINDOW(open_window), GDK_WINDOW_TYPE_HINT_UTILITY);
+ gtk_window_set_resizable(GTK_WINDOW(open_window), FALSE);
+ gtk_window_set_transient_for(GTK_WINDOW(open_window), GTK_WINDOW(window));
+ gtk_window_set_position(GTK_WINDOW(open_window), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_icon(GTK_WINDOW(open_window), pb_icon);
gtk_window_set_resizable(GTK_WINDOW(open_window), FALSE);
@@ -4827,6 +4828,10 @@ void menuitem_advanced_callback(GtkMenuItem * menuitem
adv_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_type_hint(GTK_WINDOW(adv_window), GDK_WINDOW_TYPE_HINT_UTILITY);
gtk_window_set_resizable(GTK_WINDOW(adv_window), FALSE);
+ gtk_window_set_icon(GTK_WINDOW(adv_window), pb_icon);
+ gtk_window_set_transient_for(GTK_WINDOW(adv_window), GTK_WINDOW(window));
+ gtk_window_set_position(GTK_WINDOW(adv_window), GTK_WIN_POS_CENTER_ON_PARENT);
+
gtk_window_set_title(GTK_WINDOW(adv_window), _("Video Picture Adjustments"));
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
@@ -5310,6 +5315,10 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
GdkModifierType modifier;
config_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_type_hint(GTK_WINDOW(config_window), GDK_WINDOW_TYPE_HINT_UTILITY);
+ gtk_window_set_resizable(GTK_WINDOW(config_window), FALSE);
+ gtk_window_set_transient_for(GTK_WINDOW(config_window), GTK_WINDOW(window));
+ gtk_window_set_position(GTK_WINDOW(config_window), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_icon(GTK_WINDOW(config_window), pb_icon);
gtk_window_set_resizable(GTK_WINDOW(config_window), FALSE);