aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2007-03-19 16:01:16 +0000
committerJustin Patrin <papercrane@gmail.com>2007-03-19 16:01:16 +0000
commitfa552ca1705f98a773add4dae8f238863fab206d (patch)
tree0552ac51c1cd4d94e442a4ec2b13f5e372388517
parent77e2700bbc7aaee3d9fb8dbccc90a2ba0048bc38 (diff)
parent4b0a5a81b9ca01ee933e8b422b7f4cd6a25c73e7 (diff)
downloadopenembedded-fa552ca1705f98a773add4dae8f238863fab206d.tar.gz
merge of '301b5f25d70581b16e0309f3f3629def0c5d13f6'
and '9e9a261db34253d39082761bf177e0bd288d3864'
-rw-r--r--packages/efl/imlib2-fb_1.2.2.001.bb2
-rw-r--r--packages/efl/imlib2-native_1.2.2.001.bb2
-rw-r--r--packages/efl/imlib2-x11_1.2.2.001.bb2
-rw-r--r--packages/efl/imlib2.inc6
4 files changed, 7 insertions, 5 deletions
diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb
index 77958d5df3..f2ee48f5d9 100644
--- a/packages/efl/imlib2-fb_1.2.2.001.bb
+++ b/packages/efl/imlib2-fb_1.2.2.001.bb
@@ -1,5 +1,5 @@
require imlib2.inc
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "--without-x \
--disable-mmx"
diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb
index 68bf00026f..65c5b672b2 100644
--- a/packages/efl/imlib2-native_1.2.2.001.bb
+++ b/packages/efl/imlib2-native_1.2.2.001.bb
@@ -2,7 +2,7 @@ require imlib2.inc
inherit native
PROVIDES = "imlib2-native"
DEPENDS = "freetype-native libpng-native jpeg-native"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "--disable-mmx \
--without-x"
diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb
index 14c7530021..67ed947e08 100644
--- a/packages/efl/imlib2-x11_1.2.2.001.bb
+++ b/packages/efl/imlib2-x11_1.2.2.001.bb
@@ -1,6 +1,6 @@
require imlib2.inc
DEPENDS += "virtual/libx11 libxext"
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "--disable-mmx \
--with-x \
diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index 3c54e68277..6a040c5386 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -47,10 +47,12 @@ do_install() {
done
}
-PACKAGES =+ "imlib2-loaders imlib2-filters"
+PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/imlib2/*/.debug ${libdir}/.debug/"
+FILES_${PN}-dbg = "${libdir}/.debug/"
FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
FILES_imlib2-bin = "${bindir}"
FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
+FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
+FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"