Update to audacious / audacious-plugins 3.3.1

With suggestions from Brad and stsp@
OK stsp@
This commit is contained in:
dcoppa 2012-08-25 11:30:19 +00:00
parent 6c59171ed6
commit 864dad392e
18 changed files with 97 additions and 654 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.50 2012/07/05 09:29:43 dcoppa Exp $
# $OpenBSD: Makefile,v 1.51 2012/08/25 11:30:19 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = input and output plugins for audacious
V = 3.2.4
V = 3.3.1
DISTNAME = audacious-plugins-$V
@ -12,20 +12,21 @@ CATEGORIES = audio multimedia
HOMEPAGE = http://audacious-media-player.org/
# GPL
# BSD / GPL
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += FLAC GL SDL X11 Xcomposite Xrender atk-1.0 audcore
WANTLIB += audgui audtag cairo cairo-gobject cddb cdio cdio_cdda
WANTLIB += cue curl dbus-1 dbus-glib-1 expat faad fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
WANTLIB += m mms modplug mp3lame mpg123 neon notify ogg pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs
WANTLIB += samplerate sndfile sndio stdc++ vorbis vorbisenc vorbisfile
WANTLIB += wavpack xcb xcb-render xcb-shm xml2 z
WANTLIB += FLAC GL SDL X11 Xcomposite Xrender atk-1.0 audcore audgui
WANTLIB += audtag cairo cairo-gobject cddb cdio cdio_cdda cue curl
WANTLIB += dbus-1 dbus-glib-1 expat faad fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gtk-3 m mms modplug mp3lame mpg123 neon notify ogg
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread pthread-stubs samplerate sndfile sndio stdc++
WANTLIB += vorbis vorbisenc vorbisfile wavpack xcb xcb-render
WANTLIB += xcb-shm xml2 z
MASTER_SITES = http://distfiles.audacious-media-player.org/
@ -36,6 +37,8 @@ MODULES = devel/gettext
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = audio/audacious>=${V}
# needed for the gio plugin
RUN_DEPENDS += x11/gnome/gvfs
LIB_DEPENDS = audio/faad>=2.7 \
audio/flac \
@ -62,23 +65,19 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS += --enable-ipv6 \
--disable-pulse \
--disable-adplug \
--disable-sid \
--disable-oss \
--disable-alsa \
--disable-amidiplug \
--disable-mtp_up \
--disable-bs2b \
--disable-ffaudio \
--disable-jack \
--disable-bs2b
--disable-lirc \
--disable-oss4 \
--disable-pulse \
--disable-sid
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
NO_REGRESS = Yes
post-patch:
@mkdir -p ${WRKSRC}/src/sndio
@cp ${FILESDIR}/{Makefile,sndio.c} ${WRKSRC}/src/sndio
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (audacious-plugins-3.2.4.tar.bz2) = xU2Zj8KA2DKG+2NylHI3Fw==
RMD160 (audacious-plugins-3.2.4.tar.bz2) = 26tfC6aO3BomtV7uIpLDiiV/+WE=
SHA1 (audacious-plugins-3.2.4.tar.bz2) = dTigORUEzkqSln3Hxb1JSHUe+pE=
SHA256 (audacious-plugins-3.2.4.tar.bz2) = DwNVbeWT2F1KugiVxFhmQwJtFfXBJD5zU6RjboSzGII=
SIZE (audacious-plugins-3.2.4.tar.bz2) = 1921658
SHA256 (audacious-plugins-3.3.1.tar.bz2) = jsvmyXlQIsOSdgir0HBu6MjRpXnR9gSvrzvymoMkEyE=
SIZE (audacious-plugins-3.3.1.tar.bz2) = 1650126

View File

@ -1,12 +0,0 @@
PLUGIN = sndio${PLUGIN_SUFFIX}
SRCS = sndio.c
include ../../buildsys.mk
include ../../extra.mk
plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
CFLAGS += ${PLUGIN_CFLAGS}
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} -I../..
LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${SNDIO_LIBS}

View File

