From 3fddd5314b51946f9b02760ca7d847bb3107fefa Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 5 Jun 2012 05:47:02 -0700 Subject: libpng: clean up FILE after PACKAGE reorder Signed-off-by: Saul Wold --- meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb | 6 ++++-- meta/recipes-multimedia/libpng/libpng_1.2.49.bb | 4 +--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-multimedia') 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" -- cgit 1.2.3-korg