From ea39e05eb6ad6111388862d08fc64c7b06158d9a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Aug 2012 12:54:23 -0300 Subject: amd-gpu-x11-bin-mx51: Set compatibility as mx5 SoC family only This binaries are compatible with mx5 SoC family only so those ought to not be available on armv7 feed but on the board specific one. Signed-off-by: Otavio Salvador Acked-by: Rogerio Pimentel --- recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb index 10f2e6e..6bf610b 100644 --- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb @@ -4,7 +4,7 @@ DESCRIPTION = "GPU driver and apps for x11 on mx51" LICENSE = "MIT" SECTION = "libs" -PR = "r6" +PR = "r7" #todo: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" @@ -40,3 +40,6 @@ FILES_${PN}-dev = "\ ${includedir}/KHR/*.h \ ${includedir}/VG/*.h" FILES_${PN}-staticdev = "${libdir}/*.a" + +COMPATIBLE_MACHINE = "(mx5)" +PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3-54-g00ecf From 020edff04a8098796a84eb9a053f01acf7c65a2b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Aug 2012 15:02:23 -0300 Subject: amd-gpu-x11-bin-mx51: Proper detect the building on Linux GCC defines __linux__ when running on Linux but the headers where checking by _LINUX define hence enforcing explicit definition by build system; we patch the headers to check for __linux__ and then ensure it "Just Work (TM)". Signed-off-by: Otavio Salvador Acked-by: Rogerio Pimentel --- .../fix-linux-build-check.patch | 54 ++++++++++++++++++++++ .../amd-gpu-x11-bin-mx51_11.09.01.bb | 5 +- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch new file mode 100644 index 0000000..946bfac --- /dev/null +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch @@ -0,0 +1,54 @@ +diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglext.h +--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglext.h 2012-08-18 12:43:19.431788396 -0300 ++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglext.h 2012-08-18 12:43:50.799909873 -0300 +@@ -164,11 +164,11 @@ + * 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 -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglfslext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglfslext.h +--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/EGL/eglfslext.h 2012-08-18 12:43:19.431788396 -0300 ++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/EGL/eglfslext.h 2012-08-18 12:43:50.759785714 -0300 +@@ -65,7 +65,7 @@ + } eglYUVInfo; + #endif + +-#ifdef _LINUX ++#ifdef __linux__ + struct EGLImageInfoFSL + { + void *mem_virt[3]; //virtual addresses for Y/U/V planes +diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/ext.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/ext.h +--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/ext.h 2012-08-18 12:43:19.431788396 -0300 ++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/ext.h 2012-08-18 12:43:50.799909873 -0300 +@@ -15,7 +15,7 @@ + extern "C" { + #endif + +-#ifndef _LINUX ++#ifndef __linux__ + #include + #else + #include "openvg.h" +diff -Nur amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/openvg.h amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/openvg.h +--- amd-gpu-x11-bin-mx51-11.09.01.orig/usr/include/VG/openvg.h 2012-08-18 12:43:19.431788396 -0300 ++++ amd-gpu-x11-bin-mx51-11.09.01/usr/include/VG/openvg.h 2012-08-18 12:43:50.799909873 -0300 +@@ -449,7 +449,7 @@ + # 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/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb index 6bf610b..49fdaab 100644 --- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb @@ -4,14 +4,15 @@ DESCRIPTION = "GPU driver and apps for x11 on mx51" LICENSE = "MIT" SECTION = "libs" -PR = "r7" +PR = "r8" #todo: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "virtual/libx11 libz160" RDEPENDS = "libz160" -SRC_URI = "file://${PN}-${PV}.tar.gz" +SRC_URI = "file://${PN}-${PV}.tar.gz \ + file://fix-linux-build-check.patch" SRC_URI[md5sum] = "499a2cc08dd48a6c5f7db8d231428548" SRC_URI[sha256sum] = "6150d3d72a3f8abb26df1e31cee0f07f53c106c8d5de014c1175c8cb721fac29" -- cgit v1.2.3-54-g00ecf From d3047bc02a8a640ee72e9017422d4e9dfc4586dc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Aug 2012 13:09:33 -0300 Subject: qt4-x11-free: enable OpenGL ES2 and OpenVG for mx5 SoCs Signed-off-by: Otavio Salvador Acked-by: Rogerio Pimentel --- recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend b/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend index cebb203..bb32024 100644 --- a/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend +++ b/recipes-qt/qt4/qt4-x11-free_4.7.4.bbappend @@ -5,6 +5,8 @@ SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" + PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" -- cgit v1.2.3-54-g00ecf From a8c56bc155e9576eb7a7d6546a610b2a6cab1837 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 18 Aug 2012 15:02:15 -0300 Subject: qt4-embedded: enable OpenGL ES2 and OpenVG for mx5 SoCs Signed-off-by: Otavio Salvador Acked-by: Rogerio Pimentel --- recipes-qt/qt4/qt4-embedded_4.7.4.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend b/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend index 70d890f..1419814 100644 --- a/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend +++ b/recipes-qt/qt4/qt4-embedded_4.7.4.bbappend @@ -5,6 +5,8 @@ SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch" PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" +QT_GLFLAGS_mx5 = "-opengl es2 -openvg" + PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 3}" -- cgit v1.2.3-54-g00ecf