pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc - Change libao to not build OSS, Sun, MacOS X nor seve...
details: https://anonhg.NetBSD.org/pkgsrc/rev/50a314fb8ff8
branches: trunk
changeset: 494190:50a314fb8ff8
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Fri May 20 19:20:55 2005 +0000
description:
- Change libao to not build OSS, Sun, MacOS X nor several other plugins even
when the header files are found. Bump its revision to 1 due to this.
This makes the libao package completely audio-output agnostic.
- Add a libao-macosx package containing the MacOS X plugin (sorry, untested).
- Add a libao-oss package containing the OSS plugin. While here, use
ossaudio.buildlink3.mk to determine the audio device instead of hardcoding
it in a patch.
- Add a libao-macosx package containing the Sun audio plugin (sorry, untested).
Change approved by silence on tech-pkg@ for quite a long time since my
proposal.
I'm doing these changes to cleanup the base libao package. Before these,
it contained a huge conditional to determine when the OSS and/or Sun
plugins were built, which often failed in untested platforms (PLIST
inconsistencies, for example). Having these plugins in independent packages
makes debugging easier, keeps the dependency tree clean and also lets us use
{ONLY,NOT}_FOR_PLATFORM directives to easily say where they work or don't.
diffstat:
audio/Makefile | 5 ++-
audio/libao-macosx/DESCR | 4 ++
audio/libao-macosx/Makefile | 18 +++++++++++
audio/libao-macosx/PLIST | 3 +
audio/libao-oss/DESCR | 4 ++
audio/libao-oss/Makefile | 26 ++++++++++++++++
audio/libao-oss/PLIST | 3 +
audio/libao-sun/DESCR | 4 ++
audio/libao-sun/Makefile | 18 +++++++++++
audio/libao-sun/PLIST | 3 +
audio/libao/DESCR | 5 +-
audio/libao/Makefile | 7 +++-
audio/libao/Makefile.common | 32 +++++--------------
audio/libao/PLIST | 5 +-
audio/libao/PLIST.Darwin | 2 -
audio/libao/buildlink3.mk | 5 ++-
audio/libao/distinfo | 5 +-
audio/libao/patches/patch-aa | 31 -------------------
audio/libao/patches/patch-ae | 70 ++++++++++++++++++++++++++++++++++++++++++-
doc/CHANGES | 6 +++-
20 files changed, 186 insertions(+), 70 deletions(-)
diffs (truncated from 412 to 300 lines):
diff -r d5a74b981289 -r 50a314fb8ff8 audio/Makefile
--- a/audio/Makefile Fri May 20 18:40:42 2005 +0000
+++ b/audio/Makefile Fri May 20 19:20:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2005/05/16 09:55:43 rh Exp $
+# $NetBSD: Makefile,v 1.281 2005/05/20 19:20:55 jmmv Exp $
#
COMMENT= Audio tools
@@ -120,6 +120,9 @@
SUBDIR+= libao
SUBDIR+= libao-arts
SUBDIR+= libao-esound
+SUBDIR+= libao-macosx
+SUBDIR+= libao-oss
+SUBDIR+= libao-sun
SUBDIR+= libaudiofile
SUBDIR+= libcdaudio
SUBDIR+= libcddb
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-macosx/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-macosx/DESCR Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides a MacOS X plugin for libao's core.
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-macosx/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-macosx/Makefile Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/libao/libao-macosx/}
+
+COMMENT+= (MacOS X plugin)
+
+ONLY_FOR_PLATFORM+= Darwin-*-*
+
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
+BUILD_DIRS= ${WRKSRC}/src/plugins/macosx
+INSTALL_DIRS= ${WRKSRC}/src/plugins/macosx
+
+BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-macosx/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-macosx/PLIST Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/libmacosx.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-oss/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-oss/DESCR Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides an OSS plugin for libao's core.
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-oss/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-oss/Makefile Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/libao/libao-oss/}
+
+COMMENT+= (OSS plugin)
+
+NOT_FOR_PLATFORM+= Darwin-*-* Interix-*-* SunOS-*-*
+
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_OSS=no/ENABLE_OSS=yes/g}
+BUILD_DIRS= ${WRKSRC}/src/plugins/oss
+INSTALL_DIRS= ${WRKSRC}/src/plugins/oss
+
+SUBST_CLASSES+= oss
+SUBST_MESSAGE.oss= "Fixing paths to OSS devices."
+SUBST_STAGE.oss= pre-configure
+SUBST_FILES.oss= src/plugins/oss/ao_oss.c
+SUBST_SED.oss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
+SUBST_SED.oss+= -e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
+
+BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-oss/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-oss/PLIST Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/liboss.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-sun/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-sun/DESCR Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides a Sun audio plugin for libao's core.
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-sun/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-sun/Makefile Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/libao/libao-sun/}
+
+COMMENT+= (Sun audio plugin)
+
+ONLY_FOR_PLATFORM+= SunOS-*-*
+
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
+BUILD_DIRS= ${WRKSRC}/src/plugins/sun
+INSTALL_DIRS= ${WRKSRC}/src/plugins/sun
+
+BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao-sun/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libao-sun/PLIST Fri May 20 19:20:55 2005 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/libsun.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/DESCR
--- a/audio/libao/DESCR Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/DESCR Fri May 20 19:20:55 2005 +0000
@@ -9,5 +9,6 @@
* Solaris (untested)
* IRIX (untested)
-This NetBSD package uses /dev/sound (instead of /dev/sound/dsp)
-for the OSS support.
+This package provides the libao's core library but no output plugins
+by itself. You will have to install some of the libao-* packages in
+order to get audio working.
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/Makefile
--- a/audio/libao/Makefile Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/Makefile Fri May 20 19:20:55 2005 +0000
@@ -1,7 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2004/11/16 14:49:13 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/20 19:20:55 jmmv Exp $
+
+PKGREVISION= 1
PKG_INSTALLATION_TYPES= overwrite
.include "Makefile.common"
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/ao/plugins-2
+
.include "../../mk/bsd.pkg.mk"
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/Makefile.common
--- a/audio/libao/Makefile.common Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/Makefile.common Fri May 20 19:20:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/03 14:50:28 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/20 19:20:55 jmmv Exp $
DISTNAME= libao-0.8.6
CATEGORIES= audio devel
@@ -17,32 +17,18 @@
PKGCONFIG_OVERRIDE+= ao.pc.in
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PLIST_SUBST+= LIBOSS=""
-PLIST_SUBST+= LIBSUN="@comment "
-.elif ${OPSYS} == "SunOS"
-PLIST_SUBST+= LIBOSS="@comment "
-PLIST_SUBST+= LIBSUN=""
-.elif ${OPSYS} == "Linux" && empty(MACHINE_PLATFORM:MLinux-*-sparc*)
-PLIST_SUBST+= LIBOSS=""
-PLIST_SUBST+= LIBSUN="@comment "
-.elif ${OPSYS} == "Interix"
-PLIST_SUBST+= LIBOSS="@comment "
-PLIST_SUBST+= LIBSUN="@comment "
-.elif ${OPSYS} == "Darwin"
-PLIST_SUBST+= LIBOSS="@comment "
-PLIST_SUBST+= LIBSUN="@comment "
-.else
-PLIST_SUBST+= LIBOSS=""
-PLIST_SUBST+= LIBSUN=""
-.endif
-
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-alsa09
CONFIGURE_ARGS+= --disable-arts
CONFIGURE_ARGS+= --disable-esd
+CONFIGURE_ARGS+= --disable-nas
+CONFIGURE_ARGS+= --disable-polyp
+CONFIGURE_ARGS+= ENABLE_AIX_AUDIO=no
+CONFIGURE_ARGS+= ENABLE_IRIX=no
+CONFIGURE_ARGS+= ENABLE_OSS=no
+CONFIGURE_ARGS+= ENABLE_SUN_AUDIO=no
+CONFIGURE_ARGS+= ENABLE_MACOSX=no
+CONFIGURE_ARGS+= ENABLE_SOLARIS=no
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/PLIST
--- a/audio/libao/PLIST Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/PLIST Fri May 20 19:20:55 2005 +0000
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2004/11/16 14:49:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/05/20 19:20:55 jmmv Exp $
include/ao/ao.h
include/ao/os_types.h
include/ao/plugin.h
-${LIBOSS}lib/ao/plugins-2/liboss.la
-${LIBSUN}lib/ao/plugins-2/libsun.la
lib/libao.la
lib/pkgconfig/ao.pc
man/man5/libao.conf.5
@@ -45,6 +43,7 @@
share/doc/${PKGNAME}/plugin-overview.html
share/doc/${PKGNAME}/style.css
@dirrm share/doc/${PKGNAME}
+@exec ${MKDIR} -p %D/lib/ao/plugins-2
@dirrm lib/ao/plugins-2
@dirrm lib/ao
@dirrm include/ao
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/PLIST.Darwin
--- a/audio/libao/PLIST.Darwin Fri May 20 18:40:42 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2004/12/18 17:14:18 grant Exp $
-${LIBOSS}lib/ao/plugins-2/libmacosx.la
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/buildlink3.mk
--- a/audio/libao/buildlink3.mk Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/buildlink3.mk Fri May 20 19:20:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/05/20 19:20:55 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAO_BUILDLINK3_MK:= ${LIBAO_BUILDLINK3_MK}+
@@ -16,4 +16,7 @@
BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
.endif # LIBAO_BUILDLINK3_MK
+PRINT_PLIST_AWK+= /^@dirrm lib\/ao\/plugins-2$$/ \
+ { print "@comment in libao: " $$0; next }
+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/distinfo
--- a/audio/libao/distinfo Fri May 20 18:40:42 2005 +0000
+++ b/audio/libao/distinfo Fri May 20 19:20:55 2005 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.16 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.17 2005/05/20 19:20:55 jmmv Exp $
SHA1 (libao-0.8.6.tar.gz) = 2050e008ffcfd6803e2c2c03c7d5f469b6d8379e
RMD160 (libao-0.8.6.tar.gz) = 650258240295f221e95d39cf2380ada73f3cb4e1
Size (libao-0.8.6.tar.gz) = 387583 bytes
-SHA1 (patch-aa) = 09434b7552954e4dcef0a7d544f7576de6189785
SHA1 (patch-ab) = 9d6902cf3532d858e9c3d2cce75c5b5869634028
SHA1 (patch-ac) = b857f4cc3aa195230ce32f6b466d461016400f65
SHA1 (patch-ad) = ed97b52cee1ea5652da233cdd4cf92320d56934d
-SHA1 (patch-ae) = 3b7c1e94ae0b8fe5124fd28780994a6ee3758428
+SHA1 (patch-ae) = 06e4d61d6465009e509d58a4eec6bd8c6f09b62f
diff -r d5a74b981289 -r 50a314fb8ff8 audio/libao/patches/patch-aa
--- a/audio/libao/patches/patch-aa Fri May 20 18:40:42 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2003/12/08 14:33:47 wiz Exp $
-
---- src/plugins/oss/ao_oss.c.orig Sat Oct 4 17:16:05 2003
-+++ src/plugins/oss/ao_oss.c
-@@ -81,22 +81,22 @@ int _open_default_oss_device (char **dev
- char *err = NULL;
- char *dev = NULL;
-
-- /* default: first try the devfs path */
-- *dev_path = strdup("/dev/sound/dsp");
-+ /* default: first try the traditional path */
-+ *dev_path = strdup("/dev/dsp");
- #ifdef BROKEN_OSS
- fd = open(*dev_path, O_WRONLY | O_NONBLOCK);
- #else
- fd = open(*dev_path, O_WRONLY);
- #endif /* BROKEN_OSS */
-
Home |
Main Index |
Thread Index |
Old Index