From: Otavio Salvador Date: Wed, 20 Jun 2012 12:23:22 +0000 (-0300) Subject: Revert "amd-gpu-x11-bin-mx51: set libgl provider and reorder packages" X-Git-Tag: 2.1~1768 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1972f70a3dadabf9af4e8babb387149225f1c802;p=meta-freescale.git Revert "amd-gpu-x11-bin-mx51: set libgl provider and reorder packages" This change broke the rootfs generation and needs to be redone, with more testing. This reverts commit 89a2fa84d42ea9a944e2c9278f3434e912284389. --- diff --git a/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb index 7258dd04..52a8069d 100644 --- a/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +++ b/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb @@ -4,9 +4,8 @@ DESCRIPTION = "GPU driver and apps for x11 on mx51" LICENSE = "MIT" SECTION = "libs" -PR = "r4" +PR = "r5" -PROVIDES = "virtual/libgl" #todo: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "virtual/libx11 libz160" @@ -32,17 +31,12 @@ do_install () { INSANE_SKIP_${PN} = "ldflags" INSANE_SKIP_${PN}-dev = "ldflags" - -# Todo: find out what libres.a and libcsi.a are for -# package include/KHR header -PACKAGES = "libegl libegl-dev libgl libgles libgles-dev libopenvg \ - libopenvg-dev lib2dz160 libd2z430" -FILES_libegl = "${libdir}/libEGL.*" -FILES_libegl-dev = "${includedir}/EGL" -FILES_libgl = "${libdir}/libgsl-fsl.*" -FILES_libgles = "${libdir}/libGLES*" -FILES_libgles-dev = "${includedir}/GLES ${includedir}/GLES2" -FILES_libopenvg = "${libdir}/libOpenVG.*" -FILES_libopenvg-dev = "${includedir}/VG" -FILES_lib2dz160 = "${libdir}/lib2dz160.*" -FILES_lib2dz340 = "${libdir}/lib2dz340.*" +INSANE_SKIP_${PN}-staticdev = "ldflags" +FILES_${PN} = "${bindir}/* ${libdir}/*.so*" +FILES_${PN}-dev = "\ + ${includedir}/EGL/*.h \ + ${includedir}/GLES/*.h \ + ${includedir}/GLES2/*.h \ + ${includedir}/KHR/*.h \ + ${includedir}/VG/*.h" +FILES_${PN}-staticdev = "${libdir}/*.a"