From e4a6921eb4f343507dd11b8bef0f3ea4118cbabe Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 20 Dec 2013 17:28:21 +0100 Subject: [PATCH] meta-digi-arm: remove amd-gpu-bin packages Included in upstream 'meta-fsl-arm' Signed-off-by: Javier Viguera --- .../0001-fix-linux-build-check.patch | 70 -------------- .../amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb | 93 ------------------- .../amd-gpu-x11-bin-mx51_11.09.01.bbappend | 8 -- 3 files changed, 171 deletions(-) delete mode 100644 meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch delete mode 100644 meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb delete mode 100644 meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch deleted file mode 100644 index b3643234f..000000000 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51/0001-fix-linux-build-check.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Javier Viguera -Date: Mon, 21 Oct 2013 17:39:17 +0200 -Subject: [PATCH] fix linux build check - -Signed-off-by: Javier Viguera ---- - usr/include/EGL/eglext.h | 6 +++--- - usr/include/EGL/eglfslext.h | 2 +- - usr/include/VG/ext.h | 2 +- - usr/include/VG/openvg.h | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/usr/include/EGL/eglext.h b/usr/include/EGL/eglext.h -index 6325104..3ef1ad4 100755 ---- a/usr/include/EGL/eglext.h -+++ b/usr/include/EGL/eglext.h -@@ -164,11 +164,11 @@ typedef void* EGLSyncKHR; - * nanoseconds (unadjusted standard time). Here, it is defined as - * appropriate for an ISO C compiler. - */ --#ifndef _LINUX -+#ifndef __linux__ - typedef uint64_t EGLTimeKHR; --#else // _LINUX -+#else // __linux__ - typedef unsigned long long EGLTimeKHR; --#endif // _LINUX -+#endif // __linux__ - - #define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR 0xFFF8 - #define EGL_SYNC_STATUS_KHR 0xFFF7 -diff --git a/usr/include/EGL/eglfslext.h b/usr/include/EGL/eglfslext.h -index 4f05161..47a915b 100755 ---- a/usr/include/EGL/eglfslext.h -+++ b/usr/include/EGL/eglfslext.h -@@ -65,7 +65,7 @@ typedef struct eglYUV_INFO - } eglYUVInfo; - #endif - --#ifdef _LINUX -+#ifdef __linux__ - struct EGLImageInfoFSL - { - void *mem_virt[3]; //virtual addresses for Y/U/V planes -diff --git a/usr/include/VG/ext.h b/usr/include/VG/ext.h -index b41c5dc..11f49a8 100755 ---- a/usr/include/VG/ext.h -+++ b/usr/include/VG/ext.h -@@ -15,7 +15,7 @@ - extern "C" { - #endif - --#ifndef _LINUX -+#ifndef __linux__ - #include - #else - #include "openvg.h" -diff --git a/usr/include/VG/openvg.h b/usr/include/VG/openvg.h -index bee327a..78e1e48 100755 ---- a/usr/include/VG/openvg.h -+++ b/usr/include/VG/openvg.h -@@ -449,7 +449,7 @@ typedef enum { - # endif - # elif defined(__APPLE__) - # define VG_API_CALL extern --# elif defined(_LINUX) -+# elif defined(__linux__) - # if defined (OPENVG_DLL_EXPORTS) - # define VG_API_CALL extern - # else diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb deleted file mode 100644 index 83ec87117..000000000 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2011, 2012 Freescale -# Copyright (C) 2012 Digi International -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "GPU driver and apps on mx5x" -LICENSE = "Proprietary" -SECTION = "libs" - -PR = "${DISTRO}.r0" - -#todo: Replace for correct AMD license -LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" - -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" - -SRC_URI = " \ - ${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ - file://0001-fix-linux-build-check.patch \ -" -SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46" -SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9" - -inherit fsl-eula-unpack - -# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have -# the source we cannot fix it. Disable the insane check for now. -python populate_packages_prepend() { - for p in d.getVar('PACKAGES', True).split(): - d.setVar("INSANE_SKIP_%s" % p, "ldflags") -} - -do_install () { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - - cp -axr ${S}/usr/bin/* ${D}${bindir} - cp -axf ${S}/usr/lib/* ${D}${libdir} - cp -axr ${S}/usr/include/* ${D}${includedir} - - find ${D}${bindir} -type f -exec chmod 755 {} \; - find ${D}${libdir} -type f -exec chmod 644 {} \; - find ${D}${includedir} -type f -exec chmod 644 {} \; - - # FIXME: Fix sonames of broken libraries - mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 - mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 - - # FIXME: Remove unkown files - rm -r ${D}${libdir}/libcsi.a \ - ${D}${libdir}/libres.a -} - -PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ - libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ - libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ - libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ - libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ - lib2dz160-mx51 lib2dz160-mx51-dbg \ - lib2dz430-mx51 lib2dz430-mx51-dbg" - -FILES_${PN}-dbg = "${bindir}/.debug/*" - -FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}" -FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}" -FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}" - -FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}" -FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}" -FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}" - -FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" -FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" -FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" - -FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" -FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" - -FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" -FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" -FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" - -FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" -FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" - -FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" -FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" - -RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51" - -COMPATIBLE_MACHINE = "(mx5)" -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend deleted file mode 100644 index 62677c781..000000000 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2013 Digi International. - -PRINC := "${@int(PRINC) + 1}" -PR_append = "+${DISTRO}" - -RCONFLICTS_${PN} = "amd-gpu-bin-mx51" - -COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"