Apply some small bugfixes from upstream: see patches for descriptions.
This commit is contained in:
parent
9a061fbc55
commit
30c70a8a68
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2010/06/12 15:27:34 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2010/07/08 06:35:13 dcoppa Exp $
|
||||
|
||||
COMMENT = gnome-mplayer browser media plugin
|
||||
V = 0.9.9.2
|
||||
DISTNAME = gecko-mediaplayer-$V
|
||||
PKGNAME = ${DISTNAME}p1
|
||||
PKGNAME = ${DISTNAME}p2
|
||||
CATEGORIES = www
|
||||
|
||||
MAINTAINER = David Coppa <dcoppa@openbsd.org>
|
||||
|
@ -1,7 +1,8 @@
|
||||
$OpenBSD: patch-src_plugin_list_cpp,v 1.2 2010/03/29 12:17:42 dcoppa Exp $
|
||||
$OpenBSD: patch-src_plugin_list_cpp,v 1.3 2010/07/08 06:35:13 dcoppa Exp $
|
||||
|
||||
fix from upstream svn:
|
||||
fixes from upstream svn:
|
||||
give each item in the RAM playlist a unique id
|
||||
mark asx files with ENTRY in them as non-playable
|
||||
|
||||
--- src/plugin_list.cpp.orig Tue Feb 23 17:12:37 2010
|
||||
+++ src/plugin_list.cpp Tue Mar 23 17:14:09 2010
|
||||
@ -13,7 +14,15 @@ give each item in the RAM playlist a unique id
|
||||
printf("path = %s\n", item->path);
|
||||
printf("controlid = %i\n", item->controlid);
|
||||
printf("playerready = %i\n", item->playerready);
|
||||
@@ -713,7 +714,7 @@ GList *list_parse_ram(GList * list, ListItem * item)
|
||||
@@ -603,6 +604,7 @@ asx_start_element(GMarkupParseContext * context,
|
||||
}
|
||||
}
|
||||
if (g_ascii_strcasecmp(element_name, "ENTRY") == 0) {
|
||||
+ parser_item->play = 0;
|
||||
entry_id = entry_id + 100;
|
||||
}
|
||||
}
|
||||
@@ -713,7 +715,7 @@ GList *list_parse_ram(GList * list, ListItem * item)
|
||||
if (item->localsize < (16 * 1024)) {
|
||||
if (g_file_get_contents(item->local, &data, &datalen, NULL)) {
|
||||
if (data != NULL) {
|
||||
@ -22,7 +31,7 @@ give each item in the RAM playlist a unique id
|
||||
parser_list = list;
|
||||
parser_item = item;
|
||||
i = 0;
|
||||
@@ -755,7 +756,7 @@ GList *list_parse_ram(GList * list, ListItem * item)
|
||||
@@ -755,7 +757,7 @@ GList *list_parse_ram(GList * list, ListItem * item)
|
||||
newitem->src[3] = g_ascii_tolower(newitem->src[3]);
|
||||
}
|
||||
newitem->play = TRUE;
|
||||
|
@ -1,12 +1,28 @@
|
||||
$OpenBSD: patch-src_plugin_setup_cpp,v 1.1 2010/03/29 12:17:42 dcoppa Exp $
|
||||
$OpenBSD: patch-src_plugin_setup_cpp,v 1.2 2010/07/08 06:35:13 dcoppa Exp $
|
||||
|
||||
fixes from upstream svn:
|
||||
move "stream" test to streaming function
|
||||
change it from int to boolean
|
||||
protect against NULL console
|
||||
|
||||
--- src/plugin_setup.cpp.orig Tue Feb 23 17:12:37 2010
|
||||
+++ src/plugin_setup.cpp Tue Mar 23 17:14:09 2010
|
||||
@@ -524,38 +524,41 @@ void new_instance(CPlugin * instance, int16_t argc, ch
|
||||
@@ -80,9 +80,11 @@ void new_instance(CPlugin * instance, int16_t argc, ch
|
||||
|
||||
if (g_ascii_strcasecmp(argn[i], "console") == 0) {
|
||||
instance->console = g_strdup(argv[i]);
|
||||
- for (j = 0; j < strlen(instance->console); j++) {
|
||||
- if (!g_ascii_isalnum(instance->console[j])) {
|
||||
- instance->console[j] = 'a';
|
||||
+ if (instance->console != NULL) {
|
||||
+ for (j = 0; j < strlen(instance->console); j++) {
|
||||
+ if (!g_ascii_isalnum(instance->console[j])) {
|
||||
+ instance->console[j] = 'a';
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -524,38 +526,41 @@ void new_instance(CPlugin * instance, int16_t argc, ch
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user