From 44ea6f9117ceacdfc71b1d0044c85b2d48b7195d Mon Sep 17 00:00:00 2001 From: naddy Date: Thu, 22 Jan 2004 20:15:22 +0000 Subject: [PATCH] sync patches --- .../patches/patch-Input_cdaudio_cdaudio_c | 10 +++++----- audio/xmms/patches/patch-Output_Makefile_in | 12 +++++------ audio/xmms/patches/patch-README | 20 +++++++++---------- audio/xmms/patches/patch-aclocal_m4 | 12 +++++------ audio/xmms/patches/patch-libxmms_configure_in | 8 ++++---- audio/xmms/patches/patch-xmms_main_c | 10 +++++----- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c b/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c index 5d12903c35a..582008ce9d6 100644 --- a/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c +++ b/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c @@ -1,6 +1,7 @@ ---- Input/cdaudio/cdaudio.c.dist Tue Apr 8 23:31:39 2003 -+++ Input/cdaudio/cdaudio.c Wed Apr 9 00:07:00 2003 -@@ -552,6 +552,10 @@ +$OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.2 2004/01/22 20:15:22 naddy Exp $ +--- Input/cdaudio/cdaudio.c.orig 2002-02-05 15:39:11.000000000 +0100 ++++ Input/cdaudio/cdaudio.c 2004-01-22 20:41:36.000000000 +0100 +@@ -552,6 +552,10 @@ static int get_current_frame(void) { struct ioc_read_subchannel subchnl; struct cd_sub_channel_info subinfo; @@ -11,7 +12,7 @@ subchnl.address_format = CD_MSF_FORMAT; subchnl.data_format = CD_CURRENT_POSITION; subchnl.data_len = sizeof(subinfo); -@@ -591,17 +595,23 @@ +@@ -591,17 +595,23 @@ gboolean cdda_get_toc_lowlevel(int fd, c { struct ioc_toc_header tochdr; struct ioc_read_toc_entry tocentry; @@ -36,4 +37,3 @@ return FALSE; info->track[i].minute = tocentry.data->addr.msf.minute; - diff --git a/audio/xmms/patches/patch-Output_Makefile_in b/audio/xmms/patches/patch-Output_Makefile_in index 41f2e6fce08..d84931f8247 100644 --- a/audio/xmms/patches/patch-Output_Makefile_in +++ b/audio/xmms/patches/patch-Output_Makefile_in @@ -1,13 +1,13 @@ -$OpenBSD: patch-Output_Makefile_in,v 1.2 2001/07/25 15:48:26 naddy Exp $ ---- Output/Makefile.in.orig Mon Jun 18 21:55:33 2001 -+++ Output/Makefile.in Wed Jul 25 16:47:42 2001 +$OpenBSD: patch-Output_Makefile_in,v 1.3 2004/01/22 20:15:22 naddy Exp $ +--- Output/Makefile.in.orig 2002-03-04 22:58:28.000000000 +0100 ++++ Output/Makefile.in 2004-01-22 20:41:36.000000000 +0100 @@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am +-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. + # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -@@ -157,7 +157,7 @@ sidplay_cflags = @sidplay_cflags@ +@@ -162,7 +162,7 @@ sidplay_cflags = @sidplay_cflags@ sidplay_library = @sidplay_library@ xmmsdir = @xmmsdir@ diff --git a/audio/xmms/patches/patch-README b/audio/xmms/patches/patch-README index d7b6eeac8ec..40510ab59ed 100644 --- a/audio/xmms/patches/patch-README +++ b/audio/xmms/patches/patch-README @@ -1,6 +1,6 @@ ---- README.orig Tue Jan 8 11:59:15 2002 -+++ README Wed Jan 23 12:25:33 2002 -@@ -39,6 +39,7 @@ +--- README.orig 2002-01-07 15:07:59.000000000 +0100 ++++ README 2004-01-22 20:41:37.000000000 +0100 +@@ -39,6 +39,7 @@ TABLE OF CONTENTS 3.6.2.1 OSS Driver 3.6.2.2 Disk Writer 3.6.2.3 eSound Output @@ -8,12 +8,10 @@ 3.6.3 Effect plugins 3.6.3.1 Echo 3.6.3.2 Extra Stereo -@@ -874,6 +875,35 @@ - the audio data is sent uncompressed to the remote ESD. - +@@ -876,6 +877,35 @@ the audio data is sent uncompressed to t The 'Buffering' tab works just like the 'OSS Driver' one. -+ -+ + + +3.6.2.4 BSD Sun Output +---------------------- +The 'Sun' output plugin will use the native audio(4) interface provided @@ -41,6 +39,8 @@ + +In the 'Status' tab you can see audio device information and real-time +playback status. - - ++ ++ 3.6.3 Effect plugins + -------------------- + Effect plugins can alter the sound of the music you are listening to. diff --git a/audio/xmms/patches/patch-aclocal_m4 b/audio/xmms/patches/patch-aclocal_m4 index 78f36f0bd5a..fb19bec4fca 100644 --- a/audio/xmms/patches/patch-aclocal_m4 +++ b/audio/xmms/patches/patch-aclocal_m4 @@ -1,6 +1,6 @@ ---- aclocal.m4.orig Mon Mar 4 17:56:49 2002 -+++ aclocal.m4 Thu Mar 7 01:23:56 2002 -@@ -1082,7 +1082,7 @@ +--- aclocal.m4.orig 2002-03-04 22:56:49.000000000 +0100 ++++ aclocal.m4 2004-01-22 20:41:37.000000000 +0100 +@@ -1082,7 +1082,7 @@ AC_DEFUN([AC_PROG_LIBTOOL], LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. @@ -9,7 +9,7 @@ AC_SUBST(LIBTOOL)dnl # Prevent multiple expansion -@@ -3211,9 +3211,14 @@ +@@ -3211,9 +3211,14 @@ openbsd*) version_type=sunos need_lib_prefix=no need_version=no @@ -25,7 +25,7 @@ shlibpath_overrides_runpath=no ;; *) -@@ -3221,6 +3226,7 @@ +@@ -3221,6 +3226,7 @@ openbsd*) ;; esac else @@ -33,7 +33,7 @@ shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -@@ -5131,10 +5137,9 @@ +@@ -5131,10 +5137,9 @@ AC_DEFUN(AM_WITH_NLS, if test "$gt_cv_func_gettext_libc" != "yes"; then AC_CHECK_LIB(intl, bindtextdomain, diff --git a/audio/xmms/patches/patch-libxmms_configure_in b/audio/xmms/patches/patch-libxmms_configure_in index efd7dde695e..40475da35e9 100644 --- a/audio/xmms/patches/patch-libxmms_configure_in +++ b/audio/xmms/patches/patch-libxmms_configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-libxmms_configure_in,v 1.4 2002/03/11 17:38:05 naddy Exp $ ---- libxmms/configure.in.orig Wed Dec 5 16:33:25 2001 -+++ libxmms/configure.in Mon Jan 21 10:29:48 2002 -@@ -30,7 +30,7 @@ +$OpenBSD: patch-libxmms_configure_in,v 1.5 2004/01/22 20:15:22 naddy Exp $ +--- libxmms/configure.in.orig 2002-03-04 22:50:27.000000000 +0100 ++++ libxmms/configure.in 2004-01-22 20:41:37.000000000 +0100 +@@ -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 ***])) diff --git a/audio/xmms/patches/patch-xmms_main_c b/audio/xmms/patches/patch-xmms_main_c index a7be50d3242..d6262ac29b7 100644 --- a/audio/xmms/patches/patch-xmms_main_c +++ b/audio/xmms/patches/patch-xmms_main_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-xmms_main_c,v 1.4 2002/03/11 17:38:05 naddy Exp $ ---- xmms/main.c.orig Fri Dec 28 08:32:28 2001 -+++ xmms/main.c Fri Jan 18 07:39:27 2002 -@@ -3379,7 +3373,8 @@ +$OpenBSD: patch-xmms_main_c,v 1.5 2004/01/22 20:15:22 naddy Exp $ +--- xmms/main.c.orig 2002-02-27 15:30:28.000000000 +0100 ++++ xmms/main.c 2004-01-22 20:41:37.000000000 +0100 +@@ -3387,7 +3387,8 @@ int main(int argc, char **argv) #endif signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */ @@ -11,7 +11,7 @@ $OpenBSD: patch-xmms_main_c,v 1.4 2002/03/11 17:38:05 naddy Exp $ g_thread_init(NULL); if (!g_thread_supported()) { -@@ -3388,6 +3383,7 @@ +@@ -3396,6 +3397,7 @@ int main(int argc, char **argv) "installed LinuxThreads you need to recompile GLIB & GTK+\n")); exit(1); }