summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-10 02:29:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:21 +0100
commiteb342b817f869c475d403d15f2cccd1a8dfad535 (patch)
treeb63ead3af3d6a381c8cc177bbd68143eda884f73
parent3e14122ded698384fd2c0f0741f322188cb12819 (diff)
downloadpoky-eb342b817f869c475d403d15f2cccd1a8dfad535.tar.gz
cogl: remove extra dev from PACKAGES
There should be only one dev and dbg package. (From OE-Core rev: e6be75c98edf878f73e530bc6e63b3c50bf365cc) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc24
1 files changed, 2 insertions, 22 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index af06484903..3da31c85fd 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -6,10 +6,8 @@ inherit clutter
6 6
7DEPENDS = "glib-2.0 gdk-pixbuf" 7DEPENDS = "glib-2.0 gdk-pixbuf"
8PACKAGES =+ "${PN}-examples \ 8PACKAGES =+ "${PN}-examples \
9 libcogl libcogl-dev \ 9 libcogl libcogl-gles2 libcogl-pango libcogl-path \
10 libcogl-gles2 libcogl-gles2-dev \ 10 "
11 libcogl-pango libcogl-pango-dev \
12 libcogl-path libcogl-path-dev"
13AUTOTOOLS_AUXDIR = "${S}/build" 11AUTOTOOLS_AUXDIR = "${S}/build"
14 12
15# Extra DEPENDS for PACKAGECONFIG 13# Extra DEPENDS for PACKAGECONFIG
@@ -61,28 +59,10 @@ PACKAGECONFIG ??= "cogl-pango gles2 \
61 59
62FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 60FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
63FILES_libcogl = "${libdir}/libcogl${SOLIBS}" 61FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
64FILES_libcogl-dev = "${includedir}/cogl/cogl \
65 ${libdir}/libcogl${SOLIBSDEV} \
66 ${libdir}/libcogl.la \
67 ${libdir}/pkgconfig/cogl-1.0.pc \
68 ${libdir}/pkgconfig/cogl-2.0-experimental.pc \
69 ${libdir}/pkgconfig/cogl-gl-1.0.pc"
70FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" 62FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}"
71FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \
72 ${libdir}/libcogl-gles2${SOLIBSDEV} \
73 ${libdir}/libcogl-gles2.la \
74 ${libdir}/pkgconfig/cogl-gles2-*.pc"
75FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" 63FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}"
76FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \
77 ${libdir}/libcogl-pango${SOLIBSDEV} \
78 ${libdir}/libcogl-pango.la \
79 ${libdir}/pkgconfig/cogl-pango-*.pc"
80 64
81FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" 65FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}"
82FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \
83 ${libdir}/libcogl-path${SOLIBSDEV} \
84 ${libdir}/libcogl-path.la \
85 ${libdir}/pkgconfig/cogl-path-*.pc"
86 66
87# For backwards compatibility after Debian-renaming 67# For backwards compatibility after Debian-renaming
88RPROVIDES_libcogl = "cogl-1.0" 68RPROVIDES_libcogl = "cogl-1.0"