From c182b11482c8a18e68c44b48a0dca8cf57d1cda0 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 11 Jan 2009 00:15:34 +0000 Subject: libao: remove 0.8.4 and 0.8.6; compile and package oss plugin --- packages/libao/libao-0.8.4/configure.patch | 18 --------------- packages/libao/libao-alsa_0.8.6.bb | 25 --------------------- packages/libao/libao-plugin-alsa_0.8.6.bb | 28 ----------------------- packages/libao/libao_0.8.4.bb | 27 ---------------------- packages/libao/libao_0.8.6.bb | 26 --------------------- packages/libao/libao_0.8.8.bb | 36 ++++++++++++++++-------------- 6 files changed, 19 insertions(+), 141 deletions(-) delete mode 100644 packages/libao/libao-0.8.4/configure.patch delete mode 100644 packages/libao/libao-alsa_0.8.6.bb delete mode 100644 packages/libao/libao-plugin-alsa_0.8.6.bb delete mode 100644 packages/libao/libao_0.8.4.bb delete mode 100644 packages/libao/libao_0.8.6.bb (limited to 'packages') diff --git a/packages/libao/libao-0.8.4/configure.patch b/packages/libao/libao-0.8.4/configure.patch deleted file mode 100644 index b24c0f95c4..0000000000 --- a/packages/libao/libao-0.8.4/configure.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libao-0.8.4/configure.in~configure -+++ libao-0.8.4/configure.in -@@ -174,9 +174,8 @@ - - if test "$BUILD_ESD" = "yes"; then - AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no) -- AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes) - fi -- -+AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes) - - dnl Check for OSS - diff --git a/packages/libao/libao-alsa_0.8.6.bb b/packages/libao/libao-alsa_0.8.6.bb deleted file mode 100644 index c6fda2dbef..0000000000 --- a/packages/libao/libao-alsa_0.8.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library. This is the ALSA plugin." -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "alsa-lib libao" -PR = "r2" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" -S = "${WORKDIR}/libao-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-oss \ - --enable-alsa09 --enable-alsa09-mmap \ - --disable-arts --disable-nas" - -do_stage() { - oe_libinstall -so -C src libao ${STAGING_LIBDIR} -} - -PACKAGES = "${PN}-dbg libao-alsa-plugin libao-alsa-plugin-dev" -FILES_libao-alsa-plugin= "${libdir}/ao/plugins-2/libalsa*.so" -FILES_libao-alsa-plugin-dev += "${libdir}/ao/plugins-2/libalsa*.la" diff --git a/packages/libao/libao-plugin-alsa_0.8.6.bb b/packages/libao/libao-plugin-alsa_0.8.6.bb deleted file mode 100644 index 94727ad5c7..0000000000 --- a/packages/libao/libao-plugin-alsa_0.8.6.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library. This is the ALSA plugin." -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "alsa-lib libao" -PROVIDES = "libao-alsa" -PACKAGES = "${PN}-dbg libao-alsa libao-alsa-dev" -PR = "r3" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" -S = "${WORKDIR}/libao-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-oss \ - --enable-alsa09 --enable-alsa09-mmap \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_LIBDIR}/ao - install -d ${STAGING_LIBDIR}/ao/plugins-2 - oe_libinstall -so -C src/plugins/alsa09/.libs libalsa09 ${STAGING_LIBDIR}/ao/plugins-2 -} - -FILES_libao-alsa = "${libdir}/ao/plugins-2/libalsa*.so" -FILES_libao-alsa-dev = "${libdir}/ao/plugins-2/libalsa*.la" diff --git a/packages/libao/libao_0.8.4.bb b/packages/libao/libao_0.8.4.bb deleted file mode 100644 index d77391fcb9..0000000000 --- a/packages/libao/libao_0.8.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library" -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -PR = "r1" - -SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --disable-alsa09 \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN} += "${libdir}/ao/plugins-2/*.so" diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb deleted file mode 100644 index 7bc44c0fc8..0000000000 --- a/packages/libao/libao_0.8.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "A cross platform audio library" -HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" -PR = "r2" - -SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --disable-alsa09 \ - --disable-arts --disable-nas" - -do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ -} - -FILES_${PN} += "${libdir}/ao/plugins-2/*.so" diff --git a/packages/libao/libao_0.8.8.bb b/packages/libao/libao_0.8.8.bb index 88f7c898ec..0d143c45c3 100644 --- a/packages/libao/libao_0.8.8.bb +++ b/packages/libao/libao_0.8.8.bb @@ -1,39 +1,41 @@ -LICENSE = "GPL" DESCRIPTION = "A cross platform audio library" +LICENSE = "GPL" HOMEPAGE = "http://www.xiph.org/ao/" -SECTION = "libs" -PRIORITY = "optional" +SECTION = "libs/multimedia" DEPENDS = "alsa-lib pulseaudio" PROVIDES = "libao-alsa libao-alsa-plugin" -PR = "r0" +PR = "r1" SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-esd --disable-esdtest \ - --disable-alsa --enable-alsa09 \ - --disable-arts --disable-nas \ - --enable-pulse" +EXTRA_OECONF = "\ + --enable-oss \ + --disable-esd \ + --disable-esdtest \ + --disable-alsa \ + --enable-alsa09 \ + --disable-arts \ + --disable-nas \ + --enable-pulse \ +" do_stage() { - install -d ${STAGING_INCDIR}/ao - install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \ - ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/ - - oe_libinstall -so -C src libao ${STAGING_LIBDIR} - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } -PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev ${PN}-pulse ${PN}-pulse-dev" + + +PACKAGES =+ "${PN}-alsa ${PN}-alsa-dev ${PN}-pulse ${PN}-pulse-dev ${PN}-oss ${PN}-oss-dev" FILES_${PN}-alsa = "${libdir}/ao/plugins-2/libalsa*.so" FILES_${PN}-alsa-dev = "${libdir}/ao/plugins-2/libalsa*.la" FILES_${PN}-pulse = "${libdir}/ao/plugins-2/libpulse*.so" FILES_${PN}-pulse-dev = "${libdir}/ao/plugins-2/libpulse*.la" +FILES_${PN}-oss = "${libdir}/ao/plugins-2/liboss*.so" +FILES_${PN}-oss-dev = "${libdir}/ao/plugins-2/liboss*.la" FILES_${PN} += "${libdir}/ao/plugins-2/*.so" FILES_${PN}-dev += "${libdir}/ao/plugins-2/*.la" FILES_${PN}-dbg += "${libdir}/ao/plugins-2/.debug" - -- cgit v1.2.3