summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-02-22 16:19:27 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-02-22 16:19:27 +0000
commitc4ed7646db10239a47ea23c197f9df0c1773ec7e (patch)
tree177bcbc9789a10b3dc7b0fb05b721a652ced3944
parent0cedb29392cc207583cdc75384ab00cd11ce30da (diff)
alsa-lib: ship needed configs in alsa-conf-base and rest of them in alsa-conf (backward compatibility), also added dependency on configs to library
-rw-r--r--packages/alsa/alsa-lib_1.0.11.bb12
-rw-r--r--packages/alsa/alsa-lib_1.0.13.bb12
2 files changed, 20 insertions, 4 deletions
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 95b788ef8e..8676d7aa87 100644
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
@@ -25,9 +25,17 @@ do_stage() {
install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
}
-PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
FILES_libasound = "${libdir}/libasound.so*"
FILES_alsa-server = "${bindir}/*"
FILES_alsa-conf = "${datadir}"
FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
index 8b6b7af409..35cf843c5f 100644
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
@@ -26,9 +26,17 @@ do_stage() {
install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
}
-PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
FILES_libasound = "${libdir}/libasound.so.*"
FILES_alsa-server = "${bindir}/*"
FILES_alsa-conf = "${datadir}"
FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"