This diff updates XMMS to the latest available version.
Please test, comment, OK... the usual ;)
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile 13 Nov 2007 12:44:23 -0000 1.53
+++ Makefile 24 Nov 2007 09:46:10 -0000
@@ -8,13 +8,13 @@
SHARED_ONLY= Yes
-VERSION= 1.2.10
+VERSION= 1.2.11
DISTNAME= xmms-${VERSION}
-PKGNAME-main= xmms-${VERSION}p11
-PKGNAME-esd= xmms-esd-${VERSION}p7
-PKGNAME-vorbis= xmms-vorbis-${VERSION}p7
-PKGNAME-mikmod= xmms-mikmod-${VERSION}p7
-PKGNAME-mp3= xmms-mp3-${VERSION}p8
+PKGNAME-main= xmms-${VERSION}
+PKGNAME-esd= xmms-esd-${VERSION}
+PKGNAME-vorbis= xmms-vorbis-${VERSION}
+PKGNAME-mikmod= xmms-mikmod-${VERSION}
+PKGNAME-mp3= xmms-mp3-${VERSION}
SHARED_LIBS= xmms 4.1
CATEGORIES= audio
HOMEPAGE= http://www.xmms.org
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/xmms/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Apr 2007 15:37:45 -0000 1.5
+++ distinfo 24 Nov 2007 09:46:10 -0000
@@ -1,5 +1,5 @@
-MD5 (xmms-1.2.10.tar.gz) = ha0tsQ+/387M0SqPYXERrQ==
-RMD160 (xmms-1.2.10.tar.gz) = S9wPXGT7mwoXzqO8FHOJDFRwybc=
-SHA1 (xmms-1.2.10.tar.gz) = i/7bIIwSeIVG3VnpHRA6rEboK7A=
-SHA256 (xmms-1.2.10.tar.gz) = ixZR5C55rEBoI0CbTGU/Q73cP0xspdISRaH3IDwCplk=
-SIZE (xmms-1.2.10.tar.gz) = 4034832
+MD5 (xmms-1.2.11.tar.gz) = pdfoJcRgVVS3n4rPmGxMsg==
+RMD160 (xmms-1.2.11.tar.gz) = OsnVEeQHbAymY61tUasRjbLZrK8=
+SHA1 (xmms-1.2.11.tar.gz) = XHQprhq0cFfPaue+qytprq4KAbw=
+SHA256 (xmms-1.2.11.tar.gz) = NllznOVlIo3VYl1gwCx30tkyces89SY5Quz+jsPDZD8=
+SIZE (xmms-1.2.11.tar.gz) = 4299286
Index: patches/patch-Input_cdaudio_cdaudio_c
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c,v
retrieving revision 1.3
diff -u -r1.3 patch-Input_cdaudio_cdaudio_c
--- patches/patch-Input_cdaudio_cdaudio_c 15 Apr 2004 19:23:46 -0000
1.3
+++ patches/patch-Input_cdaudio_cdaudio_c 24 Nov 2007 09:46:10 -0000
@@ -1,16 +1,7 @@
$OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.3 2004/04/15 19:23:46 naddy Exp $
---- Input/cdaudio/cdaudio.c.orig 2004-01-28 00:09:39.000000000 +0100
-+++ Input/cdaudio/cdaudio.c 2004-04-15 14:47:46.000000000 +0200
-@@ -333,7 +333,7 @@ static gboolean is_mounted(char * device
- #elif defined(HAVE_GETMNTINFO)
- entries = getmntinfo(&fsp, MNT_NOWAIT);
- if (entries < 0)
-- return NULL;
-+ return FALSE;
-
- while (entries-- > 0)
- {
-@@ -817,6 +817,10 @@ static int get_current_frame(void)
+--- Input/cdaudio/cdaudio.c.orig Fri Nov 23 16:18:35 2007
++++ Input/cdaudio/cdaudio.c Fri Nov 23 16:20:02 2007
+@@ -819,6 +819,10 @@ static int get_current_frame(void)
{
struct ioc_read_subchannel subchnl;
struct cd_sub_channel_info subinfo;
Index: patches/patch-Output_sun_audio_c
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-Output_sun_audio_c,v
retrieving revision 1.5
diff -u -r1.5 patch-Output_sun_audio_c
--- patches/patch-Output_sun_audio_c 27 Apr 2005 16:31:34 -0000 1.5
+++ patches/patch-Output_sun_audio_c 24 Nov 2007 09:46:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Output_sun_audio_c,v 1.5 2005/04/27 16:31:34 robert Exp $
--- Output/sun/audio.c.orig Sun Jun 2 15:42:03 2002
-+++ Output/sun/audio.c Wed Apr 27 18:13:18 2005
-@@ -123,14 +123,12 @@
++++ Output/sun/audio.c Fri Nov 23 18:38:44 2007
+@@ -123,14 +123,12 @@ static void sun_setformat(AFormat fmt, int rate, int n
sun = sun_format(fmt);
@@ -16,8 +16,12 @@
output.frequency = rate;
output.channels = nch;
sun_setparams();
-@@ -153,7 +151,7 @@
- info.mode = AUMODE_PLAY;
+@@ -150,10 +148,10 @@ void sun_setparams(void)
+
+ AUDIO_INITINFO(&info);
+
+- info.mode = AUMODE_PLAY;
++ info.mode = AUMODE_PLAY_ALL;
if (ioctl(audio.fd, AUDIO_SETINFO, &info) != 0)
{
- g_error("%s: cannot play (%s)", audio.devaudio,
@@ -25,7 +29,7 @@
strerror(errno));
return;
}
-@@ -171,7 +169,7 @@
+@@ -171,7 +169,7 @@ void sun_setparams(void)
strcpy(output.name, enc.name);
if (ioctl(audio.fd, AUDIO_SETINFO, &info) != 0)
{
@@ -34,7 +38,7 @@
output.name, strerror(errno));
return;
}
-@@ -182,7 +180,7 @@
+@@ -182,7 +180,7 @@ void sun_setparams(void)
info.play.sample_rate = output.frequency;
if (ioctl(audio.fd, AUDIO_SETINFO, &info) < 0)
{
@@ -43,7 +47,7 @@
output.frequency, strerror(errno));
return;
}
-@@ -328,7 +326,7 @@
+@@ -328,7 +326,7 @@ static inline void sun_write_audio(gpointer data, int
output_time_offset += (output_bytes * 1000) / output.bps;
output_bytes = 0;
close(audio.fd);
@@ -52,7 +56,7 @@
sun_setformat(new_format, new_frequency, new_channels);
}
if (effects_enabled() && ep && ep->mod_samples)
-@@ -518,7 +516,7 @@
+@@ -518,7 +516,7 @@ static void* sun_loop(void *arg)
{
audio.unpause = FALSE;
close(audio.fd);
@@ -61,7 +65,7 @@
sun_setparams();
audio.paused = FALSE;
}
-@@ -535,9 +533,9 @@
+@@ -535,9 +533,9 @@ int sun_open(AFormat fmt, int rate, int nch)
AUDIO_INITINFO(&info);
Index: patches/patch-Output_sun_configure_c
===================================================================
RCS file: patches/patch-Output_sun_configure_c
diff -N patches/patch-Output_sun_configure_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Output_sun_configure_c 24 Nov 2007 09:46:10 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Output/sun/configure.c.orig Fri Nov 23 19:12:30 2007
++++ Output/sun/configure.c Fri Nov 23 19:12:52 2007
+@@ -420,7 +420,7 @@ static void configure_stats_loop(void)
+ (info.mode == AUMODE_PLAY_ALL) ? "playing" :
+ "not playing");
+
+- if (info.mode == AUMODE_PLAY)
++ if (info.mode == AUMODE_PLAY_ALL)
+ {
+ sprintf(s, "%s at %i Hz (%i-bit %s)", s,
+ info.play.sample_rate,
info.play.precision,
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-configure_in,v
retrieving revision 1.7
diff -u -r1.7 patch-configure_in
--- patches/patch-configure_in 15 Apr 2004 19:23:46 -0000 1.7
+++ patches/patch-configure_in 24 Nov 2007 09:46:10 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-configure_in,v 1.7 2004/04/15 19:23:46 naddy Exp $
---- configure.in.orig 2004-02-23 22:40:44.000000000 +0100
-+++ configure.in 2004-04-14 23:34:14.000000000 +0200
-@@ -549,7 +549,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
- AC_SUBST(VISUALIZATION_PLUGIN_DIR)
- AC_SUBST(pluginsubs)
+--- configure.in.orig Fri Nov 16 22:52:30 2007
++++ configure.in Fri Nov 23 16:25:25 2007
+@@ -607,7 +607,7 @@ AC_SUBST([GENERAL_PLUGIN_DIR])
+ AC_SUBST([VISUALIZATION_PLUGIN_DIR])
+ AC_SUBST([pluginsubs])
-XMMS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/xmms\\\" -DPLUGIN_DIR=\\\"$plugindir\\\"
-DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""
+XMMS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/xmms\\\" -DPLUGIN_DIR=\\\"$plugindir\\\"
-DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\" -I$LOCALBASE/include"
Index: patches/patch-libxmms_configure_in
===================================================================
RCS file: patches/patch-libxmms_configure_in
diff -N patches/patch-libxmms_configure_in
--- patches/patch-libxmms_configure_in 15 Apr 2004 19:23:46 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libxmms_configure_in,v 1.6 2004/04/15 19:23:46 naddy Exp $
---- libxmms/configure.in.orig 2004-02-23 22:42:52.000000000 +0100
-+++ libxmms/configure.in 2004-04-14 23:33:55.000000000 +0200
-@@ -30,7 +30,7 @@ AM_ENABLE_SHARED
- XMMS_FUNC_POSIX(sched_setscheduler nanosleep)
-
- AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***]))
--AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please
install first ***]),gthread)
-+AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please
install first ***]))
-
- if test -n "$GCC"
- then
Index: patches/patch-libxmms_xmmsctrl_c
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-libxmms_xmmsctrl_c,v
retrieving revision 1.1
diff -u -r1.1 patch-libxmms_xmmsctrl_c
--- patches/patch-libxmms_xmmsctrl_c 15 Jun 2002 12:05:15 -0000 1.1
+++ patches/patch-libxmms_xmmsctrl_c 24 Nov 2007 09:46:10 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-libxmms_xmmsctrl_c,v 1.1 2002/06/15 12:05:15 naddy Exp $
---- libxmms/xmmsctrl.c.orig Sat Jun 15 13:21:09 2002
-+++ libxmms/xmmsctrl.c Sat Jun 15 13:21:22 2002
+--- libxmms/xmmsctrl.c.orig Fri Nov 23 16:20:56 2007
++++ libxmms/xmmsctrl.c Fri Nov 23 16:21:07 2007
@@ -30,6 +30,7 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+ #include <math.h>
#include "xmmsctrl.h"
#include "../xmms/controlsocket.h"
-
Index: patches/patch-po_Makefile_in_in
===================================================================
RCS file: patches/patch-po_Makefile_in_in
diff -N patches/patch-po_Makefile_in_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-po_Makefile_in_in 24 Nov 2007 09:46:10 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- po/Makefile.in.in.orig Fri Nov 23 17:15:03 2007
++++ po/Makefile.in.in Fri Nov 23 17:15:17 2007
+@@ -30,6 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
++install_sh = @install_sh@
+ mkinstalldirs = $(SHELL) @install_sh@ -d
+ mkdir_p = @mkdir_p@
+
Index: patches/patch-xmms_input_c
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-xmms_input_c,v
retrieving revision 1.1
diff -u -r1.1 patch-xmms_input_c
--- patches/patch-xmms_input_c 13 Mar 2006 14:30:43 -0000 1.1
+++ patches/patch-xmms_input_c 24 Nov 2007 09:46:10 -0000
@@ -1,24 +1,29 @@
$OpenBSD: patch-xmms_input_c,v 1.1 2006/03/13 14:30:43 robert Exp $
---- xmms/input.c.orig Mon Mar 13 00:18:51 2006
-+++ xmms/input.c Mon Mar 13 00:39:00 2006
-@@ -245,6 +245,8 @@
- {
+--- xmms/input.c.orig Fri Nov 23 16:21:19 2007
++++ xmms/input.c Fri Nov 23 16:23:46 2007
+@@ -246,6 +246,8 @@ void input_play(char *filename)
GList *node;
InputPlugin *ip;
-+
-+ char *text;
++ char *text;
++
node = get_input_list();
if (get_current_output_plugin() == NULL)
-@@ -271,9 +273,16 @@
- node = node->next;
+ {
+@@ -257,7 +259,9 @@ void input_play(char *filename)
}
+
/* We set the playing flag even if no inputplugin
- recognizes the file. This way we are sure it will be skipped. */
+ recognizes the file. This way we are sure it will be skipped.
+ We also notify the user that there has been no input plugin
+ installed for the current file. */
ip_data->playing = TRUE;
+
+ while (node)
+@@ -275,6 +279,11 @@ void input_play(char *filename)
+ node = node->next;
+ }
set_current_input_plugin(NULL);
+ text = g_strdup_printf(_("No input plugin has been installed for %s"),
+ g_basename(filename));
Index: patches/patch-xmms_main_c
===================================================================
RCS file: /cvs/ports/audio/xmms/patches/patch-xmms_main_c,v
retrieving revision 1.6
diff -u -r1.6 patch-xmms_main_c
--- patches/patch-xmms_main_c 15 Apr 2004 19:23:46 -0000 1.6
+++ patches/patch-xmms_main_c 24 Nov 2007 09:46:10 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-xmms_main_c,v 1.6 2004/04/15 19:23:46 naddy Exp $
---- xmms/main.c.orig 2004-02-23 21:31:43.000000000 +0100
-+++ xmms/main.c 2004-04-14 23:33:55.000000000 +0200
-@@ -3390,6 +3390,18 @@ void segfault_handler(int sig)
+--- xmms/main.c.orig Sun Jul 16 15:40:04 2006
++++ xmms/main.c Fri Nov 23 16:25:08 2007
+@@ -4060,6 +4060,18 @@ void segfault_handler(int sig)
exit(1);
}
@@ -20,7 +20,7 @@
static gboolean pposition_configure(GtkWidget *w, GdkEventConfigure *event,
gpointer data)
{
gint x,y;
-@@ -3521,12 +3533,15 @@ int main(int argc, char **argv)
+@@ -4191,12 +4203,15 @@ int main(int argc, char **argv)
#endif
signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */
@@ -36,4 +36,4 @@
+#endif
parse_cmd_line(argc, argv, &options);
- #if defined(HAVE_SRANDOMDEV)
+ #ifdef HAVE_SRANDOMDEV
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/audio/xmms/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 10 Oct 2007 14:54:05 -0000 1.2
+++ pkg/PLIST-main 24 Nov 2007 09:46:10 -0000
@@ -77,6 +77,9 @@
share/locale/de/LC_MESSAGES/xmms.mo
share/locale/el/LC_MESSAGES/xmms.mo
share/locale/en/LC_MESSAGES/xmms.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/xmms.mo
share/locale/eo/LC_MESSAGES/xmms.mo
share/locale/es/LC_MESSAGES/xmms.mo
share/locale/et/LC_MESSAGES/xmms.mo
--
Antoine
