summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-05 05:47:02 -0700
committerSaul Wold <sgw@linux.intel.com>2012-06-19 21:59:51 -0700
commit3fddd5314b51946f9b02760ca7d847bb3107fefa (patch)
tree8f197242a2b1c8090bf7c62d550f769467f3684c /meta/recipes-multimedia
parentda10929059a4aba232d904d7a0d0a54715126c83 (diff)
downloadopenembedded-core-contrib-3fddd5314b51946f9b02760ca7d847bb3107fefa.tar.gz
libpng: clean up FILE after PACKAGE reorder
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb6
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.2.49.bb4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
index b128d77f45..08da5cd471 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
@@ -14,7 +14,7 @@ BBCLASSEXTEND = "native nativesdk"
#FIXME: remove the following
ARM_INSTRUCTION_SET = "arm"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
file://fix-tstamp-declaration.patch"
@@ -35,7 +35,9 @@ PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}"
-FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_${PN} += "${libdir}/${BPN}/smixer/*.so"
+FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug"
+FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la"
FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*"
FILES_alsa-server${PKGSUFFIX} = "${bindir}/*"
FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.49.bb b/meta/recipes-multimedia/libpng/libpng_1.2.49.bb
index c24e6913db..d33a9f5016 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.49.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.49.bb
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \
file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891"
DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
@@ -18,8 +18,6 @@ inherit autotools binconfig pkgconfig
PACKAGES =+ "${PN}12"
FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev += " ${bindir} ${sbindir}"
RPROVIDES_${PN}-dev += "${PN}12-dev"
BBCLASSEXTEND = "native"