diff options
author | Lauren Post <lauren.post@freescale.com> | 2015-04-02 15:38:36 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-04-09 08:57:12 -0300 |
commit | b31955d44ba67f85d4556361ef50fe9e92edc33d (patch) | |
tree | 901911d6d02cf901b921c31f4f013d56cca60d64 | |
parent | c24c5ef88cf3c6527e4ada2087952205e435da26 (diff) | |
download | meta-fsl-arm-b31955d44ba67f85d4556361ef50fe9e92edc33d.tar.gz |
imx-gpu-viv: Upgrade to 5.0.11.p4.4 from 3.14.28-1.0.0 GA release
Remove pc files now they are part of imx-gpu-viv package
Fix api trace installation
Change-Id: I95b35b73a249b3e80b7437f3d516e19bc3e1242c
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 36 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc | 12 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc | 13 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc | 13 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb (renamed from recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb) | 4 | ||||
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb (renamed from recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb) | 4 |
6 files changed, 21 insertions, 61 deletions
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index 5cd00fa..ea19292 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | |||
@@ -5,7 +5,7 @@ | |||
5 | DESCRIPTION = "GPU driver and apps for imx6" | 5 | DESCRIPTION = "GPU driver and apps for imx6" |
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | LICENSE = "Proprietary" | 7 | LICENSE = "Proprietary" |
8 | LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93" | 8 | LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;md5=12c028cbbbedb4b8770267131500592c" |
9 | 9 | ||
10 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \ | 10 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \ |
11 | base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \ | 11 | base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \ |
@@ -20,11 +20,8 @@ PE = "1" | |||
20 | 20 | ||
21 | inherit fsl-eula-unpack | 21 | inherit fsl-eula-unpack |
22 | 22 | ||
23 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ | 23 | SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true" |
24 | file://egl_linuxfb.pc \ | 24 | |
25 | file://egl_directfb.pc \ | ||
26 | file://egl_wayland.pc \ | ||
27 | " | ||
28 | PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ | 25 | PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ |
29 | libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ | 26 | libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ |
30 | libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ | 27 | libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ |
@@ -44,8 +41,8 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ | |||
44 | libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ | 41 | libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ |
45 | libwayland-egl-mx6-dev \ | 42 | libwayland-egl-mx6-dev \ |
46 | imx-gpu-viv-g2d imx-gpu-viv-g2d-dev imx-gpu-viv-g2d-dbg \ | 43 | imx-gpu-viv-g2d imx-gpu-viv-g2d-dev imx-gpu-viv-g2d-dbg \ |
47 | imx-gpu-viv-tools imx-gpu-viv-tools-dbg\ | 44 | imx-gpu-viv-tools imx-gpu-viv-tools-dbg \ |
48 | imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg\ | 45 | imx-gpu-viv-tools-apitrace imx-gpu-viv-tools-apitrace-dbg \ |
49 | imx-gpu-viv-demos imx-gpu-viv-demos-dbg \ | 46 | imx-gpu-viv-demos imx-gpu-viv-demos-dbg \ |
50 | " | 47 | " |
51 | 48 | ||
@@ -117,14 +114,14 @@ do_install () { | |||
117 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} | 114 | cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} |
118 | cp -r ${S}/gpu-demos/opt ${D} | 115 | cp -r ${S}/gpu-demos/opt ${D} |
119 | cp -axr ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir} | 116 | cp -axr ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir} |
120 | cp -axr ${S}/apitrace/usr/lib/* ${D}${libdir} | ||
121 | cp -axr ${S}/apitrace/usr/bin/* ${D}${bindir} | ||
122 | 117 | ||
123 | install -d ${D}${libdir}/pkgconfig | 118 | install -d ${D}${libdir}/pkgconfig |
124 | 119 | ||
125 | # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb | 120 | # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb |
126 | if [ "${USE_X11}" = "yes" ]; then | 121 | if [ "${USE_X11}" = "yes" ]; then |
127 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} | 122 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} |
123 | cp -axr ${S}/apitrace/x11/usr/lib/* ${D}${libdir} | ||
124 | cp -axr ${S}/apitrace/x11/usr/bin/* ${D}${bindir} | ||
128 | 125 | ||
129 | backend=x11 | 126 | backend=x11 |
130 | 127 | ||
@@ -140,9 +137,12 @@ do_install () { | |||
140 | # install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc | 137 | # install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc |
141 | #fi | 138 | #fi |
142 | elif [ "${USE_WL}" = "yes" ]; then | 139 | elif [ "${USE_WL}" = "yes" ]; then |
140 | cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | ||
141 | cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | ||
142 | |||
143 | backend=wl | 143 | backend=wl |
144 | 144 | ||
145 | install -m 0644 ${WORKDIR}/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc | 145 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc |
146 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 146 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
147 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc | 147 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc |
148 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc | 148 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc |
@@ -158,13 +158,17 @@ do_install () { | |||
158 | if [ "${USE_DFB}" = "yes" ]; then | 158 | if [ "${USE_DFB}" = "yes" ]; then |
159 | install -d ${D}/${sysconfdir} | 159 | install -d ${D}/${sysconfdir} |
160 | install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc | 160 | install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc |
161 | install -m 0644 ${WORKDIR}/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc | 161 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc |
162 | 162 | ||
163 | cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir} | 163 | cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir} |
164 | cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | ||
165 | cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | ||
164 | backend=dfb | 166 | backend=dfb |
165 | else | 167 | else |
166 | # Regular framebuffer | 168 | # Regular framebuffer |
167 | install -m 0644 ${WORKDIR}/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc | 169 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc |
170 | cp -axr ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | ||
171 | cp -axr ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | ||
168 | backend=fb | 172 | backend=fb |
169 | fi | 173 | fi |
170 | mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so | 174 | mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so |
@@ -202,12 +206,6 @@ do_install () { | |||
202 | rm ${D}${libdir}/libGL.* | 206 | rm ${D}${libdir}/libGL.* |
203 | fi | 207 | fi |
204 | 208 | ||
205 | # skip packaging X11 specific tools if no X11 support is requested | ||
206 | if [ "${USE_X11}" = "no" ]; then | ||
207 | rm ${D}${bindir}/glretrace | ||
208 | rm ${D}${bindir}/eglretrace | ||
209 | fi | ||
210 | |||
211 | # skip packaging wayland libraries if no support is requested | 209 | # skip packaging wayland libraries if no support is requested |
212 | if [ "${USE_WL}" = "no" ]; then | 210 | if [ "${USE_WL}" = "no" ]; then |
213 | rm ${D}${libdir}/libgc_wayland_protocol.* | 211 | rm ${D}${libdir}/libgc_wayland_protocol.* |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc deleted file mode 100644 index ff99007..0000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_directfb.pc +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: egl | ||
7 | Description: Vivante EGL library | ||
8 | Requires.private: | ||
9 | Version: 8.0 | ||
10 | Libs: -L${libdir} -lEGL | ||
11 | Libs.private: -lm -lpthread -ldl | ||
12 | Cflags: -I${includedir} -DLINUX -DEGL_API_DFB | ||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc deleted file mode 100644 index 8c2c8c6..0000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_linuxfb.pc +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: egl | ||
7 | Description: Vivante EGL library | ||
8 | Requires.private: | ||
9 | Version: 8.0 | ||
10 | Libs: -L${libdir} -lEGL | ||
11 | Libs.private: -lm -lpthread -ldl | ||
12 | Cflags: -I${includedir} -DLINUX -DEGL_API_FB | ||
13 | |||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc deleted file mode 100644 index 25bbea8..0000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv/egl_wayland.pc +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | prefix=/usr | ||
2 | exec_prefix=${prefix} | ||
3 | libdir=/usr/lib | ||
4 | includedir=/usr/include | ||
5 | |||
6 | Name: egl | ||
7 | Description: Vivante EGL library | ||
8 | Requires.private: | ||
9 | Version: 8.0 | ||
10 | Libs: -L${libdir} -lEGL | ||
11 | Libs.private: -lm -lpthread -ldl | ||
12 | Cflags: -I${includedir} -DLINUX -DEGL_API_FB -DWL_EGL_PLATFORM | ||
13 | |||
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb index c85e415..7499e35 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-hfp.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-hfp.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | require imx-gpu-viv.inc | 4 | require imx-gpu-viv.inc |
5 | 5 | ||
6 | SRC_URI[md5sum] = "dd2093e6ec951fe843a2944af307d721" | 6 | SRC_URI[md5sum] = "5aa3dfe5b9362f9ee53615e0a56f9009" |
7 | SRC_URI[sha256sum] = "6c436ea127bc1423fbe092ee5eaa3a8513647dfe2aff79f446fa8d6b4d00bcac" | 7 | SRC_URI[sha256sum] = "92654c185835e139cc9485806ad184fdac21f4d640ec9d0e493669235d21de9b" |
8 | 8 | ||
9 | PACKAGE_FP_TYPE = "hardfp" | 9 | PACKAGE_FP_TYPE = "hardfp" |
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb index 5f78d64..7a78048 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.1-sfp.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_5.0.11.p4.4-sfp.bb | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | require imx-gpu-viv.inc | 4 | require imx-gpu-viv.inc |
5 | 5 | ||
6 | SRC_URI[md5sum] = "386b66e25abfb962f8eaf54fa85e7c18" | 6 | SRC_URI[md5sum] = "201398ab011b8765755fafb898efa77d" |
7 | SRC_URI[sha256sum] = "08349e3e6f23287f03e3a896c16938acc9cff44a1f6d624b23f7d348e09ab1ac" | 7 | SRC_URI[sha256sum] = "8eef5414ec9121b38e2e44b3b64705b11f6f5d4503b90c05c31e3990c6ca3999" |
8 | 8 | ||
9 | # FIXME skip the QA error for viv-samples | 9 | # FIXME skip the QA error for viv-samples |
10 | INSANE_SKIP_${PN} += "rpaths" | 10 | INSANE_SKIP_${PN} += "rpaths" |