diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-02-22 16:46:54 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-02-22 16:46:54 +0000 |
| commit | ba13effd8716620e9cf836f2b92389c236b78742 (patch) | |
| tree | c21ba95841c79b3d17e6e20e1da53d36f76dab51 /packages/alsa | |
| parent | f276af8cdf060a01b0c6502437fed0f52de663e1 (diff) | |
| parent | efa25d85f7325d23744d934f0a39e704795824cc (diff) | |
merge of '75bd0ba9307d9ac6d29617d8194b73d953f31739'
and 'bd6c4042069a1378179f439efde37ca93d020a7b'
Diffstat (limited to 'packages/alsa')
| -rw-r--r-- | packages/alsa/alsa-lib_1.0.11.bb | 16 | ||||
| -rw-r--r-- | packages/alsa/alsa-lib_1.0.13.bb | 16 |
2 files changed, 24 insertions, 8 deletions
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 95b788ef8e..b9169e608f 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 = "r4" # 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 = "${datadir}/alsa/" +FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +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..78df6dfe02 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 = "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, @@ -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 = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +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" |