summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-05 05:47:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:02:58 +0100
commit28b6b281d384cfcb89bbcdeaa60a5dcf93dec105 (patch)
tree5d6ec03aa0836fa762caea58e95a1e2098a76199 /meta/recipes-multimedia
parentfbe245a9746eeb5675e3db7ce0d8e53b77a4ceea (diff)
downloadpoky-28b6b281d384cfcb89bbcdeaa60a5dcf93dec105.tar.gz
libpng: clean up FILE after PACKAGE reorder
(From OE-Core rev: 3fddd5314b51946f9b02760ca7d847bb3107fefa) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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"
14#FIXME: remove the following 14#FIXME: remove the following
15ARM_INSTRUCTION_SET = "arm" 15ARM_INSTRUCTION_SET = "arm"
16 16
17PR = "r1" 17PR = "r2"
18 18
19SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ 19SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
20 file://fix-tstamp-declaration.patch" 20 file://fix-tstamp-declaration.patch"
@@ -35,7 +35,9 @@ PKGSUFFIX = ""
35PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 35PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
36 36
37PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}" 37PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}"
38FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" 38FILES_${PN} += "${libdir}/${BPN}/smixer/*.so"
39FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug"
40FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la"
39FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*" 41FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*"
40FILES_alsa-server${PKGSUFFIX} = "${bindir}/*" 42FILES_alsa-server${PKGSUFFIX} = "${bindir}/*"
41FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/" 43FILES_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"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \ 6LIC_FILES_CHKSUM = "file://LICENSE;md5=20110633230abd47fe8680afa75f1492 \
7 file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891" 7 file://png.h;startline=308;endline=422;md5=edd1c552386a8c3773d90e278ae30891"
8DEPENDS = "zlib" 8DEPENDS = "zlib"
9PR = "r0" 9PR = "r1"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2" 11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.bz2"
12 12
@@ -18,8 +18,6 @@ inherit autotools binconfig pkgconfig
18PACKAGES =+ "${PN}12" 18PACKAGES =+ "${PN}12"
19 19
20FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" 20FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
21FILES_${PN} = "${libdir}/lib*${SOLIBS}"
22FILES_${PN}-dev += " ${bindir} ${sbindir}"
23RPROVIDES_${PN}-dev += "${PN}12-dev" 21RPROVIDES_${PN}-dev += "${PN}12-dev"
24 22
25BBCLASSEXTEND = "native" 23BBCLASSEXTEND = "native"