Hi!
This update package audacious-plugins to the latest release 2.4.0.
Tested on amd64.
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 26 Nov 2010 07:07:56 -0000 1.24
+++ Makefile 11 Dec 2010 11:17:39 -0000
@@ -1,46 +1,45 @@
# $OpenBSD: Makefile,v 1.24 2010/11/26 07:07:56 espie Exp $
-SHARED_ONLY = Yes
+SHARED_ONLY = Yes
-COMMENT-main = input and output plugins for audacious
-COMMENT-jack = jack plugin for audacious
+COMMENT-main = input and output plugins for audacious
+COMMENT-jack = jack plugin for audacious
-V = 2.1
-DISTNAME = audacious-plugins-$V
-PKGNAME-main = ${DISTNAME}
-REVISION-main = 1
-PKGNAME-jack = audacious-jack-$V
-REVISION-jack = 1
+V = 2.4.0
+DISTNAME = audacious-plugins-$V
+PKGNAME-main = ${DISTNAME}
+PKGNAME-jack = audacious-jack-$V
-CATEGORIES = audio multimedia
+CATEGORIES = audio multimedia
-HOMEPAGE = http://audacious-media-player.org/
+HOMEPAGE = http://audacious-media-player.org/
# GPL
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
-PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
- Xi Xinerama Xrandr Xrender atk-1.0 cairo 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 iconv \
- intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
- png pthread-stubs xcb xcb-render xcb-render-util z
-WANTLIB-main = ${WANTLIB} cddb dbus-1 dbus-glib-1 mowgli ogg sndio stdc++ \
- faad>=2 mp4ff>=1 FLAC>=7 mp3lame mad cdio cdio_cdda \
- mpcdec>=2 sndfile>=2 vorbis>=5 vorbisfile>=4 vorbisenc \
- tag>=6 wavpack SDL>=6 curl>=5 neon>=26 xml2
-WANTLIB-jack = ${WANTLIB} jack samplerate
+WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 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 iconv intl m mcs mowgli pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
+ samplerate xcb xcb-render xcb-shm z
+WANTLIB-main = ${WANTLIB} FLAC>=7 SDL>=6 avcodec avformat avutil bz2 cddb \
+ cdio cdio_cdda cue curl>=5 faac faad>=2 gsm mp3lame neon>=26 \
+ notify ogg orc-0.4 schroedinger-1.0 sndfile>=2 sndio speex \
+ stdc++ theora vorbis>=5 vorbisenc vorbisfile>=4 wavpack x264 \
+ xml2
+WANTLIB-jack = ${WANTLIB} jack
-MASTER_SITES = http://distfiles.atheme.org/
-
-EXTRACT_SUFX = .tgz
+MASTER_SITES = http://distfiles.atheme.org/
+EXTRACT_SUFX = .tgz
MULTI_PACKAGES = -main
-BUILD_DEPENDS = ${RUN_DEPENDS-main}
+BUILD_DEPENDS = ${RUN_DEPENDS-main}
RUN_DEPENDS-main = audio/audacious>=1.5.1
RUN_DEPENDS-jack = audio/audacious-plugins,-main
@@ -50,12 +49,16 @@ LIB_DEPENDS-main = audio/faad \
audio/lame \
audio/libmad \
audio/libcdio \
+ audio/libcue \
audio/libmpcdec \
+ audio/libsamplerate \
audio/libsndfile \
audio/libvorbis \
audio/taglib>=1.4 \
audio/wavpack \
+ devel/libnotify \
devel/sdl \
+ graphics/ffmpeg \
net/curl \
net/neon \
textproc/libxml
@@ -65,25 +68,22 @@ PSEUDO_FLAVORS = no_jack
FLAVOR ?=
.if ${FLAVOR:Mno_jack}
-CONFIGURE_ARGS += --disable-jack
+CONFIGURE_ARGS += --disable-jack
.else
-MULTI_PACKAGES += -jack
+MULTI_PACKAGES += -jack
.endif
-USE_GMAKE = Yes
+USE_GMAKE = Yes
AUTOCONF_VERSION = 2.61
CONFIGURE_STYLE = autoconf
CONFIGURE_ARGS += --enable-ipv6 \
--enable-sndio \
- --disable-esd \
--disable-pulse \
--disable-altivec \
--disable-lirc \
- --disable-rootvis \
--disable-adplug \
- --disable-arts \
--disable-sid \
--disable-oss \
--disable-alsa \
@@ -99,7 +99,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
CONFIGURE_ARGS += --disable-sse2
.endif
-NO_REGRESS = Yes
+NO_REGRESS = Yes
post-patch:
@mkdir -p ${WRKSRC}/src/sndio
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 15 Sep 2009 21:49:55 -0000 1.7
+++ distinfo 11 Dec 2010 11:17:39 -0000
@@ -1,5 +1,5 @@
-MD5 (audacious-plugins-2.1.tgz) = CH/LH2+4QpsmfxjtPjrLeg==
-RMD160 (audacious-plugins-2.1.tgz) = +3Pje1wFuvN237z5dE2WroXeDQI=
-SHA1 (audacious-plugins-2.1.tgz) = c1x3NojmXuV85yAFpypTu3ysx4s=
-SHA256 (audacious-plugins-2.1.tgz) =
/nRB6e5quQP6cdIebuaxstOYVnpmGNUZy+tfoKbjoBM=
-SIZE (audacious-plugins-2.1.tgz) = 3610509
+MD5 (audacious-plugins-2.4.0.tgz) = /ffUu2YNlekARFVvEiE/Qg==
+RMD160 (audacious-plugins-2.4.0.tgz) = D0dg4U3iuyJS2G76WRVSwL5Mm5s=
+SHA1 (audacious-plugins-2.4.0.tgz) = vVnDH/tDk4D8/sAo3PELScuCrV8=
+SHA256 (audacious-plugins-2.4.0.tgz) =
xam17+AxXkw04OGSKohSVh6lYIl00K2w+c6Rwg50OhM=
+SIZE (audacious-plugins-2.4.0.tgz) = 3369517
Index: files/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/files/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- files/Makefile 25 Jan 2009 02:07:06 -0000 1.1
+++ files/Makefile 11 Dec 2010 11:17:39 -0000
@@ -8,5 +8,5 @@ include ../../extra.mk
plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
CFLAGS += ${PLUGIN_CFLAGS}
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}
-I../..
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}
-I../..
LIBS += ${GTK_LIBS} ${GLIB_LIBS} -lsndio
Index: files/sndio.c
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/files/sndio.c,v
retrieving revision 1.1
diff -u -p -r1.1 sndio.c
--- files/sndio.c 25 Jan 2009 02:07:06 -0000 1.1
+++ files/sndio.c 11 Dec 2010 11:17:39 -0000
@@ -19,18 +19,22 @@
#include <string.h>
#include <gtk/gtk.h>
+#include <libmcs/mcs.h>
#include <sndio.h>
+#include <audacious/configdb.h>
#include <audacious/i18n.h>
#include <audacious/plugin.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
#include "config.h"
-void sndio_init(void);
+OutputPluginInitStatus sndio_init(void);
void sndio_about(void);
void sndio_configure(void);
void sndio_get_volume(gint *, gint *);
void sndio_set_volume(gint, gint);
-gint sndio_open(AFormat, gint, gint);
+gint sndio_open(gint, gint, gint);
void sndio_write(gpointer, gint);
void sndio_close(void);
void sndio_flush(gint);
@@ -82,22 +86,15 @@ SIMPLE_OUTPUT_PLUGIN(sndio, sndio_oplist
void
sndio_about(void)
{
- static GtkWidget *about;
+ static GtkWidget *about = NULL;
- if (about != NULL)
- return;
-
- about = audacious_info_dialog(
+ audgui_simple_message(&about, GTK_MESSAGE_INFO,
_("About Sndio Output Plugin"),
_("Sndio Output Plugin\n\n"
- "Written by Thomas Pfaff <[email protected]>\n"),
- _("Ok"), FALSE, NULL, NULL);
-
- gtk_signal_connect(GTK_OBJECT(about), "destroy",
- GTK_SIGNAL_FUNC(gtk_widget_destroyed), &about);
+ "Written by Thomas Pfaff <[email protected]>\n"));
}
-void
+OutputPluginInitStatus
sndio_init(void)
{
mcs_handle_t *cfgfile;
@@ -111,6 +108,8 @@ sndio_init(void)
volume = 100;
if (!audiodev)
audiodev = g_strdup("");
+
+ return (OUTPUT_PLUGIN_INIT_FOUND_DEVICES);
}
void
@@ -129,7 +128,7 @@ sndio_set_volume(gint l, gint r)
}
gint
-sndio_open(AFormat fmt, gint rate, gint nch)
+sndio_open(gint fmt, gint rate, gint nch)
{
struct sio_par askpar;
@@ -159,11 +158,6 @@ sndio_open(AFormat fmt, gint rate, gint
par.sig = 0;
par.le = 0;
break;
- case FMT_U16_NE:
- par.bits = 16;
- par.sig = 0;
- par.le = SIO_LE_NATIVE;
- break;
case FMT_S16_LE:
par.bits = 16;
par.sig = 1;
@@ -173,11 +167,6 @@ sndio_open(AFormat fmt, gint rate, gint
par.bits = 16;
par.sig = 1;
par.le = 0;
- case FMT_S16_NE:
- par.bits = 16;
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
- break;
default:
g_warning("unknown format %d requested", fmt);
sndio_close();
@@ -201,12 +190,13 @@ sndio_open(AFormat fmt, gint rate, gint
par.sig != askpar.sig ||
par.pchan != askpar.pchan ||
par.rate != askpar.rate) {
+ GtkWidget *dialog = NULL;
g_warning("parameters not supported");
- audacious_info_dialog(_("Unsupported format"),
+ audgui_simple_message(&dialog, GTK_MESSAGE_INFO,
+ _("Unsupported format"),
_("A format not supported by the audio device "
"was requested.\n\n"
- "Please try again with the aucat(1) server running."),
- _("OK"), FALSE, NULL, NULL);
+ "Please try again with the aucat(1) server running."));
sndio_close();
return (0);
}
Index: patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-aclocal_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-aclocal_m4
--- patches/patch-aclocal_m4 15 Sep 2009 21:49:55 -0000 1.2
+++ patches/patch-aclocal_m4 11 Dec 2010 11:17:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2009/09/15 21:49:55 fgsch Exp $
---- aclocal.m4.orig Mon Jul 6 23:40:39 2009
-+++ aclocal.m4 Sat Aug 1 16:52:50 2009
-@@ -461,7 +461,6 @@ m4_include([m4/buildsys.m4])
+--- aclocal.m4.orig Thu Aug 26 05:07:52 2010
++++ aclocal.m4 Sat Dec 4 19:18:52 2010
+@@ -460,7 +460,6 @@ m4_include([m4/buildsys.m4])
m4_include([m4/gettext.m4])
m4_include([m4/iconv.m4])
m4_include([m4/isc-posix.m4])
Index: patches/patch-buildsys_mk_in
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-buildsys_mk_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-buildsys_mk_in
--- patches/patch-buildsys_mk_in 15 Sep 2009 21:49:55 -0000 1.2
+++ patches/patch-buildsys_mk_in 11 Dec 2010 11:17:39 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-buildsys_mk_in,v 1.2 2009/09/15 21:49:55 fgsch Exp $
---- buildsys.mk.in.orig Mon Jul 6 23:40:35 2009
-+++ buildsys.mk.in Sat Aug 1 16:53:19 2009
-@@ -81,7 +81,7 @@ OBJS6 = ${OBJS5:.m=.o}
- OBJS7 = ${OBJS6:.py=.pyc}
- OBJS += ${OBJS7:.xpm=.o}
+--- buildsys.mk.in.orig Thu Aug 26 05:07:49 2010
++++ buildsys.mk.in Sat Dec 4 19:18:52 2010
+@@ -92,7 +92,7 @@ OBJS += ${OBJS9:.S=.o}
+
+ MO_FILES = ${LOCALES:.po=.mo}
-.SILENT:
+#.SILENT:
.SUFFIXES:
- .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .mo .m .mm .o .po .py .pyc .xpm .S
.PHONY: all subdirs pre-depend depend install install-extra uninstall
uninstall-extra clean distclean
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 15 Sep 2009 21:49:55 -0000 1.3
+++ patches/patch-configure_ac 11 Dec 2010 11:17:39 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2009/09/15 21:49:55 fgsch Exp $
---- configure.ac.orig Mon Jul 6 23:40:35 2009
-+++ configure.ac Sat Aug 1 16:52:50 2009
-@@ -791,13 +791,21 @@ AC_ARG_ENABLE( jack,
+--- configure.ac.orig Thu Aug 26 05:07:49 2010
++++ configure.ac Sat Dec 4 19:18:52 2010
+@@ -789,13 +789,21 @@ AC_ARG_ENABLE( jack,
[enable_jack="yes"])
if test "x$enable_jack" = "xyes"; then
@@ -26,8 +26,8 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
fi
-@@ -1555,6 +1563,20 @@ if test "x$have_bs2b" = "xyes"; then
- EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
+@@ -1520,6 +1528,20 @@ if test "x$enable_resample" = "xyes"; then
+ EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
fi
+dnl *** sndio
@@ -47,9 +47,9 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/
dnl *** End of all plugin checks ***
AC_SUBST(ARCH_DEFINES)
-@@ -1652,6 +1674,7 @@ echo " -> FileWriter Vorbis output part: $have_
+@@ -1616,6 +1638,7 @@ echo " -> FileWriter MP3 output part: $have_
+ echo " -> FileWriter Vorbis output part: $have_vorbisenc"
echo " -> FileWriter FLAC output part: $have_writer_flac"
- echo " Icecast audio output (icecast): $have_shout"
echo " Null Audio output (null): yes"
+echo " Sndio Audio output (sndio): $have_sndio"
echo
Index: patches/patch-src_aac_Makefile
===================================================================
RCS file: patches/patch-src_aac_Makefile
diff -N patches/patch-src_aac_Makefile
--- patches/patch-src_aac_Makefile 25 Jan 2009 02:07:06 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$OpenBSD: patch-src_aac_Makefile,v 1.3 2009/01/25 02:07:06 fgsch Exp $
---- src/aac/Makefile.orig Fri May 23 23:44:19 2008
-+++ src/aac/Makefile Sun Jan 4 19:33:06 2009
-@@ -3,51 +3,7 @@ PLUGIN = aac${PLUGIN_SUFFIX}
- SRCS = libmp4.c \
- mp4_utils.c \
- aac_utils.c \
-- tagging_mp4.c \
-- libfaad2/bits.c \
-- libfaad2/cfft.c \
-- libfaad2/decoder.c \
-- libfaad2/drc.c \
-- libfaad2/drm_dec.c \
-- libfaad2/error.c \
-- libfaad2/filtbank.c \
-- libfaad2/ic_predict.c \
-- libfaad2/is.c \
-- libfaad2/lt_predict.c \
-- libfaad2/mdct.c \
-- libfaad2/mp4.c \
-- libfaad2/ms.c \
-- libfaad2/output.c \
-- libfaad2/pns.c \
-- libfaad2/ps_dec.c \
-- libfaad2/ps_syntax.c \
-- libfaad2/pulse.c \
-- libfaad2/specrec.c \
-- libfaad2/syntax.c \
-- libfaad2/tns.c \
-- libfaad2/hcr.c \
-- libfaad2/huffman.c \
-- libfaad2/rvlc.c \
-- libfaad2/ssr.c \
-- libfaad2/ssr_fb.c \
-- libfaad2/ssr_ipqf.c \
-- libfaad2/common.c \
-- libfaad2/sbr_dct.c \
-- libfaad2/sbr_e_nf.c \
-- libfaad2/sbr_fbt.c \
-- libfaad2/sbr_hfadj.c \
-- libfaad2/sbr_hfgen.c \
-- libfaad2/sbr_huff.c \
-- libfaad2/sbr_qmf.c \
-- libfaad2/sbr_syntax.c \
-- libfaad2/sbr_tf_grid.c \
-- libfaad2/sbr_dec.c \
-- mp4ff/mp4ff.c \
-- mp4ff/mp4atom.c \
-- mp4ff/mp4meta.c \
-- mp4ff/mp4sample.c \
-- mp4ff/mp4util.c \
-- mp4ff/mp4tagupdate.c
-+ tagging_mp4.c
-
- include ../../buildsys.mk
- include ../../extra.mk
-@@ -56,4 +12,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
-
- CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
- CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}
-I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
--LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -lm
-+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm
-L$(LOCALBASE)/lib -lfaad -lmp4ff
Index: patches/patch-src_aac_libmp4_c
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-src_aac_libmp4_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_aac_libmp4_c
--- patches/patch-src_aac_libmp4_c 15 Sep 2009 21:49:55 -0000 1.5
+++ patches/patch-src_aac_libmp4_c 11 Dec 2010 11:17:39 -0000
@@ -1,26 +1,17 @@
$OpenBSD: patch-src_aac_libmp4_c,v 1.5 2009/09/15 21:49:55 fgsch Exp $
---- src/aac/libmp4.c.orig Mon Jul 6 23:40:36 2009
-+++ src/aac/libmp4.c Sat Aug 1 16:52:50 2009
-@@ -10,6 +10,8 @@
- #include <audacious/output.h>
- #include <audacious/i18n.h>
-
-+#include "../../config.h"
-+
- #define MP4_VERSION VERSION
- #define SBR_DEC
-
-@@ -93,7 +95,7 @@ static guint32 mp4_read_callback(void *data, void *buf
- return aud_vfs_fread(buffer, 1, len, (VFSFile *) data);
+--- src/aac/libmp4.c.orig Thu Aug 26 05:07:49 2010
++++ src/aac/libmp4.c Sat Dec 4 19:24:01 2010
+@@ -65,7 +65,7 @@ static guint32 mp4_read_callback(void *data, void *buf
+ return vfs_fread(buffer, 1, len, (VFSFile *) data);
}
--static guint32 mp4_seek_callback(void *data, guint64 pos)
-+static guint32 mp4_seek_callback(void *data, uint64_t pos)
+-static guint32 mp4_seek_callback (void * data, guint64 pos)
++static guint32 mp4_seek_callback (void * data, uint64_t pos)
{
- if (data == NULL)
- return -1;
-@@ -648,7 +650,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
- faacDecHandle decoder = 0;
+ g_return_val_if_fail (data != NULL, -1);
+ g_return_val_if_fail (pos <= G_MAXLONG, -1);
+@@ -736,7 +736,7 @@ void my_decode_aac( InputPlayback *playback, char *fil
+ NeAACDecHandle decoder = 0;
guchar streambuffer[BUFFER_SIZE];
gulong bufferconsumed = 0;
- gulong samplerate = 0;
Index: patches/patch-src_ladspa_Makefile
===================================================================
RCS file: patches/patch-src_ladspa_Makefile
diff -N patches/patch-src_ladspa_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ladspa_Makefile 11 Dec 2010 11:17:39 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- src/ladspa/Makefile.orig Sat Dec 4 22:38:57 2010
++++ src/ladspa/Makefile Sat Dec 4 22:39:04 2010
+@@ -9,4 +9,4 @@ plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
+
+ CFLAGS += ${PLUGIN_CFLAGS}
+ CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}
-I../..
+-LIBS += ${GTK_LIBS} ${GLIB_LIBS} -ldl
++LIBS += ${GTK_LIBS} ${GLIB_LIBS}
Index: patches/patch-src_sun_audio_c
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/patches/patch-src_sun_audio_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_sun_audio_c
--- patches/patch-src_sun_audio_c 25 Jan 2009 02:07:06 -0000 1.2
+++ patches/patch-src_sun_audio_c 11 Dec 2010 11:17:39 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-src_sun_audio_c,v 1.2 2009/01/25 02:07:06 fgsch Exp $
---- src/sun/audio.c.orig Fri May 23 23:44:20 2008
-+++ src/sun/audio.c Wed Jan 21 08:29:52 2009
-@@ -121,14 +121,12 @@ static void sun_setformat(AFormat fmt, int rate, int n
-
+--- src/sun/audio.c.orig Thu Aug 26 05:07:50 2010
++++ src/sun/audio.c Sat Dec 4 19:18:52 2010
+@@ -109,14 +109,12 @@ static void sun_setformat(gint fmt, int rate, int nch)
+
sun = sun_format(fmt);
- effect.format.sun = sun;
@@ -16,7 +16,7 @@ $OpenBSD: patch-src_sun_audio_c,v 1.2 20
output.frequency = rate;
output.channels = nch;
sun_setparams();
-@@ -473,7 +471,7 @@ int sun_open(AFormat fmt, int rate, int nch)
+@@ -461,7 +459,7 @@ int sun_open(gint fmt, int rate, int nch)
if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
{
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/audio/audacious-plugins/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 15 Sep 2009 21:49:55 -0000 1.6
+++ pkg/PLIST-main 11 Dec 2010 11:17:39 -0000
@@ -1,68 +1,278 @@
@comment $OpenBSD: PLIST-main,v 1.6 2009/09/15 21:49:55 fgsch Exp $
lib/audacious/
lib/audacious/Container/
+lib/audacious/Container/cue.so
lib/audacious/Container/m3u.so
lib/audacious/Container/pls.so
lib/audacious/Container/xspf.so
lib/audacious/Effect/
-lib/audacious/Effect/audiocompress.so
+lib/audacious/Effect/compressor.so
+lib/audacious/Effect/crossfade.so
lib/audacious/Effect/crystalizer.so
lib/audacious/Effect/echo.so
lib/audacious/Effect/ladspa.so
+lib/audacious/Effect/resample.so
lib/audacious/Effect/sndstretch.so
lib/audacious/Effect/stereo.so
lib/audacious/Effect/voice_removal.so
lib/audacious/General/
lib/audacious/General/alarm.so
lib/audacious/General/aosd.so
+lib/audacious/General/cd-menu-items.so
lib/audacious/General/gnomeshortcuts.so
lib/audacious/General/gtkui.so
lib/audacious/General/hotkey.so
+lib/audacious/General/lyricwiki.so
+lib/audacious/General/notify.so
lib/audacious/General/scrobbler.so
lib/audacious/General/skins.so
lib/audacious/General/song_change.so
lib/audacious/General/statusicon.so
lib/audacious/General/streambrowser.so
-lib/audacious/General/vfstrace.so
lib/audacious/Input/
lib/audacious/Input/aac.so
-lib/audacious/Input/alac.so
lib/audacious/Input/cdaudio-ng.so
lib/audacious/Input/console.so
-lib/audacious/Input/cuesheet_ng.so
-lib/audacious/Input/demac.so
+lib/audacious/Input/ffaudio.so
lib/audacious/Input/flacng.so
lib/audacious/Input/madplug.so
lib/audacious/Input/metronom.so
lib/audacious/Input/modplug.so
-lib/audacious/Input/musepack.so
lib/audacious/Input/psf2.so
lib/audacious/Input/sndfile.so
-lib/audacious/Input/timidity.so
lib/audacious/Input/tonegen.so
-lib/audacious/Input/tta.so
lib/audacious/Input/vorbis.so
lib/audacious/Input/vtx.so
lib/audacious/Input/wavpack.so
-lib/audacious/Input/wma.so
lib/audacious/Input/xsf.so
lib/audacious/Output/
-lib/audacious/Output/crossfade.so
lib/audacious/Output/filewriter.so
lib/audacious/Output/null.so
lib/audacious/Output/sndio.so
lib/audacious/Output/sun.so
lib/audacious/Transport/
lib/audacious/Transport/gio.so
-lib/audacious/Transport/lastfm.so
lib/audacious/Transport/neon.so
+lib/audacious/Transport/unix-io.so
lib/audacious/Visualization/
lib/audacious/Visualization/blur_scope.so
lib/audacious/Visualization/paranormal.so
lib/audacious/Visualization/rocklight.so
lib/audacious/Visualization/spectrum.so
-share/audacious/images/audioscrobbler.png
-share/audacious/images/audioscrobbler_badge.png
+share/audacious/Skins/Classic/balance.png
+share/audacious/Skins/Classic/cbuttons.png
+share/audacious/Skins/Classic/eq_ex.png
+share/audacious/Skins/Classic/eqmain.png
+share/audacious/Skins/Classic/main.png
+share/audacious/Skins/Classic/monoster.png
+share/audacious/Skins/Classic/nums_ex.png
+share/audacious/Skins/Classic/playpaus.png
+share/audacious/Skins/Classic/pledit.png
+share/audacious/Skins/Classic/pledit.txt
+share/audacious/Skins/Classic/posbar.png
+share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/skin-classic.hints
+share/audacious/Skins/Classic/skin.hints
+share/audacious/Skins/Classic/text.png
+share/audacious/Skins/Classic/titlebar.png
+share/audacious/Skins/Classic/viscolor.txt
+share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/eqmain.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/posbar.png
+share/audacious/Skins/Classic1.3/shufrep.png
+share/audacious/Skins/Classic1.3/skin-classic.hints
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/viscolor.txt
+share/audacious/Skins/Classic1.3/volume.png
+share/audacious/Skins/Default/cbuttons.png
+share/audacious/Skins/Default/eq_ex.png
+share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
+share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
+share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
+share/audacious/Skins/Default/gtk-2.0/Others/null.png
+share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
+share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
+share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
+share/audacious/Skins/Default/gtk-2.0/gtkrc
+share/audacious/Skins/Default/gtk-2.0/panel.rc
+share/audacious/Skins/Default/main.png
+share/audacious/Skins/Default/monoster.png
+share/audacious/Skins/Default/nums_ex.png
+share/audacious/Skins/Default/playpaus.png
+share/audacious/Skins/Default/pledit.png
+share/audacious/Skins/Default/pledit.txt
+share/audacious/Skins/Default/posbar.png
+share/audacious/Skins/Default/shufrep.png
+share/audacious/Skins/Default/skin.hints
+share/audacious/Skins/Default/text.png
+share/audacious/Skins/Default/titlebar.png
+share/audacious/Skins/Default/viscolor.txt
+share/audacious/Skins/Default/volume.png
+share/audacious/Skins/Ivory/balance.png
+share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Ivory/eq_ex.png
+share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/main.png
+share/audacious/Skins/Ivory/monoster.png
+share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/playpaus.png
+share/audacious/Skins/Ivory/pledit.png
+share/audacious/Skins/Ivory/pledit.txt
+share/audacious/Skins/Ivory/posbar.png
+share/audacious/Skins/Ivory/shufrep.png
+share/audacious/Skins/Ivory/skin.hints
+share/audacious/Skins/Ivory/text.png
+share/audacious/Skins/Ivory/titlebar.png
+share/audacious/Skins/Ivory/viscolor.txt
+share/audacious/Skins/Ivory/volume.png
+share/audacious/Skins/Osmosis/balance.png
+share/audacious/Skins/Osmosis/cbuttons.png
+share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Osmosis/eqmain.png
+share/audacious/Skins/Osmosis/main.png
+share/audacious/Skins/Osmosis/monoster.png
+share/audacious/Skins/Osmosis/nums_ex.png
+share/audacious/Skins/Osmosis/playpaus.png
+share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/pledit.txt
+share/audacious/Skins/Osmosis/posbar.png
+share/audacious/Skins/Osmosis/shufrep.png
+share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/text.png
+share/audacious/Skins/Osmosis/titlebar.png
+share/audacious/Skins/Osmosis/viscolor.txt
+share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/volume.png
+share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/TinyPlayer/cbuttons.png
+share/audacious/Skins/TinyPlayer/eq_ex.png
+share/audacious/Skins/TinyPlayer/eqmain.png
+share/audacious/Skins/TinyPlayer/main.png
+share/audacious/Skins/TinyPlayer/monoster.png
+share/audacious/Skins/TinyPlayer/nums_ex.png
+share/audacious/Skins/TinyPlayer/playpaus.png
+share/audacious/Skins/TinyPlayer/pledit.png
+share/audacious/Skins/TinyPlayer/pledit.txt
+share/audacious/Skins/TinyPlayer/posbar.png
+share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/skin.hints
+share/audacious/Skins/TinyPlayer/text.png
+share/audacious/Skins/TinyPlayer/titlebar.png
+share/audacious/Skins/TinyPlayer/viscolor.txt
+share/audacious/Skins/TinyPlayer/volume.png
share/audacious/images/bookmarks.png
share/audacious/images/shoutcast.png
share/audacious/images/streambrowser-16x16.png
@@ -104,15 +314,25 @@ share/audacious/paranormal/Presets/nenol
share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
share/audacious/paranormal/Presets/nenolod_-_worms.pnv
share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+share/audacious/ui/carbon-menubar.ui
+share/audacious/ui/equalizer.ui
+share/audacious/ui/mainwin.ui
+share/audacious/ui/player.ui
+share/audacious/ui/playlist.ui
share/locale/ca/LC_MESSAGES/audacious-plugins.mo
share/locale/cs/LC_MESSAGES/audacious-plugins.mo
share/locale/cy/LC_MESSAGES/audacious-plugins.mo
share/locale/de/LC_MESSAGES/audacious-plugins.mo
+share/locale/es/LC_MESSAGES/audacious-plugins.mo
share/locale/et/LC_MESSAGES/audacious-plugins.mo
+share/locale/eu/LC_MESSAGES/audacious-plugins.mo
share/locale/fr/LC_MESSAGES/audacious-plugins.mo
+share/locale/hu/LC_MESSAGES/audacious-plugins.mo
share/locale/ja/LC_MESSAGES/audacious-plugins.mo
share/locale/lv/LC_MESSAGES/audacious-plugins.mo
+share/locale/pl/LC_MESSAGES/audacious-plugins.mo
share/locale/ro/LC_MESSAGES/audacious-plugins.mo
share/locale/ru/LC_MESSAGES/audacious-plugins.mo
share/locale/sk/LC_MESSAGES/audacious-plugins.mo
share/locale/tr/LC_MESSAGES/audacious-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
