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

Play on the safe side: not all machines support xv video output

Browse Source 
(loongson comes to mind), and thus use 'x11' by default.

While here, enable dark theme only when using GTK+3 (fixes warning
at startup).
This commit is contained in:
dcoppa 2012-01-23 13:06:32 +00:00
parent f9009dcbd1
commit 6859c43911
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome-mplayer/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.53 2012/01/11 12:45:25 dcoppa Exp $
# $OpenBSD: Makefile,v 1.54 2012/01/23 13:06:32 dcoppa Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
V = 1.0.5
DISTNAME = gnome-mplayer-${V}
REVISION = 1
REVISION = 2
CATEGORIES = x11 multimedia
MAINTAINER = David Coppa <dcoppa@openbsd.org>

8
x11/gnome-mplayer/patches/patch-apps_gnome-mplayer_preferences_gschema_xml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-apps_gnome-mplayer_preferences_gschema_xml,v 1.4 2012/01/09 12:10:22 dcoppa Exp $
$OpenBSD: patch-apps_gnome-mplayer_preferences_gschema_xml,v 1.5 2012/01/23 13:06:32 dcoppa Exp $
Set some sane defaults:
use xv as default video output
use x11 as default video output
disable bar animation in full screen
use mplayer's software volume control
use xscrnsaver controls over gnome-power-manager
@ -11,13 +11,13 @@ use sndio as default audio device
use English as default language
--- apps.gnome-mplayer.preferences.gschema.xml.orig Fri Jul 29 14:59:45 2011
+++ apps.gnome-mplayer.preferences.gschema.xml Mon Jan 9 12:09:37 2012
+++ apps.gnome-mplayer.preferences.gschema.xml Mon Jan 23 12:05:04 2012
@@ -1,7 +1,7 @@
<schemalist>
<schema id="apps.gnome-mplayer.preferences" path="/apps/gnome-mplayer/preferences/">
<key name="vo" type="s">
- <default>''</default>
+ <default>'xv'</default>
+ <default>'x11'</default>
<summary>Default video output</summary>
<description>Default video output</description>
</key>

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

@ -1,10 +1,13 @@
$OpenBSD: patch-src_main_c,v 1.14 2012/01/11 12:45:25 dcoppa Exp $
$OpenBSD: patch-src_main_c,v 1.15 2012/01/23 13:06:32 dcoppa Exp $
Fix problem with directory vs dvd detection
(upstream svn revision r2201)
Enable dark theme only when using GTK+3
(upstream svn revision r2205)
--- src/main.c.orig Fri Dec 16 20:55:51 2011
+++ src/main.c Wed Jan 11 13:39:39 2012
+++ src/main.c Mon Jan 23 13:48:03 2012
@@ -659,6 +659,7 @@ int main(int argc, char *argv[])
gchar *accelerator_keys;
gchar **parse;
@ -13,7 +16,20 @@ Fix problem with directory vs dvd detection
#ifndef OS_WIN32
struct sigaction sa;
@@ -1078,14 +1079,15 @@ int main(int argc, char *argv[])
@@ -1053,10 +1054,12 @@ int main(int argc, char *argv[])
G_TYPE_FLOAT, G_TYPE_FLOAT, G_TYPE_BOOLEAN);
// only use dark theme if not embedded, otherwise use the default theme
+#ifdef GTK3_ENABLED
if (embed_window <= 0) {
gtk_settings = gtk_settings_get_default();
g_object_set(G_OBJECT(gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
}
+#endif
create_window(embed_window);
@@ -1078,14 +1081,15 @@ int main(int argc, char *argv[])
g_object_unref(file);
}
filename = g_filename_from_uri(uri, NULL, NULL);
@ -31,7 +47,7 @@ Fix problem with directory vs dvd detection
printf("is block %i\n", S_ISBLK(buf.st_mode));
printf("is character %i\n", S_ISCHR(buf.st_mode));
printf("is reg %i\n", S_ISREG(buf.st_mode));
@@ -1093,7 +1095,7 @@ int main(int argc, char *argv[])
@@ -1093,7 +1097,7 @@ int main(int argc, char *argv[])
printf("playlist %i\n", playlist);
printf("embedded in window id 0x%x\n", embed_window);
}
@ -40,7 +56,7 @@ Fix problem with directory vs dvd detection
// might have a block device, so could be a DVD
#ifdef HAVE_SYS_MOUNT_H
@@ -1148,11 +1150,11 @@ int main(int argc, char *argv[])
@@ -1148,11 +1152,11 @@ int main(int argc, char *argv[])
playiter = TRUE;
}
}