Hi,
New major releases for gnome-mplayer and gecko-mediaplayer.
I'd like to disable GConf support, since now plain-text configuration
backend (~/.config/gnome-mplayer/) is sufficiently mature and gconf
support is known to cause problem with, at least, Chromium browser.
Let me know if there are objections to this and I'll provide revised
patches...
ciao
David
Index: www/gecko-mediaplayer/Makefile
===================================================================
RCS file: /cvs/ports/www/gecko-mediaplayer/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/gecko-mediaplayer/Makefile 24 Oct 2010 21:40:09 -0000 1.14
+++ www/gecko-mediaplayer/Makefile 8 Nov 2010 13:06:15 -0000
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2010/10/24 21:40:09 ajacoutot Exp $
COMMENT = gnome-mplayer browser media plugin
-V = 0.9.9.2
+V = 1.0.0
DISTNAME = gecko-mediaplayer-${V}
-REVISION = 3
CATEGORIES = www
MAINTAINER = David Coppa <dco...@openbsd.org>
@@ -18,11 +17,10 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = ORBit-2 dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 \
- gobject-2.0 gthread-2.0 m stdc++
+WANTLIB = dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 \
+ gthread-2.0 m stdc++
-MODULES = devel/gettext \
- devel/gconf2
+MODULES = devel/gettext
BUILD_DEPENDS =
:xulrunner-devel->=1.9.2:devel/xulrunner/1.9,-devel
RUN_DEPENDS = :gnome-mplayer->=${V}:x11/gnome-mplayer
@@ -39,9 +37,9 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS = --with-gconf \
- --enable-new-libxul \
+CONFIGURE_ARGS = --enable-new-libxul \
--with-xulrunner-sdk=${LOCALBASE}/xulrunner1.9 \
- --with-plugin-dir=${LOCALBASE}/lib/mozilla/plugins
+ --with-plugin-dir=${LOCALBASE}/lib/mozilla/plugins \
+ --without-gconf
.include <bsd.port.mk>
Index: www/gecko-mediaplayer/distinfo
===================================================================
RCS file: /cvs/ports/www/gecko-mediaplayer/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- www/gecko-mediaplayer/distinfo 29 Mar 2010 12:17:42 -0000 1.3
+++ www/gecko-mediaplayer/distinfo 8 Nov 2010 13:06:15 -0000
@@ -1,5 +1,5 @@
-MD5 (gecko-mediaplayer-0.9.9.2.tar.gz) = 3rQaS8veK3jVSNw3toTPuw==
-RMD160 (gecko-mediaplayer-0.9.9.2.tar.gz) = JDJrp11Mczvidf5aZKWf7QaMlg4=
-SHA1 (gecko-mediaplayer-0.9.9.2.tar.gz) = +5Ygu7nk3yen5Yjc89C25VGIwmI=
-SHA256 (gecko-mediaplayer-0.9.9.2.tar.gz) =
N4tsFJ5B79Xw5HyKcR17PhCECctyxvlQSsSoeR3oPNY=
-SIZE (gecko-mediaplayer-0.9.9.2.tar.gz) = 262053
+MD5 (gecko-mediaplayer-1.0.0.tar.gz) = gMy2ca6pAVO+n55txBt+rg==
+RMD160 (gecko-mediaplayer-1.0.0.tar.gz) = IYE0wIhmmuFasSt/AI2YivProwg=
+SHA1 (gecko-mediaplayer-1.0.0.tar.gz) = cC+7R7Rbkvz/vNMkmD6WqAJ7wHU=
+SHA256 (gecko-mediaplayer-1.0.0.tar.gz) =
0OXWUWyUPeIldmHUcYyRqoeOJD0/qJGhIemciHkpSZ4=
+SIZE (gecko-mediaplayer-1.0.0.tar.gz) = 263320
Index: www/gecko-mediaplayer/patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- www/gecko-mediaplayer/patches/patch-configure 22 Sep 2010 15:25:26
-0000 1.4
+++ www/gecko-mediaplayer/patches/patch-configure 8 Nov 2010 13:06:15
-0000
@@ -4,10 +4,10 @@ use -pthread instead of -lpthread for pt
remove -ldl
fix GECKO_CFLAGS and GECKO_LIBS
---- configure.orig Wed Sep 22 16:12:14 2010
-+++ configure Wed Sep 22 16:14:37 2010
-@@ -8710,8 +8710,8 @@ fi
- if test "${with_xulrunner_sdk+set}" = set; then
+--- configure.orig Fri Nov 5 17:13:48 2010
++++ configure Mon Nov 8 12:27:11 2010
+@@ -7206,8 +7206,8 @@ fi
+ if test "${with_xulrunner_sdk+set}" = set; then :
withval=$with_xulrunner_sdk;
XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
- GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include
-I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr
-I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string
-I$XULRUNNER_SDK_PREFIX/include/java"
@@ -15,5 +15,5 @@ fix GECKO_CFLAGS and GECKO_LIBS
+ GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -DOPENBSD"
+ GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX -lxpcomglue_s -lxul -lxpcom -lplds4
-lplc4 -lnspr4 -pthread"
# Check whether --enable-new-libxul was given.
- if test "${enable_new_libxul+set}" = set; then
+ if test "${enable_new_libxul+set}" = set; then :
enableval=$enable_new_libxul; usenewlibxul=$enableval
Index: www/gecko-mediaplayer/patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_Makefile_in
--- www/gecko-mediaplayer/patches/patch-src_Makefile_in 29 Mar 2010 12:17:42
-0000 1.3
+++ www/gecko-mediaplayer/patches/patch-src_Makefile_in 8 Nov 2010 13:06:15
-0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 20
fix library linking (remove -ldl)
---- src/Makefile.in.orig Tue Mar 23 16:44:56 2010
-+++ src/Makefile.in Tue Mar 23 16:46:04 2010
-@@ -331,35 +331,35 @@ gecko_mediaplayer_so_SOURCES = \
+--- src/Makefile.in.orig Fri Nov 5 17:13:49 2010
++++ src/Makefile.in Mon Nov 8 12:27:11 2010
+@@ -332,35 +332,35 @@ gecko_mediaplayer_so_SOURCES = \
gecko_mediaplayer_so_CFLAGS = -fPIC
gecko_mediaplayer_so_LDFLAGS = -shared -fPIC
Index: www/gecko-mediaplayer/patches/patch-src_plugin_cpp
===================================================================
RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_cpp
diff -N www/gecko-mediaplayer/patches/patch-src_plugin_cpp
--- www/gecko-mediaplayer/patches/patch-src_plugin_cpp 29 Mar 2010 12:17:42
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_plugin_cpp,v 1.2 2010/03/29 12:17:42 dcoppa Exp $
-
-fix from upstream svn:
-if url has "stream" in it, mark the url as streaming
-
---- src/plugin.cpp.orig Wed Feb 24 17:04:17 2010
-+++ src/plugin.cpp Wed Mar 24 12:09:35 2010
-@@ -37,7 +37,6 @@
-
-
- #include "plugin.h"
--//#include "npupp.h"
- #include "plugin_list.h"
- #include "plugin_setup.h"
- #include "plugin_types.h"
-@@ -921,8 +920,10 @@ int32 CPlugin::Write(NPStream * stream, int32 offset,
- return -1;
- }
-
-- if (strstr((char *) buffer, "ICY 200 OK") != NULL || strstr((char *)
buffer, "Content-length:") != NULL // If item is a block of jpeg images,
just stream it
-- || strstr((char *) buffer, "<HTML>") != NULL || item->streaming ==
TRUE) {
-+ if (strstr((char *) buffer, "ICY 200 OK") != NULL
-+ || strstr((char *) buffer, "Content-length:") != NULL // If item
is a block of jpeg images, just stream it
-+ || strstr((char *) buffer, "<HTML>") != NULL
-+ || item->streaming == TRUE) {
- // || stream->lastmodified == 0) { this is not valid for many
sites
-
- // printf("BUFFER='%s'\n", buffer);
Index: www/gecko-mediaplayer/patches/patch-src_plugin_list_cpp
===================================================================
RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_list_cpp
diff -N www/gecko-mediaplayer/patches/patch-src_plugin_list_cpp
--- www/gecko-mediaplayer/patches/patch-src_plugin_list_cpp 8 Jul 2010
06:35:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-$OpenBSD: patch-src_plugin_list_cpp,v 1.3 2010/07/08 06:35:13 dcoppa Exp $
-
-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
-@@ -215,6 +215,7 @@ void list_dump(GList * list)
- printf("id = %i\n", item->id);
- printf("hrefid = %i\n", item->hrefid);
- printf("play = %i\n", item->play);
-+ printf("played = %i\n", item->played);
- printf("path = %s\n", item->path);
- printf("controlid = %i\n", item->controlid);
- printf("playerready = %i\n", item->playerready);
-@@ -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) {
-- output = g_strsplit(data, "\n", 0);
-+ output = g_strsplit_set(data, "\n\r", 0);
- parser_list = list;
- parser_item = item;
- i = 0;
-@@ -755,7 +757,7 @@ GList *list_parse_ram(GList * list, ListItem * item)
- newitem->src[3] =
g_ascii_tolower(newitem->src[3]);
- }
- newitem->play = TRUE;
-- newitem->id = entry_id;
-+ newitem->id = ++entry_id;
- newitem->controlid = parser_item->controlid;
- g_strlcpy(newitem->path, parser_item->path, 1024);
- parser_list = g_list_append(parser_list, newitem);
Index: www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
===================================================================
RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
diff -N www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
--- www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp 8 Jul 2010
06:35:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-$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
-@@ -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
-
- }
-
--gint streaming(gchar * url)
-+gboolean streaming(gchar * url)
- {
-- gint ret = 0;
-+ gboolean ret = FALSE;
- char *p;
-
- if (g_ascii_strncasecmp(url, "mms://", 6) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_ascii_strncasecmp(url, "mmst://", 7) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_ascii_strncasecmp(url, "mmsu://", 7) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_ascii_strncasecmp(url, "rtsp://", 7) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_ascii_strncasecmp(url, "tv://", 5) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_ascii_strncasecmp(url, "dvd://", 6) == 0)
-- ret = 1;
-+ ret = TRUE;
-
- if (g_strrstr(url, ".m3u") != NULL)
-- ret = 1;
-+ ret = TRUE;
-
-+ if (g_strrstr(url, "stream") != NULL)
-+ ret = TRUE;
-+
- if (g_ascii_strncasecmp(url, "file://", 7) == 0) {
- p = g_filename_from_uri(url, NULL, NULL);
- if (p != NULL) {
- if (g_file_test(p, G_FILE_TEST_EXISTS)) {
- g_strlcpy(url, p, 1024);
-- ret = 1;
-+ ret = TRUE;
- }
- g_free(p);
- }
Index: www/gecko-mediaplayer/patches/patch-src_plugin_setup_h
===================================================================
RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_setup_h
diff -N www/gecko-mediaplayer/patches/patch-src_plugin_setup_h
--- www/gecko-mediaplayer/patches/patch-src_plugin_setup_h 29 Mar 2010
12:17:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_plugin_setup_h,v 1.1 2010/03/29 12:17:42 dcoppa Exp $
-
-fixes from upstream svn:
-move "stream" test to streaming function
-change it from int to boolean
-
---- src/plugin_setup.h.orig Tue Feb 23 17:12:37 2010
-+++ src/plugin_setup.h Tue Mar 23 17:14:09 2010
-@@ -42,6 +42,6 @@
-
- // void new_instance(CPlugin * instance, nsPluginCreateData * parameters);
- void new_instance(CPlugin * instance, int16_t argc, char *argn[], char
*argv[]);
--gint streaming(gchar * url);
-+gboolean streaming(gchar * url);
-
- #endif // _PLUGIN_SETUP_H
Index: www/gecko-mediaplayer/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/gecko-mediaplayer/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- www/gecko-mediaplayer/pkg/PLIST 12 Jun 2010 15:27:34 -0000 1.4
+++ www/gecko-mediaplayer/pkg/PLIST 8 Nov 2010 13:06:15 -0000
@@ -15,6 +15,7 @@ share/doc/gecko-mediaplayer/NEWS
share/doc/gecko-mediaplayer/README
share/doc/gecko-mediaplayer/javascript.txt
share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo
+share/locale/de/LC_MESSAGES/gecko-mediaplayer.mo
share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo
share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo
share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo
@@ -23,7 +24,3 @@ share/locale/nl/LC_MESSAGES/gecko-mediap
share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo
share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo
share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo
-...@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >
/dev/null
-${SCHEMAS_INSTDIR}/
-${SCHEMAS_INSTDIR}/gecko-mediaplayer.schemas
-...@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas >
/dev/null
Index: x11/gnome-mplayer/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- x11/gnome-mplayer/Makefile 24 Oct 2010 21:15:32 -0000 1.24
+++ x11/gnome-mplayer/Makefile 8 Nov 2010 13:06:28 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.24 2010/10/24 21:15:32 ajacoutot Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
-DISTNAME = gnome-mplayer-0.9.9.2
-REVISION= 5
+DISTNAME = gnome-mplayer-1.0.0
CATEGORIES = x11 multimedia
MAINTAINER = David Coppa <dco...@openbsd.org>
@@ -17,16 +16,15 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 c cairo \
- dbus-1 dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 \
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender Xss Xxf86vm atk-1.0 c cairo \
+ dbus-1 dbus-glib-1 drm expat fontconfig freetype gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 gtk-x11-2.0 m neon pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread pthread-stubs musicbrainz3 \
- xcb xcb-render xcb-render-util z notify gpod curl
+ xcb xcb-render xcb-shm z notify gpod curl
-MODULES = devel/gettext \
- devel/gconf2
+MODULES = devel/gettext
LIB_DEPENDS = ::devel/libnotify \
::audio/libgpod \
@@ -48,18 +46,13 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${LOCALBASE}/lib \
-L${X11BASE}/lib -pthread"
CONFIGURE_ARGS = --with-gio \
- --with-gconf \
--with-libnotify \
--with-libgpod \
--with-libmusicbrainz3 \
--enable-panscan \
--without-alsa \
--without-flat-volume \
+ --without-gconf \
--disable-nautilus
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${SCHEMAS_INSTDIR}
- ${INSTALL_DATA} ${WRKSRC}/gnome-mplayer.schemas \
- ${PREFIX}/${SCHEMAS_INSTDIR}
.include <bsd.port.mk>
Index: x11/gnome-mplayer/distinfo
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- x11/gnome-mplayer/distinfo 29 Mar 2010 12:16:07 -0000 1.4
+++ x11/gnome-mplayer/distinfo 8 Nov 2010 13:06:28 -0000
@@ -1,5 +1,5 @@
-MD5 (gnome-mplayer-0.9.9.2.tar.gz) = eYEJE9JFdVtgwn034dHxeA==
-RMD160 (gnome-mplayer-0.9.9.2.tar.gz) = DnPhxhCfB7ln8wvXIl6sfpxsnOY=
-SHA1 (gnome-mplayer-0.9.9.2.tar.gz) = tGpua87I0hS3vSV+k5sL/1xn9mA=
-SHA256 (gnome-mplayer-0.9.9.2.tar.gz) =
aVpUwA210KD1lusaEKWK0ypE6NbHWF18huDXXO8KSLQ=
-SIZE (gnome-mplayer-0.9.9.2.tar.gz) = 828006
+MD5 (gnome-mplayer-1.0.0.tar.gz) = LIx+Z5+gLlJPrOP9tQSznQ==
+RMD160 (gnome-mplayer-1.0.0.tar.gz) = HWQJTC5yNp0GzJdob7xDPf7odjg=
+SHA1 (gnome-mplayer-1.0.0.tar.gz) = 75TDFwzE1CVAPI3mfvuPZNx/di8=
+SHA256 (gnome-mplayer-1.0.0.tar.gz) =
RpSk+ECQOc73IG6wcpUnISYtvsNyZpNztzLmF91e5TA=
+SIZE (gnome-mplayer-1.0.0.tar.gz) = 903789
Index: x11/gnome-mplayer/patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- x11/gnome-mplayer/patches/patch-configure 23 Sep 2010 17:06:18 -0000
1.3
+++ x11/gnome-mplayer/patches/patch-configure 8 Nov 2010 13:06:28 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-configure,v 1.3 2010/09/
don't check for libgpod 0.6.x: it's not in our ports tree
disable gnome-power-manager support
---- configure.orig Mon Feb 22 22:46:24 2010
-+++ configure Thu Sep 23 18:16:27 2010
-@@ -653,8 +653,6 @@ GPOD_CFLAGS
+--- configure.orig Fri Nov 5 17:16:53 2010
++++ configure Mon Nov 8 11:10:05 2010
+@@ -609,8 +609,6 @@ GPOD_CFLAGS
GPOD07_LIBS
GPOD07_CFLAGS
GPOD_DEFINES
@@ -14,7 +14,7 @@ disable gnome-power-manager support
NOTIFY_DEFINES
NOTIFY_LIBS
NOTIFY_CFLAGS
-@@ -855,8 +853,6 @@ ALSA_CFLAGS
+@@ -818,8 +816,6 @@ ALSA_CFLAGS
ALSA_LIBS
NOTIFY_CFLAGS
NOTIFY_LIBS
@@ -23,7 +23,7 @@ disable gnome-power-manager support
GPOD07_CFLAGS
GPOD07_LIBS
MUSICBRAINZ_CFLAGS
-@@ -1562,9 +1558,6 @@ Some influential environment variables:
+@@ -1519,9 +1515,6 @@ Some influential environment variables:
NOTIFY_CFLAGS
C compiler flags for NOTIFY, overriding pkg-config
NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
@@ -33,22 +33,22 @@ disable gnome-power-manager support
GPOD07_CFLAGS
C compiler flags for GPOD07, overriding pkg-config
GPOD07_LIBS linker flags for GPOD07, overriding pkg-config
-@@ -9879,87 +9872,6 @@ fi
- if test "x$with_libgpod" != xno; then
+@@ -8338,84 +8331,6 @@ fi
+ if test "x$with_libgpod" != xno; then :
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for GPOD06" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPOD06" >&5
-$as_echo_n "checking for GPOD06... " >&6; }
-
-if test -n "$GPOD06_CFLAGS"; then
- pkg_cv_GPOD06_CFLAGS="$GPOD06_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libgpod-1.0 <= 0.6.0\"") >&5
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libgpod-1.0 <= 0.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgpod-1.0 <= 0.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
- pkg_cv_GPOD06_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 <= 0.6.0"
2>/dev/null`
-else
- pkg_failed=yes
@@ -60,11 +60,11 @@ disable gnome-power-manager support
- pkg_cv_GPOD06_LIBS="$GPOD06_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"libgpod-1.0 <= 0.6.0\"") >&5
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libgpod-1.0 <= 0.6.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libgpod-1.0 <= 0.6.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
- pkg_cv_GPOD06_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 <= 0.6.0" 2>/dev/null`
-else
- pkg_failed=yes
@@ -90,22 +90,20 @@ disable gnome-power-manager support
- # Put the nasty error message in config.log where it belongs
- echo "$GPOD06_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-- { $as_echo "$as_me:$LINENO: WARNING: Compiling without
libgpod 0.6.0 support" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling
without libgpod 0.6.0 support" >&5
-$as_echo "$as_me: WARNING: Compiling without libgpod 0.6.0 support" >&2;}
-elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:$LINENO: WARNING: Compiling without libgpod 0.6.0
support" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without
libgpod 0.6.0 support" >&5
-$as_echo "$as_me: WARNING: Compiling without libgpod 0.6.0 support" >&2;}
-else
- GPOD06_CFLAGS=$pkg_cv_GPOD06_CFLAGS
- GPOD06_LIBS=$pkg_cv_GPOD06_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- GPOD_DEFINES="-DHAVE_GPOD -DGPOD_06"
--cat >>confdefs.h <<\_ACEOF
--#define GPOD_ENABLED 1
--_ACEOF
+-$as_echo "#define GPOD_ENABLED 1" >>confdefs.h
-
-fi
-
@@ -114,16 +112,15 @@ disable gnome-power-manager support
-
-fi
-
--
--if test "x$with_libgpod" != xno; then
+-if test "x$with_libgpod" != xno; then :
-
-pkg_failed=no
- { $as_echo "$as_me:$LINENO: checking for GPOD07" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPOD07" >&5
$as_echo_n "checking for GPOD07... " >&6; }
-@@ -10038,8 +9950,8 @@ fi
- fi
+@@ -8491,8 +8406,8 @@ fi
+ fi
-GPOD_CFLAGS="$GPOD06_CFLAGS $GPOD07_CFLAGS"
-GPOD_LIBS="$GPOD06_LIBS $GPOD07_LIBS"
@@ -132,52 +129,44 @@ disable gnome-power-manager support
-@@ -10294,48 +10206,6 @@ _ACEOF
+@@ -8749,40 +8664,6 @@ $as_echo "#define SS_INHIBIT 0" >>confdefs.h
-# Check whether --with-gpm-new-method was given.
--if test "${with_gpm_new_method+set}" = set; then
+-if test "${with_gpm_new_method+set}" = set; then :
- withval=$with_gpm_new_method; CHECK_GPM=no
--cat >>confdefs.h <<\_ACEOF
--#define SM_INHIBIT 1
--_ACEOF
+-$as_echo "#define SM_INHIBIT 1" >>confdefs.h
-
-fi
-
-
-# Check whether --with-gpm-old-method was given.
--if test "${with_gpm_old_method+set}" = set; then
+-if test "${with_gpm_old_method+set}" = set; then :
- withval=$with_gpm_old_method; CHECK_GPM=no
--cat >>confdefs.h <<\_ACEOF
--#define SS_INHIBIT 1
--_ACEOF
+-$as_echo "#define SS_INHIBIT 1" >>confdefs.h
-
-fi
-
-
-if test x$CHECK_GPM = "xyes"; then
- if test -x `which gnome-power-manager`; then
-- { $as_echo "$as_me:$LINENO: Checking for gnome-power-manager
support" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for
gnome-power-manager support" >&5
-$as_echo "$as_me: Checking for gnome-power-manager support" >&6;}
- GPMVER=`gnome-power-manager --version | sed -e 's/.* 2.//' | cut
-b1-2`
- if test $GPMVER -ge 26; then
-
--cat >>confdefs.h <<\_ACEOF
--#define SM_INHIBIT 1
--_ACEOF
+-$as_echo "#define SM_INHIBIT 1" >>confdefs.h
-
- fi
- if test $GPMVER -lt 26; then
-
--cat >>confdefs.h <<\_ACEOF
--#define SS_INHIBIT 1
--_ACEOF
+-$as_echo "#define SS_INHIBIT 1" >>confdefs.h
-
- fi
-
- fi
-fi
-
for ac_header in mntent.h
+ do :
Index: x11/gnome-mplayer/patches/patch-gnome-mplayer_schemas_in
===================================================================
RCS file: x11/gnome-mplayer/patches/patch-gnome-mplayer_schemas_in
diff -N x11/gnome-mplayer/patches/patch-gnome-mplayer_schemas_in
--- x11/gnome-mplayer/patches/patch-gnome-mplayer_schemas_in 29 Mar 2010
12:16:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-gnome-mplayer_schemas_in,v 1.2 2010/03/29 12:16:07 dcoppa Exp $
-
-set some sane defaults:
-use mplayer's software volume control (see pkg/MESSAGE)
-disable bar animation in full screen
-use xscrnsaver controls over gnome-power-manager
-
---- gnome-mplayer.schemas.in.orig Thu Jan 7 21:26:00 2010
-+++ gnome-mplayer.schemas.in Wed Mar 24 11:09:23 2010
-@@ -222,7 +222,7 @@
- <applyto>/apps/gnome-mplayer/preferences/disable_animation</applyto>
- <owner>gnome-mplayer</owner>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Disable Animation</short>
- <long>Disable animation of fullscreen control bar sliding away</long>
-@@ -270,7 +270,7 @@
- <applyto>/apps/gnome-mplayer/preferences/softvol</applyto>
- <owner>gnome-mplayer</owner>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Have mplayer use the softvol option</short>
- <long>When set to TRUE the softvol option is passed to mplayer,
useful for machines without pulseaudio</long>
-@@ -546,7 +546,7 @@
- <applyto>/apps/gnome-mplayer/preferences/use_xscrnsaver</applyto>
- <owner>gnome-mplayer</owner>
- <type>bool</type>
-- <default>FALSE</default>
-+ <default>TRUE</default>
- <locale name="C">
- <short>Set to TRUE if you want to use xscrnsaver controls over
gnome-power-manager</short>
- <long>When enabled directly tells the xscreensaver to inhibit itself,
otherwise uses gnome-power-manager</long>
Index: x11/gnome-mplayer/patches/patch-src_gui_c
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_gui_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_gui_c
--- x11/gnome-mplayer/patches/patch-src_gui_c 8 Jul 2010 06:29:12 -0000
1.8
+++ x11/gnome-mplayer/patches/patch-src_gui_c 8 Nov 2010 13:06:28 -0000
@@ -1,81 +1,53 @@
$OpenBSD: patch-src_gui_c,v 1.8 2010/07/08 06:29:12 dcoppa Exp $
-fixes from upstream svn:
-add missing icons to the file menu
-activate Open on enter in Open->Location (fix upstream bug #381)
-NULL check on retrieve_metadata_pool clear process
-
-revised audio/video device selection gui
+adapt audio/video device selection gui
set DVD device to /dev/rcd0c instead of /dev/dvd
---- src/gui.c.orig Thu Feb 25 17:01:41 2010
-+++ src/gui.c Wed May 5 08:58:26 2010
-@@ -1555,11 +1555,13 @@ gboolean delete_callback(GtkWidget * widget, GdkEvent
-
- if (control_id == 0) {
- g_thread_pool_stop_unused_threads();
-- while (gtk_events_pending() || thread != NULL
-- || g_thread_pool_unprocessed(retrieve_metadata_pool)) {
-- gtk_main_iteration();
-+ if (retrieve_metadata_pool != NULL) {
-+ while (gtk_events_pending() || thread != NULL
-+ || g_thread_pool_unprocessed(retrieve_metadata_pool)) {
-+ gtk_main_iteration();
-+ }
-+ g_thread_pool_free(retrieve_metadata_pool, TRUE, TRUE);
- }
-- g_thread_pool_free(retrieve_metadata_pool, TRUE, TRUE);
- } else {
- while (gtk_events_pending() || thread != NULL) {
- gtk_main_iteration();
-@@ -2766,6 +2768,7 @@ void menuitem_open_location_callback(GtkMenuItem * men
- label = gtk_label_new(_("Location:"));
- open_location = gtk_entry_new();
- gtk_entry_set_width_chars(GTK_ENTRY(open_location), 50);
-+ gtk_entry_set_activates_default(GTK_ENTRY(open_location),TRUE);
- item_box = gtk_hbox_new(FALSE, 6);
- gtk_box_pack_start(GTK_BOX(item_box), label, FALSE, FALSE, 12);
- gtk_box_pack_end(GTK_BOX(item_box), open_location, TRUE, TRUE, 0);
-@@ -4796,15 +4799,13 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
- tooltip = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltip, config_vo,
- _
-- ("mplayer video output device\nx11 should always
work, try xv or gl for better performance"),
-+ ("mplayer video output device\nx11 should always
work\nTry xv or gl for better performance"),
- NULL);
- if (config_vo != NULL) {
- gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "gl");
+--- src/gui.c.orig Mon Nov 8 11:15:15 2010
++++ src/gui.c Mon Nov 8 11:24:41 2010
+@@ -5053,9 +5053,6 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "gl2");
gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "x11");
gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "xv");
- gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "xvmc");
+- gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "vaapi");
- gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "vdpau");
+
if (vo != NULL) {
if (strcmp(vo, "gl") == 0)
- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 0);
-@@ -4814,14 +4815,10 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
+@@ -5066,16 +5063,10 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 2);
if (strcmp(vo, "xv") == 0)
gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 3);
- if (strcmp(vo, "xvmc") == 0)
- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 4);
-- if (strcmp(vo, "vdpau") == 0)
+- if (strcmp(vo, "vaapi") == 0)
- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 5);
+- if (strcmp(vo, "vdpau") == 0)
+- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 6);
if (gtk_combo_box_get_active(GTK_COMBO_BOX(config_vo))
== -1) {
gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), vo);
-- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 6);
+- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 7);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 4);
}
}
}
-@@ -4891,32 +4888,29 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
+@@ -5145,39 +5136,36 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
+ #ifdef GTK2_12_ENABLED
+ gtk_widget_set_tooltip_text(config_ao,
+ _
+- ("mplayer audio output device\nalsa or oss
should always work, try esd in gnome, arts in kde, or pulse on newer
distributions"));
++ ("mplayer audio output device\nsndio should
always work\nTry esd under GNOME, arts under KDE\nTry jack if you use the JACK
sound server\nUse rtunes if you want to stream to an Apple AirPort Express"));
+
+ #else
tooltip = gtk_tooltips_new();
gtk_tooltips_set_tip(tooltip, config_ao,
_
- ("mplayer audio output device\nalsa or oss should
always work, try esd in gnome, arts in kde, or pulse on newer distributions"),
+ ("mplayer audio output device\nsndio should always
work\nTry esd under GNOME, arts under KDE\nTry jack if you use the JACK sound
server\nUse rtunes if you want to stream to an Apple AirPort Express"),
NULL);
+ #endif
if (config_ao != NULL) {
- gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "alsa");
- gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "arts");
@@ -111,7 +83,7 @@ set DVD device to /dev/rcd0c instead of
}
}
}
-@@ -4995,8 +4989,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
+@@ -5264,8 +5252,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
j = -1;
config_mplayer_dvd_device = gtk_combo_box_entry_new_text();
@@ -122,35 +94,15 @@ set DVD device to /dev/rcd0c instead of
j = i;
}
i++;
-@@ -6222,12 +6216,19 @@ GtkWidget *create_window(gint windowid)
- gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open));
- menuitem_file_open_folder =
- GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open
_Folder")));
-+
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_folder),
-+ gtk_image_new_from_icon_name("folder",GTK_ICON_SIZE_MENU));
- gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_folder));
- menuitem_file_open_location =
- GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open
_Location")));
-+
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_location),
-+ gtk_image_new_from_icon_name("network-server",GTK_ICON_SIZE_MENU));
- gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_location));
-
-- menuitem_file_disc =
GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Disc")));
-+ menuitem_file_disc =
-+ GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("_Disc")));
-+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_disc),
-+ gtk_image_new_from_icon_name("media-optical",GTK_ICON_SIZE_MENU));
- menu_file_disc = GTK_MENU(gtk_menu_new());
- gtk_widget_show(GTK_WIDGET(menuitem_file_disc));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu_file),
GTK_WIDGET(menuitem_file_disc));
-@@ -6276,7 +6277,9 @@ GtkWidget *create_window(gint windowid)
+@@ -6634,9 +6622,9 @@ GtkWidget *create_window(gint windowid)
gtk_menu_append(menu_file_tv, GTK_WIDGET(menuitem_file_open_dtv));
#ifdef HAVE_GPOD
menuitem_file_open_ipod =
- GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open
_iPod™")));
+ GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open _iPod")));
-+
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_ipod),
-+ gtk_image_new_from_icon_name("multimedia-player",GTK_ICON_SIZE_MENU));
+
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_ipod),
+- gtk_image_new_from_icon_name("ipod",
GTK_ICON_SIZE_MENU));
++
gtk_image_new_from_icon_name("multimedia-player", GTK_ICON_SIZE_MENU));
+
gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_ipod));
#endif
- #ifdef GTK2_12_ENABLED
Index: x11/gnome-mplayer/patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_main_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_main_c
--- x11/gnome-mplayer/patches/patch-src_main_c 8 Jul 2010 06:29:12 -0000
1.6
+++ x11/gnome-mplayer/patches/patch-src_main_c 8 Nov 2010 13:06:28 -0000
@@ -1,35 +1,13 @@
$OpenBSD: patch-src_main_c,v 1.6 2010/07/08 06:29:12 dcoppa Exp $
-fixes from upstream svn:
-fix memory leak when we have an invalid item to play
-change metadata timeout count from 10 to 50 (fix upstream bug #391)
-
set some sane defaults:
use mplayer's software volume control (see pkg/MESSAGE)
disable bar animation in full screen
use xscrnsaver controls over gnome-power-manager
---- src/main.c.orig Thu Feb 25 17:01:41 2010
-+++ src/main.c Wed May 5 08:57:01 2010
-@@ -260,6 +260,8 @@ gint play_iter(GtkTreeIter * playiter, gint restart_se
- } else {
- if (verbose > 1)
- printf("iter is invalid, nothing to play\n");
-+ g_free(thread_data);
-+ thread_data = NULL;
- return 0;
- }
-
-@@ -281,7 +283,7 @@ gint play_iter(GtkTreeIter * playiter, gint restart_se
- if (!streaming_media(uri) && !device_name(uri)) {
- i = 0;
- if (playable) {
-- while (demuxer == NULL && i < 10) {
-+ while (demuxer == NULL && i < 50) {
- g_free(title);
- g_free(artist);
- g_free(album);
-@@ -688,7 +690,7 @@ int main(int argc, char *argv[])
+--- src/main.c.orig Tue Oct 19 18:33:40 2010
++++ src/main.c Mon Nov 8 11:08:40 2010
+@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
playlist_visible = FALSE;
disable_fullscreen = FALSE;
disable_framedrop = FALSE;
@@ -38,7 +16,7 @@ use xscrnsaver controls over gnome-power
remember_softvol = FALSE;
volume_softvol = -1;
volume_gain = 0;
-@@ -703,7 +705,7 @@ int main(int argc, char *argv[])
+@@ -705,7 +705,7 @@ int main(int argc, char *argv[])
reallyverbose = 0;
embedding_disabled = FALSE;
disable_pause_on_click = FALSE;
@@ -47,12 +25,12 @@ use xscrnsaver controls over gnome-power
auto_hide_timeout = 3;
use_mediakeys = TRUE;
use_defaultpl = FALSE;
-@@ -742,7 +744,7 @@ int main(int argc, char *argv[])
+@@ -744,7 +744,7 @@ int main(int argc, char *argv[])
start_second = 0;
play_length = 0;
save_loc = TRUE;
- use_xscrnsaver = FALSE;
+ use_xscrnsaver = TRUE;
screensaver_disabled = FALSE;
-
- sa.sa_handler = hup_handler;
+ update_control_flag = FALSE;
+ gchar *filename;
Index: x11/gnome-mplayer/patches/patch-src_playlist_c
===================================================================
RCS file: x11/gnome-mplayer/patches/patch-src_playlist_c
diff -N x11/gnome-mplayer/patches/patch-src_playlist_c
--- x11/gnome-mplayer/patches/patch-src_playlist_c 8 Jul 2010 06:29:12
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_playlist_c,v 1.1 2010/07/08 06:29:12 dcoppa Exp $
-
-fix from upstream svn:
-fix video playback problems when loading a folder from playlist
-
---- src/playlist.c.orig Tue Jul 6 22:15:05 2010
-+++ src/playlist.c Tue Jul 6 22:17:35 2010
-@@ -549,7 +549,10 @@ void add_folder_to_playlist(GtkWidget * widget, void *
- GSList *uris;
- gchar *last_dir;
- gchar *message;
-+ gint count;
-
-+ count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore),
NULL);
-+
- dialog = gtk_file_chooser_dialog_new(_("Choose Directory"),
- GTK_WINDOW(window),
-
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-@@ -594,7 +597,7 @@ void add_folder_to_playlist(GtkWidget * widget, void *
- g_free(message);
- g_idle_add(set_media_label, idledata);
-
-- if (data != NULL) {
-+ if (count == 0 && filecount > 0) {
- gtk_tree_model_get_iter_first(GTK_TREE_MODEL(playliststore), &iter);
- play_iter(&iter, 0);
- dontplaynext = FALSE;
Index: x11/gnome-mplayer/patches/patch-src_support_c
===================================================================
RCS file: x11/gnome-mplayer/patches/patch-src_support_c
diff -N x11/gnome-mplayer/patches/patch-src_support_c
--- x11/gnome-mplayer/patches/patch-src_support_c 8 Jul 2010 06:29:12
-0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_support_c,v 1.4 2010/07/08 06:29:12 dcoppa Exp $
-
-fix from upstream:
-correct problem with tracks loaded from an iPod as not being marked
-playable
-
---- src/support.c.orig Wed Jul 7 17:07:17 2010
-+++ src/support.c Wed Jul 7 17:09:08 2010
-@@ -2778,7 +2778,7 @@ gboolean gpod_load_tracks(gchar * mount_point)
-
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore), NULL),
- ADD_ORDER_COLUMN,
-
gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore), NULL),
-- -1);
-+ PLAYABLE_COLUMN, TRUE, -1);
-
- g_free(duration);
- g_free(full_path);
Index: x11/gnome-mplayer/patches/patch-src_thread_c
===================================================================
RCS file: x11/gnome-mplayer/patches/patch-src_thread_c
diff -N x11/gnome-mplayer/patches/patch-src_thread_c
--- x11/gnome-mplayer/patches/patch-src_thread_c 29 Mar 2010 12:16:08
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_thread_c,v 1.3 2010/03/29 12:16:08 dcoppa Exp $
-
-fix from upstream svn:
-when dontplaynext is set, request next item on
-playlist from plugin
-
---- src/thread.c.orig Thu Feb 25 17:01:41 2010
-+++ src/thread.c Wed Mar 24 12:07:32 2010
-@@ -1496,6 +1496,13 @@ gpointer launch_player(gpointer data)
- g_idle_add(play, p);
- }
-
-+ if (playback_error == NO_ERROR) {
-+ if (embed_window != 0 || control_id != 0) {
-+ dbus_send_event("MediaComplete", 0);
-+ dbus_open_next();
-+ }
-+ }
-+
- dontplaynext = FALSE;
- }
-
Index: x11/gnome-mplayer/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnome-mplayer/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- x11/gnome-mplayer/pkg/PLIST 29 Mar 2010 12:16:08 -0000 1.6
+++ x11/gnome-mplayer/pkg/PLIST 8 Nov 2010 13:06:28 -0000
@@ -35,15 +35,26 @@ share/icons/hicolor/48x48/apps/gnome-mpl
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/gnome-mplayer.svg
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/gnome-mplayer.mo
share/locale/bg/LC_MESSAGES/gnome-mplayer.mo
share/locale/ca/LC_MESSAGES/gnome-mplayer.mo
share/locale/cs/LC_MESSAGES/gnome-mplayer.mo
+share/locale/da/LC_MESSAGES/gnome-mplayer.mo
share/locale/de/LC_MESSAGES/gnome-mplayer.mo
share/locale/el/LC_MESSAGES/gnome-mplayer.mo
share/locale/en/LC_MESSAGES/gnome-mplayer.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/gnome-mplayer.mo
share/locale/es/LC_MESSAGES/gnome-mplayer.mo
+share/locale/et/LC_MESSAGES/gnome-mplayer.mo
+share/locale/eu/LC_MESSAGES/gnome-mplayer.mo
+share/locale/fi/LC_MESSAGES/gnome-mplayer.mo
+share/locale/fo/
+share/locale/fo/LC_MESSAGES/
+share/locale/fo/LC_MESSAGES/gnome-mplayer.mo
share/locale/fr/LC_MESSAGES/gnome-mplayer.mo
share/locale/gl/LC_MESSAGES/gnome-mplayer.mo
share/locale/he/LC_MESSAGES/gnome-mplayer.mo
@@ -51,6 +62,8 @@ share/locale/hu/LC_MESSAGES/gnome-mplaye
share/locale/it/LC_MESSAGES/gnome-mplayer.mo
share/locale/ja/LC_MESSAGES/gnome-mplayer.mo
share/locale/ko/LC_MESSAGES/gnome-mplayer.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/gnome-mplayer.mo
share/locale/nl/LC_MESSAGES/gnome-mplayer.mo
share/locale/pl/LC_MESSAGES/gnome-mplayer.mo
@@ -59,16 +72,14 @@ share/locale/pt_BR/LC_MESSAGES/gnome-mpl
share/locale/ro/LC_MESSAGES/gnome-mplayer.mo
share/locale/ru/LC_MESSAGES/gnome-mplayer.mo
share/locale/sr/LC_MESSAGES/gnome-mplayer.mo
+share/locale/s...@latin/
+share/locale/s...@latin/LC_MESSAGES/
share/locale/s...@latin/LC_MESSAGES/gnome-mplayer.mo
share/locale/sv/LC_MESSAGES/gnome-mplayer.mo
share/locale/tr/LC_MESSAGES/gnome-mplayer.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mplayer.mo
share/locale/zh_HK/LC_MESSAGES/gnome-mplayer.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mplayer.mo
-...@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >
/dev/null
-${SCHEMAS_INSTDIR}/
-${SCHEMAS_INSTDIR}/gnome-mplayer.schemas
-...@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas >
/dev/null
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
