[oe-commits] org.oe.dev 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

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: dcb9bef36f152b498090be9e7740d352d298326b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dcb9bef36f152b498090be9e7740d352d298326b
Files:
1
packages/alsa/alsa-lib_1.0.11.bb
packages/alsa/alsa-lib_1.0.13.bb
Diffs:

#
# mt diff -r3eb35e8e466fd530e64fd87792238952f22431a7 -rdcb9bef36f152b498090be9e7740d352d298326b
#
# 
# 
# patch "packages/alsa/alsa-lib_1.0.11.bb"
#  from [11dd6d0b465fadedb1c1d5f04d9f27abe9d5f2c0]
#    to [be422da3e21cd317b2b49f2bf23efbc968f9e85f]
# 
# patch "packages/alsa/alsa-lib_1.0.13.bb"
#  from [d3a8cd243d086a04f3d5b068b6675f6b856c92df]
#    to [093c1f31d213cb47c574f65a27661b872d1a77c3]
# 
============================================================
--- packages/alsa/alsa-lib_1.0.11.bb	11dd6d0b465fadedb1c1d5f04d9f27abe9d5f2c0
+++ packages/alsa/alsa-lib_1.0.11.bb	be422da3e21cd317b2b49f2bf23efbc968f9e85f
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 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"
============================================================
--- packages/alsa/alsa-lib_1.0.13.bb	d3a8cd243d086a04f3d5b068b6675f6b856c92df
+++ packages/alsa/alsa-lib_1.0.13.bb	093c1f31d213cb47c574f65a27661b872d1a77c3
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 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"