disable the Sun audio backend

from brad, ok jasper
This commit is contained in:
shadchin 2010-12-27 12:08:21 +00:00
parent e967539a52
commit 4e37360dd9
4 changed files with 57 additions and 35 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2010/12/19 18:19:56 shadchin Exp $
# $OpenBSD: Makefile,v 1.26 2010/12/27 12:08:21 shadchin Exp $
SHARED_ONLY = Yes
@ -9,6 +9,7 @@ V = 2.4.2
DISTNAME = audacious-plugins-$V
PKGNAME-main = ${DISTNAME}
PKGNAME-jack = audacious-jack-$V
REVISION-main = 0
CATEGORIES = audio multimedia

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.4 2010/12/19 18:19:56 shadchin Exp $
--- configure.ac.orig Wed Dec 8 04:14:55 2010
+++ configure.ac Fri Dec 17 23:05:57 2010
$OpenBSD: patch-configure_ac,v 1.5 2010/12/27 12:08:21 shadchin Exp $
--- configure.ac.orig Tue Dec 7 18:14:55 2010
+++ configure.ac Sat Dec 25 23:56:42 2010
@@ -793,13 +793,21 @@ AC_ARG_ENABLE( jack,
[enable_jack="yes"])
@ -26,7 +26,29 @@ $OpenBSD: patch-configure_ac,v 1.4 2010/12/19 18:19:56 shadchin Exp $
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
fi
@@ -1524,6 +1532,20 @@ if test "x$enable_resample" = "xyes"; then
@@ -1178,7 +1186,7 @@ have_solaris=no
have_sun=no
ARCH_DEFINES=""
case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*-mirbsd*)
+ *-*-netbsd* | *-*-mirbsd*)
have_sun=yes
if test "${is_elf}" = "no"
then
@@ -1186,6 +1194,12 @@ case "$host" in
fi
OUTPUT_PLUGINS="$OUTPUT_PLUGINS sun"
;;
+ *-*-openbsd*)
+ if test "${is_elf}" = "no"
+ then
+ AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
+ fi
+ ;;
*-*-darwin*)
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
;;
@@ -1524,6 +1538,20 @@ if test "x$enable_resample" = "xyes"; then
EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
fi
@ -47,7 +69,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2010/12/19 18:19:56 shadchin Exp $
dnl *** End of all plugin checks ***
AC_SUBST(ARCH_DEFINES)
@@ -1619,6 +1641,7 @@ echo " -> FileWriter MP3 output part: $have_
@@ -1619,6 +1647,7 @@ echo " -> FileWriter MP3 output part: $have_
echo " -> FileWriter Vorbis output part: $have_vorbisenc"
echo " -> FileWriter FLAC output part: $have_writer_flac"
echo " Null Audio output (null): yes"

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_sun_audio_c,v 1.3 2010/12/19 18:19:56 shadchin Exp $
--- 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;
effect.format.xmms = fmt;
effect.frequency = rate;
effect.channels = nch;
effect.bps = sun_bps(sun, rate, nch);
output.format.sun = sun;
- output.format.xmms = fmt;
output.frequency = rate;
output.channels = nch;
sun_setparams();
@@ -461,7 +459,7 @@ int sun_open(gint fmt, int rate, int nch)
if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
{
- g_error("%s: %s", audio.devaudio, strerror(errno));
+ g_warning("%s: %s", audio.devaudio, strerror(errno));
return 0;
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2010/12/19 18:19:56 shadchin Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2010/12/27 12:08:21 shadchin Exp $
lib/audacious/
lib/audacious/Container/
lib/audacious/Container/cue.so
@ -49,7 +49,6 @@ lib/audacious/Output/
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/neon.so
@ -59,6 +58,8 @@ lib/audacious/Visualization/blur_scope.so
lib/audacious/Visualization/paranormal.so
lib/audacious/Visualization/rocklight.so
lib/audacious/Visualization/spectrum.so
share/audacious/Skins/
share/audacious/Skins/Classic/
share/audacious/Skins/Classic/balance.png
share/audacious/Skins/Classic/cbuttons.png
share/audacious/Skins/Classic/eq_ex.png
@ -77,6 +78,7 @@ 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/
share/audacious/Skins/Classic1.3/balance.png
share/audacious/Skins/Classic1.3/cbuttons.png
share/audacious/Skins/Classic1.3/eq_ex.png
@ -95,17 +97,22 @@ 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/
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/
share/audacious/Skins/Default/gtk-2.0/Arrows/
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/
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/
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
@ -118,32 +125,42 @@ 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/
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/
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/
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/
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/
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/
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/
share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
share/audacious/Skins/Default/gtk-2.0/ProgressBar/
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/
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/
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
@ -162,16 +179,19 @@ 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/
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/
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/
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
@ -190,6 +210,7 @@ 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/
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
@ -206,6 +227,7 @@ 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/
share/audacious/Skins/Ivory/balance.png
share/audacious/Skins/Ivory/cbuttons.png
share/audacious/Skins/Ivory/eq_ex.png
@ -223,6 +245,7 @@ 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/
share/audacious/Skins/Osmosis/balance.png
share/audacious/Skins/Osmosis/cbuttons.png
share/audacious/Skins/Osmosis/eq_ex.png
@ -240,6 +263,7 @@ 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/
share/audacious/Skins/Refugee/cbuttons.png
share/audacious/Skins/Refugee/eq_ex.png
share/audacious/Skins/Refugee/eqmain.png
@ -256,6 +280,7 @@ 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/
share/audacious/Skins/TinyPlayer/balance.png
share/audacious/Skins/TinyPlayer/cbuttons.png
share/audacious/Skins/TinyPlayer/eq_ex.png
@ -314,6 +339,7 @@ share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
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/
share/audacious/ui/carbon-menubar.ui
share/audacious/ui/equalizer.ui
share/audacious/ui/mainwin.ui