* remove the arts/esound backends and sub-packages

* remove the sun audio backend
* simplify: no more multi-packaging or pseudo flavors

Mostly from Brad.
This commit is contained in:
naddy 2008-12-30 21:59:55 +00:00
parent 5a65b65c49
commit 44a7c70f1e
12 changed files with 20 additions and 89 deletions

View File

@ -1,21 +1,16 @@
# $OpenBSD: Makefile,v 1.42 2008/10/30 19:25:31 naddy Exp $
# $OpenBSD: Makefile,v 1.43 2008/12/30 21:59:55 naddy Exp $
COMMENT-main= portable audio output library
COMMENT-arts= aRts module for portable audio output library
COMMENT-esd= ESounD module for portable audio output library
COMMENT= portable audio output library
VERSION= 0.8.8
DISTNAME= libao-${VERSION}
PKGNAME-main= libao-${VERSION}p1
PKGNAME-arts= libao-arts-${VERSION}
PKGNAME-esd= libao-esd-${VERSION}
DISTNAME= libao-0.8.8
PKGNAME= ${DISTNAME}p2
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ao/
SHARED_LIBS += ao 3.3 # .3.3
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -23,16 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://downloads.xiph.org/releases/ao/
PSEUDO_FLAVORS= no_arts no_esd
FLAVOR?= no_arts
MULTI_PACKAGES= -main
.if !${FLAVOR:L:Mno_arts}
MULTI_PACKAGES+=-arts
.endif
.if !${FLAVOR:L:Mno_esd}
MULTI_PACKAGES+=-esd
.endif
WANTLIB= pthread sndio
USE_LIBTOOL= Yes
SEPARATE_BUILD= simple
@ -40,33 +26,13 @@ AUTOCONF_VERSION = 2.61
AUTOMAKE_VERSION = 1.9
CONFIGURE_STYLE= no-autoheader automake autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
.if ${FLAVOR:L:Mno_arts}
CONFIGURE_ARGS+=--disable-arts
.endif
.if ${FLAVOR:L:Mno_esd}
CONFIGURE_ARGS+=--disable-esd
.endif
CONFIGURE_ARGS+=--disable-nas \
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static \
--disable-arts \
--disable-esd \
--disable-nas \
--disable-pulse
.if ${MULTI_PACKAGES:M-arts}
MODULES= devel/gettext
.endif
LIB_DEPENDS-main=
RUN_DEPENDS-main=
WANTLIB-main= pthread sndio
LIB_DEPENDS-arts= ${MODGETTEXT_LIB_DEPENDS} \
artsc::x11/kde/arts3
RUN_DEPENDS-arts= ${MODGETTEXT_RUN_DEPENDS} \
:libao-${VERSION}:audio/libao
WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 pthread
LIB_DEPENDS-esd= esd.>=2::audio/esound
RUN_DEPENDS-esd= :libao-${VERSION}:audio/libao
WANTLIB-esd= audiofile m pthread
# disable sun audio detection
CONFIGURE_ENV= ac_cv_header_sys_audioio_h=no
post-patch:
mkdir ${WRKSRC}/src/plugins/sndio

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_plugins_sun_ao_sun_c,v 1.1 2007/12/11 22:02:11 naddy Exp $
--- src/plugins/sun/ao_sun.c.orig Tue Dec 11 22:40:48 2007
+++ src/plugins/sun/ao_sun.c Tue Dec 11 22:43:11 2007
@@ -130,8 +130,8 @@ int ao_plugin_open(ao_device *device, ao_sample_format
return 0;
AUDIO_INITINFO(&info);
-#ifdef AUMODE_PLAY /* NetBSD/OpenBSD */
- info.mode = AUMODE_PLAY;
+#ifdef AUMODE_PLAY_ALL /* NetBSD/OpenBSD */
+ info.mode = AUMODE_PLAY_ALL;
#endif
info.play.encoding = AUDIO_ENCODING_SLINEAR;
info.play.precision = format->bits;

View File

@ -5,5 +5,4 @@ it currently supports:
* raw output
* AU files
* WAV files
* sun
* sndio (OpenBSD's native sound system)

View File

@ -1,3 +0,0 @@
libao is a cross-platform audio library that allows programs to
output audio using a simple API on a wide variety of platforms.
This module adds support for playing through the aRts sound server.

View File

@ -1,4 +0,0 @@
libao is a cross-platform audio library that allows programs to
output audio using a simple API on a wide variety of platforms.
This module adds support for playing through the Enlightened Sound
Daemon.

View File

@ -0,0 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.13 2008/12/30 21:59:55 naddy Exp $
lib/ao/
lib/ao/plugins-2/
@comment lib/ao/plugins-2/libsndio.la
lib/ao/plugins-2/libsndio.so
@lib lib/libao.so.${LIBao_VERSION}

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared-arts,v 1.4 2007/07/12 21:10:15 naddy Exp $
@comment lib/ao/plugins-2/libarts.la
lib/ao/plugins-2/libarts.so

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared-esd,v 1.4 2007/07/12 21:10:15 naddy Exp $
@comment lib/ao/plugins-2/libesd.la
lib/ao/plugins-2/libesd.so

View File

@ -1,8 +0,0 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.3 2008/10/30 19:25:31 naddy Exp $
lib/ao/
lib/ao/plugins-2/
@comment lib/ao/plugins-2/libsndio.la
lib/ao/plugins-2/libsndio.so
@comment lib/ao/plugins-2/libsun.la
lib/ao/plugins-2/libsun.so
@lib lib/libao.so.${LIBao_VERSION}

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 16:22:21 naddy Exp $
@comment $OpenBSD: PLIST,v 1.10 2008/12/30 21:59:55 naddy Exp $
@pkgpath audio/libao,-main
@pkgpath audio/libao,no_arts
@pkgpath audio/libao,no_arts,no_esd
@pkgpath audio/libao,no_esd
@pkgpath audio/libao
include/ao/
include/ao/ao.h
include/ao/os_types.h

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-arts,v 1.1 2001/07/22 00:12:55 naddy Exp $
%%SHARED%%

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-esd,v 1.3 2006/02/22 11:05:02 espie Exp $
@pkgpath audio/libao,-esd,no_arts
%%SHARED%%