@ -1,476 +0,0 @@
/*
* Copyright (c) 2008, 2009 Thomas Pfaff <tpfaff@tp76.info>
* Copyright (c) 2012 Alexandre Ratchov <alex@caoua.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <poll.h>
#include <pthread.h>
#include <sndio.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#include <audacious/plugin.h>
#include <audacious/misc.h>
#include <audacious/i18n.h>
#include <audacious/plugin.h>
#include <libaudgui/libaudgui.h>
#include <libaudgui/libaudgui-gtk.h>
#include "config.h"
/*
* minimum output buffer size in milliseconds
*/
#define BUFFER_SIZE_MIN 250
bool_t sndio_init(void);
void sndio_cleanup(void);
void sndio_about(void);
int sndio_take_message(const char *, const void *, int);
void sndio_configure(void);
void sndio_get_volume(int *, int *);
void sndio_set_volume(int, int);
bool_t sndio_open(int, int, int);
void sndio_close(void);
int sndio_buffer_free(void);
void sndio_period_wait(void);
void sndio_write(void *, int);
void sndio_pause(bool_t);
void sndio_flush(int);
int sndio_output_time(void);
int sndio_written_time(void);
void sndio_drain(void);
void sndio_set_written_time(int);
void onmove_cb(void *, int);
void onvol_cb(void *, unsigned);
void configure_win_ok_cb(GtkWidget *, gpointer);
static struct sio_par par;
static struct sio_hdl *hdl;
static long long rdpos;
static long long wrpos;
static int paused, restarted, volume;
static int pause_pending, flush_pending, volume_pending;
static int bytes_per_sec;
static pthread_mutex_t mtx;
static GtkWidget *configure_win;
static GtkWidget *adevice_entry;
static gchar *audiodev;
AUD_OUTPUT_PLUGIN
(
.name = "sndio",
.init = sndio_init,
.cleanup = sndio_cleanup,
.about = sndio_about,
.configure = sndio_configure,
.probe_priority = 2,
.get_volume = sndio_get_volume,
.set_volume = sndio_set_volume,
.open_audio = sndio_open,
.write_audio = sndio_write,
.close_audio = sndio_close,
.buffer_free = sndio_buffer_free,
.period_wait = sndio_period_wait,
.flush = sndio_flush,
.pause = sndio_pause,
.output_time = sndio_output_time,
.written_time = sndio_written_time,
.set_written_time = sndio_set_written_time,
.drain = sndio_drain
)
static struct fmt_to_par {
int fmt, bits, sig, le;
} fmt_to_par[] = {
{FMT_S8, 8, 1, 0}, {FMT_U8, 8, 1, 0},
{FMT_S16_LE, 16, 1, 1}, {FMT_S16_BE, 16, 1, 0},
{FMT_U16_LE, 16, 0, 1}, {FMT_U16_BE, 16, 0, 0},
{FMT_S24_LE, 24, 1, 1}, {FMT_S24_BE, 24, 1, 0},
{FMT_U24_LE, 24, 0, 1}, {FMT_U24_BE, 24, 0, 0},
{FMT_S32_LE, 32, 1, 1}, {FMT_S32_BE, 32, 1, 0},
{FMT_U32_LE, 32, 0, 1}, {FMT_U32_BE, 32, 0, 0}
};
static const gchar * const sndio_defaults[] = {
"volume", "100",
"audiodev", "",
NULL,
};
static void
reset(void)
{
if (!restarted) {
restarted = 1;
sio_stop(hdl);
sio_start(hdl);
rdpos = wrpos;
}
}
static void
wait_ready(void)
{
int n;
struct pollfd pfds[16];
if (volume_pending) {
sio_setvol(hdl, volume * SIO_MAXVOL / 100);
volume_pending = 0;
}
if (flush_pending) {
reset();
flush_pending = 0;
}
if (pause_pending) {
if (paused)
reset();
pause_pending = 0;
}
if (paused) {
pthread_mutex_unlock(&mtx);
usleep(20000);
pthread_mutex_lock(&mtx);
return;
}
n = sio_pollfd(hdl, pfds, POLLOUT);
if (n != 0) {
pthread_mutex_unlock(&mtx);
while (poll(pfds, n, -1) < 0) {
if (errno != EINTR) {
perror("poll");
exit(1);
}
}
pthread_mutex_lock(&mtx);
}
(void)sio_revents(hdl, pfds);
}
bool_t
sndio_init(void)
{
pthread_mutex_init(&mtx, NULL);
aud_config_set_defaults("sndio", sndio_defaults);
volume = aud_get_int("sndio", "volume");
audiodev = aud_get_string("sndio", "audiodev");
return (1);
}
void
sndio_cleanup(void)
{
aud_set_int("sndio", "volume", volume);
aud_set_string("sndio", "audiodev", audiodev);
pthread_mutex_destroy(&mtx);
}
void
sndio_about(void)
{
static GtkWidget *about = NULL;
audgui_simple_message(&about, GTK_MESSAGE_INFO,
_("About Sndio Output Plugin"),
_("Sndio Output Plugin\n\n"
"Written by Thomas Pfaff <tpfaff@tp76.info>\n"));
}
void
sndio_get_volume(int *l, int *r)
{
pthread_mutex_lock(&mtx);
*l = *r = volume;
pthread_mutex_unlock(&mtx);
}
void
sndio_set_volume(int l, int r)
{
/* Ignore balance control, so use unattenuated channel. */
pthread_mutex_lock(&mtx);
volume = l > r ? l : r;
volume_pending = 1;
pthread_mutex_unlock(&mtx);
}
bool_t
sndio_open(int fmt, int rate, int nch)
{
int i;
struct sio_par askpar;
GtkWidget *dialog = NULL;
unsigned buffer_size;
hdl = sio_open(strlen(audiodev) > 0 ? audiodev : NULL, SIO_PLAY, 1);
if (!hdl) {
g_warning("failed to open audio device %s", audiodev);
return (0);
}
sio_initpar(&askpar);
for (i = 0; ; i++) {
if (i == sizeof(fmt_to_par) / sizeof(struct fmt_to_par)) {
g_warning("unknown format %d requested", fmt);
sndio_close();
return 0;
}
if (fmt_to_par[i].fmt == fmt)
break;
}
askpar.bits = fmt_to_par[i].bits;
askpar.bps = SIO_BPS(askpar.bits);
askpar.sig = fmt_to_par[i].sig;
if (askpar.bits > 8)
askpar.le = fmt_to_par[i].le;
askpar.pchan = nch;
askpar.rate = rate;
buffer_size = aud_get_int(NULL, "output_buffer_size");
if (buffer_size < BUFFER_SIZE_MIN)
buffer_size = BUFFER_SIZE_MIN;
askpar.appbufsz = buffer_size * rate / 1000;
if (!sio_setpar(hdl, &askpar) || !sio_getpar(hdl, &par)) {
g_warning("failed to set parameters");
sndio_close();
return (0);
}
if ((par.bps > 1 && par.le != askpar.le) ||
(par.bits < par.bps * 8 && !par.msb) ||
par.bps != askpar.bps ||
par.sig != askpar.sig ||
par.pchan != askpar.pchan ||
par.rate != askpar.rate) {
g_warning("parameters not supported by the audio device");
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 sndiod(1) server running."));
sndio_close();
return (0);
}
rdpos = 0;
wrpos = 0;
sio_onmove(hdl, onmove_cb, NULL);
sio_onvol(hdl, onvol_cb, NULL);
sio_setvol(hdl, volume * SIO_MAXVOL / 100);
if (!sio_start(hdl)) {
g_warning("failed to start audio device");
sndio_close();
return (0);
}
pause_pending = flush_pending = volume_pending = 0;
bytes_per_sec = par.bps * par.pchan * par.rate;
restarted = 1;
paused = 0;
return (1);
}
void
sndio_write(void *ptr, int length)
{
unsigned n;
pthread_mutex_lock(&mtx);
for (;;) {
if (paused)
break;
restarted = 0;
n = sio_write(hdl, ptr, length);
if (n == 0 && sio_eof(hdl))
return;
wrpos += n;
length -= n;
ptr = (char *)ptr + n;
if (length == 0)
break;
wait_ready();
}
pthread_mutex_unlock(&mtx);
}
void
sndio_close(void)
{
if (!hdl)
return;
sio_close(hdl);
hdl = NULL;
}
int
sndio_buffer_free(void)
{
return paused ? 0 : par.round * par.pchan * par.bps;
}
void
sndio_period_wait(void)
{
pthread_mutex_lock(&mtx);
wait_ready();
pthread_mutex_unlock(&mtx);
}
void
sndio_flush(int time)
{
pthread_mutex_lock(&mtx);
rdpos = wrpos = (long long)time * bytes_per_sec / 1000;
flush_pending = 1;
pthread_mutex_unlock(&mtx);
}
void
sndio_pause(bool_t flag)
{
pthread_mutex_lock(&mtx);
paused = flag;
pause_pending = 1;
pthread_mutex_unlock(&mtx);
}
void
sndio_drain(void)
{
/* sndio always drains */
}
int
sndio_output_time(void)
{
int time;
pthread_mutex_lock(&mtx);
time = rdpos * 1000 / bytes_per_sec;
pthread_mutex_unlock(&mtx);
return time;
}
int
sndio_written_time(void)
{
int time;
pthread_mutex_lock(&mtx);
time = wrpos * 1000 / bytes_per_sec;
pthread_mutex_unlock(&mtx);
return time;
}
void
sndio_set_written_time(int time)
{
int used;
pthread_mutex_lock(&mtx);
wrpos = time * bytes_per_sec / 1000;
used = wrpos - rdpos;
rdpos = time * bytes_per_sec / 1000;
wrpos = rdpos + used;
pthread_mutex_unlock(&mtx);
}
void
onmove_cb(void *addr, int delta)
{
rdpos += delta * (int)(par.bps * par.pchan);
}
void
onvol_cb(void *addr, unsigned ctl)
{
/* Update volume only if it actually changed */
if (ctl != volume * SIO_MAXVOL / 100)
volume = ctl * 100 / SIO_MAXVOL;
}
void
configure_win_ok_cb(GtkWidget *w, gpointer data)
{
strlcpy(audiodev, gtk_entry_get_text(GTK_ENTRY(adevice_entry)),
PATH_MAX);
aud_set_string("sndio", "audiodev", audiodev);
gtk_widget_destroy(configure_win);
}
void
sndio_configure(void)
{
GtkWidget *vbox;
GtkWidget *adevice_frame, *adevice_text, *adevice_vbox;
GtkWidget *bbox, *ok, *cancel;
if (configure_win) {
gtk_window_present(GTK_WINDOW(configure_win));
return;
}
configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
g_signal_connect(configure_win, "destroy",
G_CALLBACK(gtk_widget_destroyed), &configure_win);
gtk_window_set_title(GTK_WINDOW(configure_win), _("sndio device"));
gtk_window_set_resizable(GTK_WINDOW(configure_win), FALSE);
gtk_window_set_position(GTK_WINDOW(configure_win), GTK_WIN_POS_MOUSE);
gtk_container_set_border_width(GTK_CONTAINER(configure_win), 10);
vbox = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(configure_win), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
adevice_frame = gtk_frame_new(_("Audio device:"));
gtk_box_pack_start(GTK_BOX(vbox), adevice_frame, FALSE, FALSE, 0);
adevice_vbox = gtk_vbox_new(FALSE, 5);
gtk_container_set_border_width(GTK_CONTAINER(adevice_vbox), 5);
gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_vbox);
adevice_text = gtk_label_new(_("(empty means default)"));
gtk_box_pack_start(GTK_BOX(adevice_vbox), adevice_text, TRUE, TRUE, 0);
adevice_entry = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(adevice_entry), audiodev);
gtk_box_pack_start(GTK_BOX(adevice_vbox), adevice_entry, TRUE, TRUE, 0);
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
ok = gtk_button_new_with_label(_("OK"));
g_signal_connect(ok, "clicked",
G_CALLBACK(configure_win_ok_cb), NULL);
gtk_widget_set_can_default(ok, TRUE);
gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
gtk_widget_grab_default(ok);
cancel = gtk_button_new_with_label(_("Cancel"));
g_signal_connect(cancel, "clicked",
G_CALLBACK(gtk_widget_destroy), &configure_win);
gtk_widget_set_can_default(cancel, TRUE);
gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
gtk_widget_show_all(configure_win);
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-buildsys_mk_in,v 1.4 2012/03/20 19:10:56 stsp Exp $
--- buildsys.mk.in.orig Fri Jan 20 20:48:30 2012
+++ buildsys.mk.in Sun Feb 5 19:59:45 2012
@@ -100,7 +100,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
$OpenBSD: patch-buildsys_mk_in,v 1.5 2012/08/25 11:30:19 dcoppa Exp $
--- buildsys.mk.in.orig Sat Aug 11 22:13:39 2012
+++ buildsys.mk.in Thu Aug 16 13:45:42 2012
@@ -101,7 +101,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo}

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.15 2012/08/22 20:14:05 naddy Exp $
--- configure.ac.orig Sat Jun 30 02:05:33 2012
+++ configure.ac Tue Jul 3 09:59:40 2012
@@ -45,9 +45,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
[AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious yet?])]
$OpenBSD: patch-configure_ac,v 1.16 2012/08/25 11:30:19 dcoppa Exp $
--- configure.ac.orig Fri Aug 24 10:53:03 2012
+++ configure.ac Fri Aug 24 10:54:28 2012
@@ -43,9 +43,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.3],
[AC_MSG_ERROR([Cannot find Audacious 3.3; have you installed Audacious yet?])]
)
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@ -11,7 +11,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2012/08/22 20:14:05 naddy Exp $
dnl Default Set of Plugins
dnl ======================
@@ -969,7 +966,7 @@ AC_ARG_ENABLE(filewriter_mp3,
@@ -882,7 +879,7 @@ AC_ARG_ENABLE(filewriter_mp3,
)
if test "x$enable_filewriter_mp3" = "xyes"; then
@ -20,44 +20,13 @@ $OpenBSD: patch-configure_ac,v 1.15 2012/08/22 20:14:05 naddy Exp $
if test "x$have_lame" = "xyes"; then
AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
@@ -1083,8 +1080,32 @@ if test "x$enable_lyricwiki" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
@@ -1013,6 +1010,9 @@ if test "x$enable_lyricwiki" = "xyes"; then
fi
+dnl *** sndio output
+
+AC_ARG_ENABLE(sndio,
+ [ --disable-sndio disable sndio output plugin (default=enabled) ],
+ [have_sndio=$enableval],
+ [have_sndio=yes]
+)
+
+if test "x$have_sndio" = "xyes"; then
+ AC_CHECK_HEADER(sndio.h,, have_sndio=no)
+ if test x$have_sndio = xyes; then
+ AC_CHECK_LIB(sndio, sio_open, haves_sndio=yes, have_sndio=no)
+ fi
+fi
+
+if test "x$have_sndio" = "xyes"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+ SNDIO_LIBS="-lsndio"
+ AC_SUBST(SNDIO_LIBS)
+fi
+
dnl *** End of all plugin checks ***
+
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
+
plugindir=`pkg-config audacious --variable=plugin_dir`
AC_SUBST(plugindir)
@@ -1154,6 +1175,7 @@ echo " -> FileWriter Vorbis output part: $enabl
echo " -> FileWriter FLAC output part: $have_writer_flac"
echo " Null Audio output (null): yes"
echo " Open Sound System v3 (deprecated): $enable_oss"
+echo " Sndio Audio output (sndio): $have_sndio"
echo
echo " Input Plugins"
echo " -------------"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-extra_mk_in,v 1.3 2012/07/05 09:29:43 dcoppa Exp $
--- extra.mk.in.orig Sat Jun 30 02:05:33 2012
+++ extra.mk.in Tue Jul 3 09:59:33 2012
@@ -96,6 +96,7 @@ SIDPLAY2_CFLAGS ?= @SIDPLAY2_CFLAGS@
SIDPLAY2_LIBS ?= @SIDPLAY2_LIBS@
SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
SNDFILE_LIBS ?= @SNDFILE_LIBS@
+SNDIO_LIBS ?= @SNDIO_LIBS@
VORBIS_CFLAGS ?= @VORBIS_CFLAGS@
VORBIS_LIBS ?= @VORBIS_LIBS@
WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-src_ladspa_Makefile,v 1.4 2012/05/11 10:53:54 dcoppa Exp $
--- src/ladspa/Makefile.orig Sat Mar 31 19:47:16 2012
+++ src/ladspa/Makefile Fri May 11 12:44:41 2012
@@ -12,4 +12,4 @@ plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
CPPFLAGS += -I../.. ${PTHREAD_CFLAGS} ${GTK_CFLAGS} ${GMODULE_CFLAGS}
CFLAGS += ${PLUGIN_CFLAGS}
-LIBS += -lm ${PTHREAD_LIBS} ${GTK_LIBS} ${GMODULE_LIBS}
+LIBS += -lm ${PTHREAD_LIBS} ${GLIB_LIBS} ${GTK_LIBS}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2012/05/11 11:59:31 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.5 2012/08/25 11:30:19 dcoppa Exp $
@pkgpath audio/audacious-plugins,-main
lib/audacious/
lib/audacious/Container/
@ -16,7 +16,7 @@ lib/audacious/Effect/echo.so
lib/audacious/Effect/ladspa.so
lib/audacious/Effect/mixer.so
lib/audacious/Effect/resample.so
lib/audacious/Effect/sndstretch.so
lib/audacious/Effect/speed-pitch.so
lib/audacious/Effect/stereo.so
lib/audacious/Effect/voice_removal.so
lib/audacious/General/
@ -52,10 +52,10 @@ lib/audacious/Input/wavpack.so
lib/audacious/Input/xsf.so
lib/audacious/Output/
lib/audacious/Output/filewriter.so
lib/audacious/Output/null.so
lib/audacious/Output/sdlout.so
lib/audacious/Output/sndio.so
lib/audacious/Transport/
lib/audacious/Transport/gio.so
lib/audacious/Transport/mms.so
lib/audacious/Transport/neon.so
lib/audacious/Transport/unix-io.so
@ -195,7 +195,6 @@ share/audacious/ui/mainwin.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/es_AR/LC_MESSAGES/audacious-plugins.mo
@ -203,19 +202,20 @@ share/locale/es_MX/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/gl/LC_MESSAGES/audacious-plugins.mo
share/locale/hu/LC_MESSAGES/audacious-plugins.mo
share/locale/it/LC_MESSAGES/audacious-plugins.mo
share/locale/ja/LC_MESSAGES/audacious-plugins.mo
share/locale/ko/LC_MESSAGES/audacious-plugins.mo
share/locale/lt/LC_MESSAGES/audacious-plugins.mo
share/locale/lv/LC_MESSAGES/audacious-plugins.mo
share/locale/pl/LC_MESSAGES/audacious-plugins.mo
share/locale/pt_PT/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/sr/LC_MESSAGES/audacious-plugins.mo
share/locale/tr/LC_MESSAGES/audacious-plugins.mo
share/locale/sr_RS/
share/locale/sr_RS/LC_MESSAGES/
share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
share/locale/uk/LC_MESSAGES/audacious-plugins.mo
share/locale/vi/LC_MESSAGES/audacious-plugins.mo
share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo

View File

@ -1,34 +1,31 @@
# $OpenBSD: Makefile,v 1.37 2012/07/05 09:29:28 dcoppa Exp $
# $OpenBSD: Makefile,v 1.38 2012/08/25 11:30:19 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = gtk+3 media player based on BMP and XMMS
DISTNAME = audacious-3.2.4
DISTNAME = audacious-3.3.1
SHARED_LIBS = audclient 2.1 # 2.1
SHARED_LIBS += audcore 1.1 # 1.1
SHARED_LIBS += audgui 1.1 # 1.1
SHARED_LIBS += audtag 1.1 # 1.1
SHARED_LIBS = audclient 3.0 # 2.0
SHARED_LIBS += audcore 2.0 # 1.0
SHARED_LIBS += audgui 2.0 # 1.0
SHARED_LIBS += audtag 2.0 # 1.0
CATEGORIES = audio multimedia
HOMEPAGE = http://audacious-media-player.org/
# GPLv3
# BSD
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
WANTLIB += c cairo cairo-gobject dbus-1>=6 dbus-glib-1 expat
WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gtk-3
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 guess
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
WANTLIB += z
WANTLIB += GL X11 Xrender atk-1.0 c cairo cairo-gobject dbus-1>=6
WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gtk-3 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += guess m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z
MASTER_SITES = http://distfiles.audacious-media-player.org/

View File

@ -1,5 +1,2 @@
MD5 (audacious-3.2.4.tar.bz2) = fRyr2vUYirtN7d9ihTWpVQ==
RMD160 (audacious-3.2.4.tar.bz2) = 3TRYcmF1i5ruLwm7caxZU5oakTg=
SHA1 (audacious-3.2.4.tar.bz2) = JKp14KFdIydkHIHG7H6hU6jfGuA=
SHA256 (audacious-3.2.4.tar.bz2) = EqFFQog0BxENK0Nn2zjo4GINg6JmOIQn81imZomkVTo=
SIZE (audacious-3.2.4.tar.bz2) = 690943
SHA256 (audacious-3.3.1.tar.bz2) = 353NF4h3+fTu7reJUQe0GbJJa8pm0/ZWVtLPVrBfms0=
SIZE (audacious-3.3.1.tar.bz2) = 453332

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-buildsys_mk_in,v 1.4 2012/03/20 19:10:18 stsp Exp $
--- buildsys.mk.in.orig Fri Jan 20 20:46:56 2012
+++ buildsys.mk.in Sun Feb 5 19:13:21 2012
@@ -35,9 +35,9 @@ LD = ${CC}
$OpenBSD: patch-buildsys_mk_in,v 1.5 2012/08/25 11:30:19 dcoppa Exp $
--- buildsys.mk.in.orig Sat Aug 11 22:11:00 2012
+++ buildsys.mk.in Thu Aug 16 13:13:37 2012
@@ -36,9 +36,9 @@ LD = ${CC}
RANLIB = @RANLIB@
PYTHON = @PYTHON@
ASFLAGS = @ASFLAGS@
@ -13,7 +13,7 @@ $OpenBSD: patch-buildsys_mk_in,v 1.4 2012/03/20 19:10:18 stsp Exp $
DFLAGS = @DFLAGS@
ERLCFLAGS = @ERLCFLAGS@
OBJCFLAGS = @OBJCFLAGS@
@@ -100,7 +100,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
@@ -101,7 +101,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-m4_buildsys_m4,v 1.5 2012/03/20 19:10:18 stsp Exp $
--- m4/buildsys.m4.orig Fri Jan 20 20:46:56 2012
+++ m4/buildsys.m4 Sun Feb 5 19:13:21 2012
@@ -124,7 +124,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
$OpenBSD: patch-m4_buildsys_m4,v 1.6 2012/08/25 11:30:19 dcoppa Exp $
--- m4/buildsys.m4.orig Sat Aug 11 22:11:00 2012
+++ m4/buildsys.m4 Thu Aug 16 13:13:37 2012
@@ -125,7 +125,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-shared'
LIB_PREFIX='lib'

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudclient_Makefile,v 1.2 2009/09/15 21:49:01 fgsch Exp $
--- src/libaudclient/Makefile.orig Mon Jul 6 23:39:12 2009
+++ src/libaudclient/Makefile Sat Aug 1 15:20:12 2009
$OpenBSD: patch-src_libaudclient_Makefile,v 1.3 2012/08/25 11:30:19 dcoppa Exp $
--- src/libaudclient/Makefile.orig Sat Aug 11 22:11:00 2012
+++ src/libaudclient/Makefile Thu Aug 16 13:13:37 2012
@@ -1,4 +1,4 @@
-LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
+LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}.${LIBaudclient_VERSION}
-SHARED_LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}.${LIBaudclient_VERSION}
LIB_MAJOR = 2
LIB_MINOR = 0

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.4 2012/03/21 16:13:25 dcoppa Exp $
--- src/libaudcore/Makefile.orig Sun Feb 5 19:21:31 2012
+++ src/libaudcore/Makefile Sun Feb 5 19:22:05 2012
$OpenBSD: patch-src_libaudcore_Makefile,v 1.5 2012/08/25 11:30:19 dcoppa Exp $
--- src/libaudcore/Makefile.orig Sat Aug 11 22:11:00 2012
+++ src/libaudcore/Makefile Thu Aug 16 13:13:37 2012
@@ -1,4 +1,4 @@
-LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}.${LIBaudcore_VERSION}
-SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}.${LIBaudcore_VERSION}
LIB_MAJOR = 1
LIB_MINOR = 0

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudgui_Makefile,v 1.1 2011/04/27 11:44:12 dcoppa Exp $
--- src/libaudgui/Makefile.orig Wed Apr 20 13:38:32 2011
+++ src/libaudgui/Makefile Wed Apr 20 13:39:06 2011
$OpenBSD: patch-src_libaudgui_Makefile,v 1.2 2012/08/25 11:30:19 dcoppa Exp $
--- src/libaudgui/Makefile.orig Sat Aug 11 22:11:00 2012
+++ src/libaudgui/Makefile Thu Aug 16 13:13:37 2012
@@ -1,4 +1,4 @@
-LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}.${LIBaudgui_VERSION}
-SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}.${LIBaudgui_VERSION}
LIB_MAJOR = 1
LIB_MINOR = 0

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_libaudtag_Makefile,v 1.1 2011/04/27 11:44:12 dcoppa Exp $
--- src/libaudtag/Makefile.orig Wed Apr 20 15:44:10 2011
+++ src/libaudtag/Makefile Wed Apr 20 15:45:26 2011
$OpenBSD: patch-src_libaudtag_Makefile,v 1.2 2012/08/25 11:30:19 dcoppa Exp $
--- src/libaudtag/Makefile.orig Sat Aug 11 22:11:00 2012
+++ src/libaudtag/Makefile Thu Aug 16 13:13:37 2012
@@ -1,4 +1,4 @@
-LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
+LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}.${LIBaudtag_VERSION}
-SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}.${LIBaudtag_VERSION}
LIB_MAJOR = 1
LIB_MINOR = 0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2012/06/15 08:32:14 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.15 2012/08/25 11:30:19 dcoppa Exp $
@bin bin/audacious
@bin bin/audtool
include/audacious/
@ -14,7 +14,6 @@ include/audacious/dbus.h
include/audacious/debug.h
include/audacious/drct-api.h
include/audacious/drct.h
include/audacious/gtk-compat.h
include/audacious/i18n.h
include/audacious/misc-api.h
include/audacious/misc.h
@ -48,14 +47,15 @@ lib/pkgconfig/audclient.pc
@man man/man1/audtool.1
share/applications/audacious.desktop
share/audacious/
share/audacious/AUTHORS
share/audacious/COPYING
share/audacious/images/
share/audacious/images/about-logo.png
share/audacious/images/album.png
share/audacious/images/audacious_eq.xpm
share/audacious/images/audacious_player.xpm
share/audacious/images/audacious_playlist.xpm
share/audacious/images/audacious.png
share/audacious/images/audio.png
share/audacious/images/connectivity.png
share/audacious/images/info.png
share/audacious/images/menu_playlist.png
share/audacious/images/menu_plugin.png
share/audacious/images/menu_queue_toggle.png
@ -65,11 +65,8 @@ share/icons/hicolor/48x48/apps/audacious.png
share/icons/hicolor/scalable/apps/audacious.svg
share/locale/ast/LC_MESSAGES/audacious.mo
share/locale/be/LC_MESSAGES/audacious.mo
share/locale/bg/LC_MESSAGES/audacious.mo
share/locale/br/LC_MESSAGES/audacious.mo
share/locale/ca/LC_MESSAGES/audacious.mo
share/locale/cs/LC_MESSAGES/audacious.mo
share/locale/cy/LC_MESSAGES/audacious.mo
share/locale/de/LC_MESSAGES/audacious.mo
share/locale/el/LC_MESSAGES/audacious.mo
share/locale/es/LC_MESSAGES/audacious.mo
@ -81,18 +78,20 @@ share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/audacious.mo
share/locale/et/LC_MESSAGES/audacious.mo
share/locale/eu/LC_MESSAGES/audacious.mo
share/locale/fa_IR/LC_MESSAGES/audacious.mo
share/locale/fi/LC_MESSAGES/audacious.mo
share/locale/fr/LC_MESSAGES/audacious.mo
share/locale/hi/LC_MESSAGES/audacious.mo
share/locale/hr/LC_MESSAGES/audacious.mo
share/locale/gl/LC_MESSAGES/audacious.mo
share/locale/he/LC_MESSAGES/audacious.mo
share/locale/hu/LC_MESSAGES/audacious.mo
share/locale/id_ID/
share/locale/id_ID/LC_MESSAGES/
share/locale/id_ID/LC_MESSAGES/audacious.mo
share/locale/it/LC_MESSAGES/audacious.mo
share/locale/ja/LC_MESSAGES/audacious.mo
share/locale/ka/LC_MESSAGES/audacious.mo
share/locale/ko/LC_MESSAGES/audacious.mo
share/locale/lt/LC_MESSAGES/audacious.mo
share/locale/lv/LC_MESSAGES/audacious.mo
share/locale/mk/LC_MESSAGES/audacious.mo
share/locale/nl/LC_MESSAGES/audacious.mo
share/locale/pl/LC_MESSAGES/audacious.mo
share/locale/pt_BR/LC_MESSAGES/audacious.mo
@ -102,20 +101,13 @@ share/locale/pt_PT/LC_MESSAGES/audacious.mo
share/locale/ro/LC_MESSAGES/audacious.mo
share/locale/ru/LC_MESSAGES/audacious.mo
share/locale/sk/LC_MESSAGES/audacious.mo
share/locale/sl/LC_MESSAGES/audacious.mo
share/locale/sr/LC_MESSAGES/audacious.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/audacious.mo
share/locale/sv/LC_MESSAGES/audacious.mo
share/locale/sr@latin/LC_MESSAGES/audacious.mo
share/locale/tr/LC_MESSAGES/audacious.mo
share/locale/uk/LC_MESSAGES/audacious.mo
share/locale/vi/LC_MESSAGES/audacious.mo
share/locale/zh_CN/LC_MESSAGES/audacious.mo
share/locale/zh_TW/LC_MESSAGES/audacious.mo
share/pixmaps/
share/pixmaps/audacious.png
share/pixmaps/audacious.svg
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor