* [PATCH 02/10] omap3-sgx-modules: Remove X11 related build and packaging
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0 Prabindh Sundareson
` (8 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
The SGX530 driver for X11 is only buildable and testable standalone
with the pre-built X11 package provided with the Graphics SDK.
This patch removes X11 build from the default kernel module recipe,
to enable moving X11 build to a separate recipe.
This is part of a clean up of the Graphics recipe starting from
4.09.00.01 version of the Graphics SDK.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
.../omap3-sgx-modules_4.09.00.01.bb | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
index 55e427f..399374d 100644
--- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
@@ -39,9 +39,7 @@ MODULESLOCATION_ti814x = "dc_ti81xx_linux"
MODULESLOCATION_ti816x = "dc_ti81xx_linux"
MODULESLOCATION_ti33x = "dc_ti335x_linux"
-export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES', 'x11', '1', '0', d)}"
-
-MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
+MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
do_install() {
mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
@@ -49,8 +47,4 @@ do_install() {
${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
-
- if [ "${SUPPORT_XORG}" = "1" ]; then
- cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
- fi
}
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 02/10] omap3-sgx-modules: " Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:53 ` Andreas Müller
2013-05-02 13:39 ` [PATCH 04/10] libgles-omap3: Remove OpenVG references Prabindh Sundareson
` (7 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
ES2.0 build option for SGX user binaries is deprecated as the
corresponding SOC is no longer in production
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 130dc49..1e1a6f1 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -28,7 +28,6 @@ TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
require ../../recipes-ti/includes/ti-eula-unpack.inc
export BINLOCATION ?= "${S}/gfx_rel"
-export ES2LOCATION ?= "${S}/gfx_rel_es2.x"
export ES3LOCATION ?= "${S}/gfx_rel_es3.x"
export ES5LOCATION ?= "${S}/gfx_rel_es5.x"
export ES6LOCATION ?= "${S}/gfx_rel_es6.x"
@@ -150,24 +149,22 @@ do_install () {
echo "[default]" > ${D}${sysconfdir}/powervr.ini
echo "WindowSystem=${LIBGLESWINDOWSYSTEM}" >> ${D}${sysconfdir}/powervr.ini
- # The ES2.x, ES3.x, ES5.x and ES6.x CPUs have different SGX hardware, so we need to install multiple sets of userspace
+ # Create different folders for ease of installing into different platforms with different display drivers/ SGX core revisions
install -d ${D}${libdir}/ES8.0
install -d ${D}${libdir}/ES6.0
install -d ${D}${libdir}/ES5.0
install -d ${D}${libdir}/ES3.0
- install -d ${D}${libdir}/ES2.0
install -d ${D}${bindir}/ES8.0
install -d ${D}${bindir}/ES6.0
install -d ${D}${bindir}/ES5.0
install -d ${D}${bindir}/ES3.0
- install -d ${D}${bindir}/ES2.0
shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test sgx_render_flip_test"
raw_prog="gles1test1 gles2test1 ovg_unit_test"
- for esrev in 2 3 5 6 8 ; do
+ for esrev in 3 5 6 8 ; do
ESLOCATION=$(eval echo $(echo \$\{ES${esrev}LOCATION\}))
if [ -e ${ESLOCATION} ] ; then
cp -pPR ${ESLOCATION}/lib*${IMGPV} ${ESLOCATION}/pvr_drv.so ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
@@ -196,16 +193,14 @@ do_install () {
PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-tests"
# Package the base libraries per silicon revision
-PACKAGES =+ "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
-RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
-FILES_${PN}-es2 = "${libdir}/ES2*/* ${bindir}/ES2*/*"
+PACKAGES =+ "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
+RRECOMMENDS_${PN} += "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
FILES_${PN}-es3 = "${libdir}/ES3*/* ${bindir}/ES3*/*"
FILES_${PN}-es5 = "${libdir}/ES5*/* ${bindir}/ES5*/*"
FILES_${PN}-es6 = "${libdir}/ES6*/* ${bindir}/ES6*/*"
FILES_${PN}-es8 = "${libdir}/ES8*/* ${bindir}/ES8*/*"
# Stop shlib code from picking a subpackage
-PRIVATE_LIBS_${PN}-es2 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
@@ -219,35 +214,31 @@ FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
FILES_${PN}-frontwsegl = "${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
FILES_${PN}-linuxfbwsegl = "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
-PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl-es8"
+PACKAGES =+ "${PN}-blitwsegl-es3 ${PN}-blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-frontwsegl-es8 ${PN}-linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl-es8"
-FILES_${PN}-blitwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
FILES_${PN}-blitwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
FILES_${PN}-blitwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
FILES_${PN}-blitwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_BLITWSEGL.so.*"
FILES_${PN}-blitwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_BLITWSEGL.so.*"
-RRECOMMENDS_${PN}-blitwsegl = " ${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8"
+RRECOMMENDS_${PN}-blitwsegl = " ${PN}-blitwsegl-es3 ${PN}-blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8"
-FILES_${PN}-flipwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_FLIPWSEGL.so.*"
FILES_${PN}-flipwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_FLIPWSEGL.so.*"
FILES_${PN}-flipwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_FLIPWSEGL.so.*"
FILES_${PN}-flipwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_FLIPWSEGL.so.*"
FILES_${PN}-flipwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_FLIPWSEGL.so.*"
-RRECOMMENDS_${PN}-flipwsegl = " ${PN}-flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-flipwsegl-es6 ${PN}-flipwsegl-es8"
+RRECOMMENDS_${PN}-flipwsegl = " ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-flipwsegl-es6 ${PN}-flipwsegl-es8"
-FILES_${PN}-frontwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_FRONTWSEGL.so.*"
FILES_${PN}-frontwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_FRONTWSEGL.so.*"
FILES_${PN}-frontwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_FRONTWSEGL.so.*"
FILES_${PN}-frontwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_FRONTWSEGL.so.*"
FILES_${PN}-frontwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_FRONTWSEGL.so.*"
-RRECOMMENDS_${PN}-frontwsegl = " ${PN}-frontwsegl-es2 ${PN}-frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-frontwsegl-es8"
+RRECOMMENDS_${PN}-frontwsegl = " ${PN}-frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-frontwsegl-es8"
-FILES_${PN}-linuxfbwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_LINUXFBWSEGL.so.*"
FILES_${PN}-linuxfbwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_LINUXFBWSEGL.so.*"
FILES_${PN}-linuxfbwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_LINUXFBWSEGL.so.*"
FILES_${PN}-linuxfbwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
FILES_${PN}-linuxfbwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
-RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl-es8"
+RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl-es8"
CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0
2013-05-02 13:39 ` [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0 Prabindh Sundareson
@ 2013-05-02 13:53 ` Andreas Müller
2013-05-02 14:02 ` Sundareson, Prabindh
0 siblings, 1 reply; 26+ messages in thread
From: Andreas Müller @ 2013-05-02 13:53 UTC (permalink / raw)
To: Prabindh Sundareson; +Cc: meta-ti
On Thu, May 2, 2013 at 3:39 PM, Prabindh Sundareson <prabu@ti.com> wrote:
> ES2.0 build option for SGX user binaries is deprecated as the
> corresponding SOC is no longer in production
Does this mean end of support for this hardware?
Andreas
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0
2013-05-02 13:53 ` Andreas Müller
@ 2013-05-02 14:02 ` Sundareson, Prabindh
0 siblings, 0 replies; 26+ messages in thread
From: Sundareson, Prabindh @ 2013-05-02 14:02 UTC (permalink / raw)
To: Andreas Müller; +Cc: meta-ti@yoctoproject.org
This removes support in the recipe for the SGX core revision 1.0.3, that the Graphics SDK stopped supporting almost 2 years back (from release 4.05.00.01 onwards).
regards,
Prabu
-----Original Message-----
From: Andreas Müller [mailto:schnitzeltony@googlemail.com]
Sent: Thursday, May 02, 2013 7:23 PM
To: Sundareson, Prabindh
Cc: meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0
On Thu, May 2, 2013 at 3:39 PM, Prabindh Sundareson <prabu@ti.com> wrote:
> ES2.0 build option for SGX user binaries is deprecated as the
> corresponding SOC is no longer in production
Does this mean end of support for this hardware?
Andreas
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 04/10] libgles-omap3: Remove OpenVG references
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 02/10] omap3-sgx-modules: " Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0 Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 05/10] libgles-omap3: Remove copying of unused header files Prabindh Sundareson
` (6 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
OpenVG API is no longer supported in the SGX Graphics SDK.
Customers are encouraged to move to OpenGL ES2.x.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 1e1a6f1..3d59906 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -137,8 +137,6 @@ do_install () {
cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/
cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES/ 2>/dev/null || true
cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES2/ 2>/dev/null || true
- cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ 2>/dev/null || true
- cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ 2>/dev/null || true
cp -pPr ${S}/include/*.h ${D}${includedir} || true
cp -pPr ${S}/include/wsegl/*.h ${D}${includedir} || true
@@ -162,7 +160,7 @@ do_install () {
install -d ${D}${bindir}/ES3.0
shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test sgx_render_flip_test"
- raw_prog="gles1test1 gles2test1 ovg_unit_test"
+ raw_prog="gles1test1 gles2test1"
for esrev in 3 5 6 8 ; do
ESLOCATION=$(eval echo $(echo \$\{ES${esrev}LOCATION\}))
@@ -201,10 +199,10 @@ FILES_${PN}-es6 = "${libdir}/ES6*/* ${bindir}/ES6*/*"
FILES_${PN}-es8 = "${libdir}/ES8*/* ${bindir}/ES8*/*"
# Stop shlib code from picking a subpackage
-PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
-PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
-PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
-PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/10] libgles-omap3: Remove copying of unused header files
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (2 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 04/10] libgles-omap3: Remove OpenVG references Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 06/10] libgles-omap3: Add missing RPROVIDES Prabindh Sundareson
` (5 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
Current recipe copies lot of headers that are unused, including
unsupported files for OpenVG. This patch removes copying of such files.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 3d59906..d08a04d 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -133,12 +133,9 @@ do_install () {
cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/
- cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/
- cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/
- cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES/ 2>/dev/null || true
- cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES2/ 2>/dev/null || true
- cp -pPr ${S}/include/*.h ${D}${includedir} || true
- cp -pPr ${S}/include/wsegl/*.h ${D}${includedir} || true
+ cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
+ cp -pPr ${S}/include/OGLES2/* ${D}${includedir}/
+ cp -pPr ${S}/include/wsegl/*.h ${D}${includedir}/
install -d ${D}${sysconfdir}/init.d/
cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (3 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 05/10] libgles-omap3: Remove copying of unused header files Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-14 17:31 ` Denys Dmytriyenko
2013-05-02 13:39 ` [PATCH 07/10] libgles-omap3: Skip ldflags check for debug binaries also Prabindh Sundareson
` (4 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
RPROVIDES specifies the libraries that are dynamically loaded
at runtime. This patch fixes "no package provides libGLESv2.so" and
similar errors that occur when including packages like qtbase.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index d08a04d..c33062a 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -201,6 +201,7 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so lib
PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
+RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLES_CM.so libpvr2d.so libIMGegl.so libsrv_init.so libsrv_um.so libsrv_um_dri.so libglslcompiler.so"
PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
2013-05-02 13:39 ` [PATCH 06/10] libgles-omap3: Add missing RPROVIDES Prabindh Sundareson
@ 2013-05-14 17:31 ` Denys Dmytriyenko
2013-05-15 4:15 ` Prabindh Sundareson
0 siblings, 1 reply; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-05-14 17:31 UTC (permalink / raw)
To: Prabindh Sundareson; +Cc: meta-ti
On Thu, May 02, 2013 at 07:09:20PM +0530, Prabindh Sundareson wrote:
> RPROVIDES specifies the libraries that are dynamically loaded
> at runtime. This patch fixes "no package provides libGLESv2.so" and
> similar errors that occur when including packages like qtbase.
I'm still somewhat not sure about this patch. I know you had this problem with
Qt5, but I'm wondering if there's a bug with shlib handling in latest OE, as
you ususally don't need to specify shared libs in RPROVIDES...
> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> ---
> recipes-graphics/libgles/libgles-omap3.inc | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
> index d08a04d..c33062a 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -201,6 +201,7 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so lib
> PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
>
> +RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLES_CM.so libpvr2d.so libIMGegl.so libsrv_init.so libsrv_um.so libsrv_um_dri.so libglslcompiler.so"
>
> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
>
> --
> 1.7.1
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
2013-05-14 17:31 ` Denys Dmytriyenko
@ 2013-05-15 4:15 ` Prabindh Sundareson
2013-06-17 21:10 ` Denys Dmytriyenko
0 siblings, 1 reply; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-15 4:15 UTC (permalink / raw)
To: Denys Dmytriyenko, Prabindh Sundareson; +Cc: meta-ti@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 2262 bytes --]
Denys,
How can this be confirmed ? Any other list to ask ?
regards
Prabu
________________________________
From: Denys Dmytriyenko <denys@ti.com>
To: Prabindh Sundareson <prabu@ti.com>
Cc: meta-ti@yoctoproject.org
Sent: Tuesday, May 14, 2013 11:01 PM
Subject: Re: [meta-ti] [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
On Thu, May 02, 2013 at 07:09:20PM +0530, Prabindh Sundareson wrote:
> RPROVIDES specifies the libraries that are dynamically loaded
> at runtime. This patch fixes "no package provides libGLESv2.so" and
> similar errors that occur when including packages like qtbase.
I'm still somewhat not sure about this patch. I know you had this problem with
Qt5, but I'm wondering if there's a bug with shlib handling in latest OE, as
you ususally don't need to specify shared libs in RPROVIDES...
> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> ---
> recipes-graphics/libgles/libgles-omap3.inc | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
> index d08a04d..c33062a 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -201,6 +201,7 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so lib
> PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
>
> +RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLES_CM.so libpvr2d.so libIMGegl.so libsrv_init.so libsrv_um.so libsrv_um_dri.so libglslcompiler.so"
>
> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
>
> --
> 1.7.1
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>
_______________________________________________
meta-ti mailing list
meta-ti@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-ti
[-- Attachment #2: Type: text/html, Size: 3587 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
2013-05-15 4:15 ` Prabindh Sundareson
@ 2013-06-17 21:10 ` Denys Dmytriyenko
2013-06-18 2:31 ` Sundareson, Prabindh
0 siblings, 1 reply; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-06-17 21:10 UTC (permalink / raw)
To: Prabindh Sundareson; +Cc: meta-ti@yoctoproject.org
Prabu,
By "libraries that are dynamically loaded at runtime", do you mean shared
libraries or rather libraries loaded with dlopen() [1]? The latter one would
explain why they are not automatically handled by shlib code, as it only
detects shared libraries, AFAIK...
[1] http://tldp.org/HOWTO/Program-Library-HOWTO/dl-libraries.html
--
Denys
On Tue, May 14, 2013 at 09:15:21PM -0700, Prabindh Sundareson wrote:
> Denys,
>
> How can this be confirmed ? Any other list to ask ?
>
>
> regards
> Prabu
>
>
> ________________________________
> From: Denys Dmytriyenko <denys@ti.com>
> To: Prabindh Sundareson <prabu@ti.com>
> Cc: meta-ti@yoctoproject.org
> Sent: Tuesday, May 14, 2013 11:01 PM
> Subject: Re: [meta-ti] [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
>
>
> On Thu, May 02, 2013 at 07:09:20PM +0530, Prabindh Sundareson wrote:
> > RPROVIDES specifies the libraries that are dynamically loaded
> > at runtime. This patch fixes "no package provides libGLESv2.so" and
> > similar errors that occur when including packages like qtbase.
>
> I'm still somewhat not sure about this patch. I know you had this problem with
> Qt5, but I'm wondering if there's a bug with shlib handling in latest OE, as
> you ususally don't need to specify shared libs in RPROVIDES...
>
>
> > Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > ---
> > recipes-graphics/libgles/libgles-omap3.inc | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
> > index d08a04d..c33062a 100644
> > --- a/recipes-graphics/libgles/libgles-omap3.inc
> > +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > @@ -201,6 +201,7 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so lib
> > PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> > PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> >
> > +RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLES_CM.so libpvr2d.so libIMGegl.so libsrv_init.so libsrv_um.so libsrv_um_dri.so libglslcompiler.so"
> >
> > PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
> >
> > --
> > 1.7.1
> >
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
2013-06-17 21:10 ` Denys Dmytriyenko
@ 2013-06-18 2:31 ` Sundareson, Prabindh
0 siblings, 0 replies; 26+ messages in thread
From: Sundareson, Prabindh @ 2013-06-18 2:31 UTC (permalink / raw)
To: Dmytriyenko, Denys, Prabindh Sundareson; +Cc: meta-ti@yoctoproject.org
Denys,
No, these are not dlopen'ed libraries.
regards,
Prabu
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Tuesday, June 18, 2013 2:40 AM
To: Prabindh Sundareson
Cc: Sundareson, Prabindh; meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
Prabu,
By "libraries that are dynamically loaded at runtime", do you mean shared libraries or rather libraries loaded with dlopen() [1]? The latter one would explain why they are not automatically handled by shlib code, as it only detects shared libraries, AFAIK...
[1] http://tldp.org/HOWTO/Program-Library-HOWTO/dl-libraries.html
--
Denys
On Tue, May 14, 2013 at 09:15:21PM -0700, Prabindh Sundareson wrote:
> Denys,
>
> How can this be confirmed ? Any other list to ask ?
>
>
> regards
> Prabu
>
>
> ________________________________
> From: Denys Dmytriyenko <denys@ti.com>
> To: Prabindh Sundareson <prabu@ti.com>
> Cc: meta-ti@yoctoproject.org
> Sent: Tuesday, May 14, 2013 11:01 PM
> Subject: Re: [meta-ti] [PATCH 06/10] libgles-omap3: Add missing RPROVIDES
>
>
> On Thu, May 02, 2013 at 07:09:20PM +0530, Prabindh Sundareson wrote:
> > RPROVIDES specifies the libraries that are dynamically loaded
> > at runtime. This patch fixes "no package provides libGLESv2.so" and
> > similar errors that occur when including packages like qtbase.
>
> I'm still somewhat not sure about this patch. I know you had this problem with
> Qt5, but I'm wondering if there's a bug with shlib handling in latest OE, as
> you ususally don't need to specify shared libs in RPROVIDES...
>
>
> > Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > ---
> > recipes-graphics/libgles/libgles-omap3.inc | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
> > index d08a04d..c33062a 100644
> > --- a/recipes-graphics/libgles/libgles-omap3.inc
> > +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > @@ -201,6 +201,7 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so lib
> > PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> > PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libglslcompiler.so libGLES_CM.so"
> >
> > +RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLES_CM.so libpvr2d.so libIMGegl.so libsrv_init.so libsrv_um.so libsrv_um_dri.so libglslcompiler.so"
> >
> > PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
> >
> > --
> > 1.7.1
> >
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 07/10] libgles-omap3: Skip ldflags check for debug binaries also
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (4 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 06/10] libgles-omap3: Add missing RPROVIDES Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 08/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe Prabindh Sundareson
` (3 subsequent siblings)
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
The libraries libusc.so, libPVRScopeServices.so, libews.so generate
"No GNU_HASH in the elf binary" error during rootfs packaging due to
prebuilt-binary packaging. This patch skips the check.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index c33062a..ae69e69 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -285,6 +285,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
INSANE_SKIP_${PN}-tests = "ldflags"
+INSANE_SKIP_${PN}-dev = "ldflags dev-so"
# Quality control is really poor on these SDKs, so hack around the latest madness:
FILES_${PN} += "${libdir}/*.so "
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 08/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (5 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 07/10] libgles-omap3: Skip ldflags check for debug binaries also Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-14 17:29 ` Denys Dmytriyenko
2013-05-02 13:39 ` [PATCH 09/10] omap3-sgx-modules-x11: " Prabindh Sundareson
` (2 subsequent siblings)
9 siblings, 1 reply; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
libgles-omap3 now contains only non-X11 drivers. The X11 driver is
available in the libgles-omap3-x11 package. This package has
dependency on specific kernel versions for DRM builds.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
.../libgles/libgles-omap3-x11-4.09.00.01/rc.pvr | 124 ++++++++
.../libgles-omap3-x11-4.09.00.01/rc_dri.pvr | 136 +++++++++
recipes-graphics/libgles/libgles-omap3-x11.inc | 312 ++++++++++++++++++++
.../libgles/libgles-omap3-x11_4.09.00.01.bb | 58 ++++
4 files changed, 630 insertions(+), 0 deletions(-)
create mode 100644 recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr
create mode 100644 recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr
create mode 100644 recipes-graphics/libgles/libgles-omap3-x11.inc
create mode 100644 recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
diff --git a/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr
new file mode 100644
index 0000000..7b5cefa
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr
@@ -0,0 +1,124 @@
+#!/bin/sh
+PATH=$PATH:/usr/sbin
+
+# Check if an fb device is available. If not then just go ahead and
+# exit because we have no display.
+fbset > /dev/null 2>&1
+if [ "$?" == "1" ]
+then
+ # looks like there is no display, so let's exit
+ exit 0
+fi
+
+BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
+YRES="$(fbset | grep geom | awk '{print $3}')"
+
+CPUTYPE="$(cputype)"
+
+if [ "$1" = "" ]; then
+ echo PVR-INIT: Please use start, stop, or restart.
+ exit 1
+fi
+
+if [ "$1" = "stop" -o "$1" = "restart" ]; then
+ echo Stopping PVR
+ rmmod bufferclass_ti
+ rmmod omaplfb 2>/dev/null
+ rmmod pvrsrvkm 2>/dev/null
+fi
+
+if [ "$1" = "stop" ]; then
+ exit 0
+fi
+
+# Set RGBA ordering to something the drivers like
+if [ "$BITSPERPIXEL" = "32" ] ; then
+ fbset -rgba 8/16,8/8,8/0,8/24
+fi
+
+# Try to enable triple buffering when there's enough VRAM
+fbset -vyres $(expr $YRES \* 3)
+
+sgxprepare () {
+ echo Starting PVR
+ insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
+
+ if [ "$?" != "0" ]
+ then
+ echo "Could not find pvrsrvkm driver"
+ exit 1
+ fi
+
+ modprobe omaplfb
+ modprobe bufferclass_ti
+
+ pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
+ bc_maj=`grep "bc" /proc/devices | cut -b1,2,3`
+
+ if [ -e /dev/pvrsrvkm ] ; then
+ rm -f /dev/pvrsrvkm
+ fi
+
+ mknod /dev/pvrsrvkm c $pvr_maj 0
+ chmod 666 /dev/pvrsrvkm
+
+ touch /etc/powervr-esrev
+
+ SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
+}
+
+sgxfinish () {
+ # Fix up a bug in opkg
+ if [ $(readlink /usr/lib/libsrv_um.so) != $(readlink /usr/lib/libsrv_um.so.1) ] ; then
+ cd /usr/lib
+ ln -sf $(readlink /usr/lib/libsrv_um.so.1) libsrv_um.so
+ fi
+
+ if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
+ echo -n "Starting SGX fixup for"
+ echo " ES${ES_REVISION}.x"
+ cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib
+ cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin
+ echo "${ES_REVISION}" > /etc/powervr-esrev
+ fi
+
+ if ! /usr/bin/pvrsrvctl --start --no-module; then return; fi
+}
+
+case $CPUTYPE in
+"OMAP3530")
+ sgxprepare
+
+ devmem2 0x48004B48 w 0x2 > /dev/null
+ devmem2 0x48004B10 w 0x1 > /dev/null
+ devmem2 0x48004B00 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+"TI33XX")
+ sgxprepare
+
+ devmem2 0x44e01104 w 0x0 > /dev/null
+ devmem2 0x44e00904 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:8: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+"TI816x")
+ sgxprepare
+
+ devmem2 0x48180F04 w 0x0 > /dev/null
+ devmem2 0x48180900 w 0x2 > /dev/null
+ devmem2 0x48180920 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+*)
+ echo No SGX hardware, not starting PVR
+ ;;
+esac
diff --git a/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr
new file mode 100644
index 0000000..dd1e942
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr
@@ -0,0 +1,136 @@
+#!/bin/sh
+PATH=$PATH:/usr/sbin
+
+# Check if an fb device is available. If not then just go ahead and
+# exit because we have no display.
+fbset > /dev/null 2>&1
+if [ "$?" == "1" ]
+then
+ # looks like there is no display, so let's exit
+ exit 0
+fi
+
+BITSPERPIXEL="$(fbset | grep geom | awk '{print $6}')"
+YRES="$(fbset | grep geom | awk '{print $3}')"
+
+CPUTYPE="$(cputype)"
+
+if [ "$1" = "" ]; then
+ echo PVR-INIT: Please use start, stop, or restart.
+ exit 1
+fi
+
+if [ "$1" = "stop" -o "$1" = "restart" ]; then
+ echo Stopping PVR
+
+ # Stop the X Server.
+ #
+ [ -f /tmp/.X0-lock ] && read XPID < /tmp/.X0-lock && [ -n "$XPID" ] && kill $XPID && while [ -e /proc/$XPID ] ; do sleep 1; done
+
+ rmmod bufferclass_ti
+ rmmod pvrsrvkm 2>/dev/null
+ rmmod drm 2>/dev/null
+fi
+
+if [ "$1" = "stop" ]; then
+ exit 0
+fi
+
+# Set RGBA ordering to something the drivers like
+if [ "$BITSPERPIXEL" = "32" ] ; then
+ fbset -rgba 8/16,8/8,8/0,8/24
+fi
+
+# Try to enable triple buffering when there's enough VRAM
+fbset -vyres $(expr $YRES \* 3)
+
+sgxprepare () {
+ echo Starting PVR
+
+ # Start the X Server.
+ # The X Server will load the PVR Services module.
+ #
+ /usr/local/XSGX/bin/X -verbose -config /usr/local/XSGX/etc/xorg.conf &
+
+ modprobe drm
+
+ insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
+
+ if [ "$?" != "0" ]
+ then
+ echo "Could not find pvrsrvkm driver"
+ exit 1
+ fi
+
+ modprobe bufferclass_ti
+
+ pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
+ bc_maj=`grep "bc" /proc/devices | cut -b1,2,3`
+
+ if [ -e /dev/pvrsrvkm ] ; then
+ rm -f /dev/pvrsrvkm
+ fi
+
+ mknod /dev/pvrsrvkm c $pvr_maj 0
+ chmod 666 /dev/pvrsrvkm
+
+ touch /etc/powervr-esrev
+
+ SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
+}
+
+sgxfinish () {
+ # Fix up a bug in opkg
+ if [ $(readlink /usr/lib/libsrv_um.so) != $(readlink /usr/lib/libsrv_um.so.1) ] ; then
+ cd /usr/lib
+ ln -sf $(readlink /usr/lib/libsrv_um.so.1) libsrv_um.so
+ fi
+
+ if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
+ echo -n "Starting SGX fixup for"
+ echo " ES${ES_REVISION}.x"
+ cp -a /usr/lib/ES${ES_REVISION}.0/* /usr/lib
+ cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin
+ echo "${ES_REVISION}" > /etc/powervr-esrev
+ fi
+
+ if ! /usr/bin/pvrsrvctl --start --no-module; then return; fi
+}
+
+case $CPUTYPE in
+"OMAP3530")
+ sgxprepare
+
+ devmem2 0x48004B48 w 0x2 > /dev/null
+ devmem2 0x48004B10 w 0x1 > /dev/null
+ devmem2 0x48004B00 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x50000014 | sed -e s:0x00010205:5: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+"TI33XX")
+ sgxprepare
+
+ devmem2 0x44e01104 w 0x0 > /dev/null
+ devmem2 0x44e00904 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:8: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+"TI816x")
+ sgxprepare
+
+ devmem2 0x48180F04 w 0x0 > /dev/null
+ devmem2 0x48180900 w 0x2 > /dev/null
+ devmem2 0x48180920 w 0x2 > /dev/null
+
+ ES_REVISION="$(devmem2 0x56000014 | sed -e s:0x00010205:6: -e s:0x00010201:3: -e s:0x00010003:2: | tail -n1 | awk -F': ' '{print $2}')"
+
+ sgxfinish
+ ;;
+*)
+ echo No SGX hardware, not starting PVR
+ ;;
+esac
diff --git a/recipes-graphics/libgles/libgles-omap3-x11.inc b/recipes-graphics/libgles/libgles-omap3-x11.inc
new file mode 100644
index 0000000..d90b65c
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11.inc
@@ -0,0 +1,312 @@
+DESCRIPTION = "libGLES for the omap3 (X11)"
+LICENSE = "proprietary-binary"
+# 'TSPA.txt' might not be the best file to md5sum
+LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
+
+PR = "r35"
+
+COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
+
+X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+
+export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES', 'x11', '1', '0', d)}"
+PVR_INIT ?= "pvrsrvinit"
+
+PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
+
+RREPLACES_${PN} = "libegl libgles1 libgles2"
+RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
+RREPLACES_${PN}-dbg = "libegl-dbg"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
+ file://cputype \
+ file://rc_dri.pvr \
+ file://sample.desktop \
+ file://99-bufferclass.rules \
+"
+
+S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}"
+
+# Logic to unpack installjammer file
+TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+require ../../recipes-ti/includes/ti-eula-unpack.inc
+
+export BINLOCATION ?= "${S}/gfx_rel"
+export ES3LOCATION ?= "${S}/gfx_rel_es3.x"
+export ES5LOCATION ?= "${S}/gfx_rel_es5.x"
+export ES6LOCATION ?= "${S}/gfx_rel_es6.x"
+export ES8LOCATION ?= "${S}/gfx_rel_es8.x"
+
+LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so"
+
+do_configure() {
+ # Attempt to fix up the worst offenders for file permissions
+ for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do
+ chmod 0644 $i
+ done
+
+ # Attempt to create proper library softlinks
+ for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so") $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do
+ if [ "$(readlink -n ${sofile})" = "" ] ; then
+ mv $sofile ${sofile}.${IMGPV}
+ ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}
+ ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}$(echo ${IMGPV} | awk -F. '{print "." $1}')
+ ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}$(echo ${IMGPV} | awk -F. '{print "." $1 "." $2}')
+ fi
+ done
+
+ # Due to recursive make PLAT_* isn't always passed down correctly, so use sed to fix those
+ for mak in $(find ${S} -name "*.mak") ; do
+ sed -i -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g $mak
+ done
+
+ # clear out old stuff
+ find Binaries/ | xargs rm -f || true
+}
+
+# Force in GNU_HASH and paths to libs
+TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L${BINLOCATION} \
+-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir}"
+PARALLEL_MAKE = ""
+
+PLATFORM ?= "LinuxOMAP3"
+
+do_compile() {
+ export TOOLCHAIN="${TOOLCHAIN_PATH}"
+ export PLAT_CC="${CC}"
+ export PLAT_CPP="${CXX}"
+ export PLAR_AR="${AR}"
+
+ export X11ROOT="${STAGING_DIR_HOST}/usr"
+ mkdir -p ${S}/demos/x11
+ mkdir -p ${S}/trainingcourses/x11
+
+ mkdir -p ${S}/demos/raw
+ mkdir -p ${S}/trainingcourses/raw
+
+ # Rebuild demos
+ for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
+ cd $demo/OGLES/Build/LinuxGeneric
+ oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
+ rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
+
+ install -m 0755 $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
+ sed -e s:NAME:$(basename $demo): \
+ -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
+ ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop
+ done
+
+ for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
+ cd $demo/OGLES2/Build/LinuxGeneric
+ oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
+ rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
+
+ install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
+ sed -e s:NAME:$(basename $demo): \
+ -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
+ ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop
+ done
+
+
+ find ${S} -name "*_org" -delete
+
+ # Build OGLES2 Trainingcourses
+ for training in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
+ if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
+ cd $training/OGLES2/Build/LinuxGeneric
+ fi
+
+ if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
+ cd $training/OGLES2/Build/${PLATFORM}
+ fi
+
+ oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
+ rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
+
+ install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/trainingcourses/x11 || true
+ done
+}
+
+do_install () {
+ install -d ${D}${libdir}
+ cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
+ install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
+
+ install -d ${D}${bindir}/
+ install -m 0755 ${WORKDIR}/cputype ${D}${bindir}/
+
+ install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
+ install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
+ install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
+
+ install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
+
+ install -d ${D}${includedir}
+ cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
+ cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/
+
+ cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/
+ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/
+ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES/ 2>/dev/null || true
+ cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES2/ 2>/dev/null || true
+ cp -pPr ${S}/include/wsegl/*.h ${D}${includedir} || true
+
+ install -d ${D}${sysconfdir}/init.d/
+
+ install -d ${D}${sysconfdir}
+ echo "[default]" > ${D}${sysconfdir}/powervr.ini
+ echo "WindowSystem=${LIBGLESWINDOWSYSTEM}" >> ${D}${sysconfdir}/powervr.ini
+
+ # The ES3.x, ES5.x and ES6.x CPUs have different SGX hardware, so we need to install multiple sets of userspace
+
+ install -d ${D}${libdir}/ES8.0
+ install -d ${D}${libdir}/ES6.0
+ install -d ${D}${libdir}/ES5.0
+ install -d ${D}${libdir}/ES3.0
+
+ install -d ${D}${bindir}/ES8.0
+ install -d ${D}${bindir}/ES6.0
+ install -d ${D}${bindir}/ES5.0
+ install -d ${D}${bindir}/ES3.0
+
+ x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest"
+
+ for esrev in 3 5 6 8 ; do
+ ESLOCATION=$(eval echo $(echo \$\{ES${esrev}LOCATION\}))
+ if [ -e ${ESLOCATION} ] ; then
+ cp -pPR ${ESLOCATION}/lib*${IMGPV} ${ESLOCATION}/pvr_drv.so ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
+ for esprog in $x11_prog ; do
+ install -m 0755 ${ESLOCATION}/$esprog ${D}${bindir}/ES${esrev}.0/ 2>/dev/null || true
+ done
+ fi
+ done
+
+ rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm ${D}${bindir}/pdsasm -f || true
+
+ install -d ${D}${prefix}/share/applications
+ cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
+ rm ${D}${prefix}/share/applications/sample.desktop
+
+ install -d ${D}${bindir}/SGX/demos/X11/
+ install -m 0755 ${S}/demos/x11/* ${D}${bindir}/SGX/demos/X11/
+ install -d ${D}${bindir}/SGX/trainingcourses/X11 2>/dev/null || true
+ install -m 0755 ${S}/trainingcourses/x11/* ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
+
+ # Delete objects and linker scripts hidden between the headers
+ find ${D} -name "*.o" -delete
+ find ${D} -name "*.o.cmd" -delete
+
+ install -d ${D}${sysconfdir}/udev/rules.d
+ install -m 0644 ${WORKDIR}/99-bufferclass.rules ${D}${sysconfdir}/udev/rules.d/
+
+}
+
+PACKAGES =+ "${PN}-x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
+
+# Package the base libraries per silicon revision
+PACKAGES =+ "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
+RRECOMMENDS_${PN} += "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
+FILES_${PN}-es3 = "${libdir}/ES3*/* ${bindir}/ES3*/*"
+FILES_${PN}-es5 = "${libdir}/ES5*/* ${bindir}/ES5*/*"
+FILES_${PN}-es6 = "${libdir}/ES6*/* ${bindir}/ES6*/*"
+FILES_${PN}-es8 = "${libdir}/ES8*/* ${bindir}/ES8*/*"
+
+# Stop shlib code from picking a subpackage
+PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+
+
+PACKAGES =+ "${PN}-x11wsegl ${PN}-driwsegl"
+FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so* ${bindir}/x* ${bindir}/*x"
+FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so* ${libdir}/libsrv_um_dri*"
+
+X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-driwsegl-es8 "
+PACKAGES =+ "${X11_SEGL}"
+FILES_${PN}-x11wsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x* ${bindir}/ES2*/*x"
+FILES_${PN}-x11wsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x* ${bindir}/ES3*/*x"
+FILES_${PN}-x11wsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x* ${bindir}/ES5*/*x"
+FILES_${PN}-x11wsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x* ${bindir}/ES6*/*x"
+FILES_${PN}-x11wsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x* ${bindir}/ES8*/*x"
+RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8"
+
+FILES_${PN}-driwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES2*/libsrv_um_dri*"
+FILES_${PN}-driwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES3*/libsrv_um_dri*"
+FILES_${PN}-driwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES5*/libsrv_um_dri*"
+FILES_${PN}-driwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES6*/libsrv_um_dri*"
+FILES_${PN}-driwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES8*/libsrv_um_dri*"
+RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-driwsegl-es8"
+
+CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
+
+FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
+
+FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
+FILES_${PN}-tests = "${bindir}/*test*"
+FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
+ ${libdir}/ES*/.debug ${bindir}/*/.debug\
+ ${bindir}/SGX/demos/*/.debug/* \
+ ${bindir}/SGX/trainingcourses/*/.debug/* \
+ "
+
+FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/* ${prefix}/share/applications "
+RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
+
+FILES_${PN}-x11trainingcourses = "${bindir}/SGX/trainingcourses/X11/*"
+RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
+
+# The libs need the kernel-modules
+RRECOMMENDS_${PN} += "omap3-sgx-modules-x11"
+
+# The initscript calls fbset, cputype calls devmem2
+RDEPENDS_${PN} += "fbset devmem2"
+
+#HACK! These are binaries, so we can't guarantee that LDFLAGS match :(
+INSANE_SKIP_${PN} = "ldflags dev-so"
+INSANE_SKIP_${PN}-es3 = "ldflags dev-so staticdev"
+INSANE_SKIP_${PN}-es5 = "ldflags dev-so staticdev"
+INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
+INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
+INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
+INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
+INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
+INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
+INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
+INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
+INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
+INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
+INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
+INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
+INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
+INSANE_SKIP_${PN}-tests = "ldflags"
+INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
+INSANE_SKIP_${PN}-dev = "ldflags dev-so"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "pvr-init"
+INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
+
+# Append to update-rc.d postinst
+pkg_postinst_${PN}_append() {
+rm -f $D${sysconfdir}/powervr-esrev
+
+ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
+ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
+
+
+}
+
+pkg_postinst_${PN}-x11wsegl() {
+rm -f $D${sysconfdir}/powervr-esrev
+
+echo "[default]" > $D${sysconfdir}/powervr.ini
+echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini
+}
+
+pkg_postinst_${PN}-driwsegl() {
+rm -f $D${sysconfdir}/powervr-esrev
+}
+
diff --git a/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb b/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
new file mode 100644
index 0000000..0e71275
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
@@ -0,0 +1,58 @@
+require libgles-omap3-x11.inc
+
+LICENSE = "TSPA"
+
+DEFAULT_PREFERENCE = "-1"
+
+BINLOCATION_omap3 = "${S}/gfx_rel_es3.x"
+BINLOCATION_ti816x = "${S}/gfx_rel_es6.x"
+BINLOCATION_ti814x = "${S}/gfx_rel_es6.x"
+BINLOCATION_ti33x = "${S}/gfx_rel_es8.x"
+
+PLATFORM = "LinuxARMV7"
+PVR_INIT = "pvrsrvctl"
+
+# download required binary distribution from:
+# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
+# see libgles-omap3-x11.inc for detailed installation instructions
+
+SGXPV = "4_09_00_01"
+IMGPV = "1.9.2188537"
+BINFILE = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
+TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
+ file://cputype \
+ file://rc_dri.pvr \
+ file://sample.desktop \
+ file://99-bufferclass.rules \
+"
+SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
+SRC_URI[sha256sum] = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
+
+S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
+
+LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so"
+
+do_configure_append() {
+ # Change PVR server's user mode library to point to DRI
+ for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
+ if [ "$drifile" != "" ]
+ then
+ dir=$(dirname ${drifile})
+ if [ "$SUPPORT_XORG" = "1" ]
+ then
+ mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
+ else
+ rm -rf ${dir}/libsrv_um_dri.so
+ fi
+ fi
+
+ done
+}
+
+do_install_append() {
+ cp -pP ${WORKDIR}/rc_dri.pvr ${D}${sysconfdir}/init.d/pvr-init
+}
+
+RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
+RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 08/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe
2013-05-02 13:39 ` [PATCH 08/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe Prabindh Sundareson
@ 2013-05-14 17:29 ` Denys Dmytriyenko
0 siblings, 0 replies; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-05-14 17:29 UTC (permalink / raw)
To: Prabindh Sundareson; +Cc: meta-ti
On Thu, May 02, 2013 at 07:09:22PM +0530, Prabindh Sundareson wrote:
> libgles-omap3 now contains only non-X11 drivers. The X11 driver is
> available in the libgles-omap3-x11 package. This package has
> dependency on specific kernel versions for DRM builds.
Please see inline below.
> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> ---
> .../libgles/libgles-omap3-x11-4.09.00.01/rc.pvr | 124 ++++++++
> .../libgles-omap3-x11-4.09.00.01/rc_dri.pvr | 136 +++++++++
> recipes-graphics/libgles/libgles-omap3-x11.inc | 312 ++++++++++++++++++++
> .../libgles/libgles-omap3-x11_4.09.00.01.bb | 58 ++++
> 4 files changed, 630 insertions(+), 0 deletions(-)
> create mode 100644 recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr
> create mode 100644 recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr
> create mode 100644 recipes-graphics/libgles/libgles-omap3-x11.inc
> create mode 100644 recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
>
> diff --git a/recipes-graphics/libgles/libgles-omap3-x11.inc b/recipes-graphics/libgles/libgles-omap3-x11.inc
> new file mode 100644
> index 0000000..d90b65c
> --- /dev/null
> +++ b/recipes-graphics/libgles/libgles-omap3-x11.inc
> @@ -0,0 +1,312 @@
> +DESCRIPTION = "libGLES for the omap3 (X11)"
> +LICENSE = "proprietary-binary"
> +# 'TSPA.txt' might not be the best file to md5sum
> +LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
> +
> +PR = "r35"
> +
> +COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> +
> +X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
I don't think with a separate X11 recipe there is a need for the above
condition...
> +export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES', 'x11', '1', '0', d)}"
Same here - should just be SUPPORT_XORG = "1".
> +PVR_INIT ?= "pvrsrvinit"
> +
> +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
Now, the question I have - do we want to add PROVIDES += "libgles-omap3" here?
With corresponding RPROVIDES, RREPLACES and RCONFLICTS.
This way it would prevent installing them both by accident and would require
specifying PREFERRED_PROVIDER_libgles-omap3 to choose one or another.
> +RREPLACES_${PN} = "libegl libgles1 libgles2"
> +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
> +RREPLACES_${PN}-dbg = "libegl-dbg"
Missing corresponding RPROVIDES and RCONFLICTS?
> +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
> + file://cputype \
> + file://rc_dri.pvr \
> + file://sample.desktop \
> + file://99-bufferclass.rules \
> +"
> +
> +S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}"
> +
> +# Logic to unpack installjammer file
> +TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
> +require ../../recipes-ti/includes/ti-eula-unpack.inc
> +
> +export BINLOCATION ?= "${S}/gfx_rel"
> +export ES3LOCATION ?= "${S}/gfx_rel_es3.x"
> +export ES5LOCATION ?= "${S}/gfx_rel_es5.x"
> +export ES6LOCATION ?= "${S}/gfx_rel_es6.x"
> +export ES8LOCATION ?= "${S}/gfx_rel_es8.x"
> +
> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so"
> +
> +do_configure() {
> + # Attempt to fix up the worst offenders for file permissions
> + for i in $(find ${S} -name "*.h") $(find ${S} -name "*.c") $(find ${S} -name "Make*") ; do
> + chmod 0644 $i
> + done
> +
> + # Attempt to create proper library softlinks
> + for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so") $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do
> + if [ "$(readlink -n ${sofile})" = "" ] ; then
> + mv $sofile ${sofile}.${IMGPV}
> + ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}
> + ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}$(echo ${IMGPV} | awk -F. '{print "." $1}')
> + ln -sf $(basename ${sofile}.${IMGPV}) ${sofile}$(echo ${IMGPV} | awk -F. '{print "." $1 "." $2}')
> + fi
> + done
> +
> + # Due to recursive make PLAT_* isn't always passed down correctly, so use sed to fix those
> + for mak in $(find ${S} -name "*.mak") ; do
> + sed -i -e s:arm-none-linux-gnueabi-:${TARGET_PREFIX}:g $mak
> + done
> +
> + # clear out old stuff
> + find Binaries/ | xargs rm -f || true
> +}
> +
> +# Force in GNU_HASH and paths to libs
> +TARGET_CC_ARCH += " ${TARGET_LINK_HASH_STYLE} -Wl,-rpath-link,${BINLOCATION} -L${BINLOCATION} \
> +-L${STAGING_DIR_TARGET}${libdir} -Wl,-rpath-link,${STAGING_DIR_TARGET}${libdir}"
> +PARALLEL_MAKE = ""
> +
> +PLATFORM ?= "LinuxOMAP3"
> +
> +do_compile() {
> + export TOOLCHAIN="${TOOLCHAIN_PATH}"
> + export PLAT_CC="${CC}"
> + export PLAT_CPP="${CXX}"
> + export PLAR_AR="${AR}"
> +
> + export X11ROOT="${STAGING_DIR_HOST}/usr"
> + mkdir -p ${S}/demos/x11
> + mkdir -p ${S}/trainingcourses/x11
> +
> + mkdir -p ${S}/demos/raw
> + mkdir -p ${S}/trainingcourses/raw
> +
> + # Rebuild demos
> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> + cd $demo/OGLES/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> +
> + install -m 0755 $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
> + sed -e s:NAME:$(basename $demo): \
> + -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> + ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop
> + done
> +
> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> + cd $demo/OGLES2/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> +
> + install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
> + sed -e s:NAME:$(basename $demo): \
> + -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> + ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop
> + done
> +
> +
> + find ${S} -name "*_org" -delete
> +
> + # Build OGLES2 Trainingcourses
> + for training in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> + cd $training/OGLES2/Build/LinuxGeneric
> + fi
> +
> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> + cd $training/OGLES2/Build/${PLATFORM}
> + fi
> +
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=1
> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> +
> + install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/trainingcourses/x11 || true
> + done
> +}
> +
> +do_install () {
> + install -d ${D}${libdir}
> + cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> + install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> +
> + install -d ${D}${bindir}/
> + install -m 0755 ${WORKDIR}/cputype ${D}${bindir}/
> +
> + install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> + install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> +
> + install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> +
> + install -d ${D}${includedir}
> + cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> + cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/
> +
> + cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/
> + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/
> + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES/ 2>/dev/null || true
> + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/Include/GLES/* ${D}${includedir}/GLES2/ 2>/dev/null || true
> + cp -pPr ${S}/include/wsegl/*.h ${D}${includedir} || true
> +
> + install -d ${D}${sysconfdir}/init.d/
> +
> + install -d ${D}${sysconfdir}
> + echo "[default]" > ${D}${sysconfdir}/powervr.ini
> + echo "WindowSystem=${LIBGLESWINDOWSYSTEM}" >> ${D}${sysconfdir}/powervr.ini
> +
> + # The ES3.x, ES5.x and ES6.x CPUs have different SGX hardware, so we need to install multiple sets of userspace
> +
> + install -d ${D}${libdir}/ES8.0
> + install -d ${D}${libdir}/ES6.0
> + install -d ${D}${libdir}/ES5.0
> + install -d ${D}${libdir}/ES3.0
> +
> + install -d ${D}${bindir}/ES8.0
> + install -d ${D}${bindir}/ES6.0
> + install -d ${D}${bindir}/ES5.0
> + install -d ${D}${bindir}/ES3.0
> +
> + x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest"
> +
> + for esrev in 3 5 6 8 ; do
> + ESLOCATION=$(eval echo $(echo \$\{ES${esrev}LOCATION\}))
> + if [ -e ${ESLOCATION} ] ; then
> + cp -pPR ${ESLOCATION}/lib*${IMGPV} ${ESLOCATION}/pvr_drv.so ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> + for esprog in $x11_prog ; do
> + install -m 0755 ${ESLOCATION}/$esprog ${D}${bindir}/ES${esrev}.0/ 2>/dev/null || true
> + done
> + fi
> + done
> +
> + rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm ${D}${bindir}/pdsasm -f || true
> +
> + install -d ${D}${prefix}/share/applications
> + cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> + rm ${D}${prefix}/share/applications/sample.desktop
> +
> + install -d ${D}${bindir}/SGX/demos/X11/
> + install -m 0755 ${S}/demos/x11/* ${D}${bindir}/SGX/demos/X11/
> + install -d ${D}${bindir}/SGX/trainingcourses/X11 2>/dev/null || true
> + install -m 0755 ${S}/trainingcourses/x11/* ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> +
> + # Delete objects and linker scripts hidden between the headers
> + find ${D} -name "*.o" -delete
> + find ${D} -name "*.o.cmd" -delete
> +
> + install -d ${D}${sysconfdir}/udev/rules.d
> + install -m 0644 ${WORKDIR}/99-bufferclass.rules ${D}${sysconfdir}/udev/rules.d/
> +
> +}
> +
> +PACKAGES =+ "${PN}-x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> +
> +# Package the base libraries per silicon revision
> +PACKAGES =+ "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> +RRECOMMENDS_${PN} += "${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> +FILES_${PN}-es3 = "${libdir}/ES3*/* ${bindir}/ES3*/*"
> +FILES_${PN}-es5 = "${libdir}/ES5*/* ${bindir}/ES5*/*"
> +FILES_${PN}-es6 = "${libdir}/ES6*/* ${bindir}/ES6*/*"
> +FILES_${PN}-es8 = "${libdir}/ES8*/* ${bindir}/ES8*/*"
> +
> +# Stop shlib code from picking a subpackage
> +PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
> +PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
> +PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
> +PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
> +
> +
> +PACKAGES =+ "${PN}-x11wsegl ${PN}-driwsegl"
> +FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so* ${bindir}/x* ${bindir}/*x"
> +FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so* ${libdir}/libsrv_um_dri*"
> +
> +X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-driwsegl-es8 "
> +PACKAGES =+ "${X11_SEGL}"
> +FILES_${PN}-x11wsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x* ${bindir}/ES2*/*x"
> +FILES_${PN}-x11wsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x* ${bindir}/ES3*/*x"
> +FILES_${PN}-x11wsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x* ${bindir}/ES5*/*x"
> +FILES_${PN}-x11wsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x* ${bindir}/ES6*/*x"
> +FILES_${PN}-x11wsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x* ${bindir}/ES8*/*x"
> +RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8"
> +
> +FILES_${PN}-driwsegl-es2 = "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES2*/libsrv_um_dri*"
> +FILES_${PN}-driwsegl-es3 = "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES3*/libsrv_um_dri*"
> +FILES_${PN}-driwsegl-es5 = "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES5*/libsrv_um_dri*"
> +FILES_${PN}-driwsegl-es6 = "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES6*/libsrv_um_dri*"
> +FILES_${PN}-driwsegl-es8 = "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.* ${libdir}/ES8*/libsrv_um_dri*"
> +RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-driwsegl-es8"
> +
> +CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> +
> +FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
> +
> +FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> +FILES_${PN}-tests = "${bindir}/*test*"
> +FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> + ${libdir}/ES*/.debug ${bindir}/*/.debug\
> + ${bindir}/SGX/demos/*/.debug/* \
> + ${bindir}/SGX/trainingcourses/*/.debug/* \
> + "
> +
> +FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/* ${prefix}/share/applications "
> +RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> +
> +FILES_${PN}-x11trainingcourses = "${bindir}/SGX/trainingcourses/X11/*"
> +RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> +
> +# The libs need the kernel-modules
> +RRECOMMENDS_${PN} += "omap3-sgx-modules-x11"
> +
> +# The initscript calls fbset, cputype calls devmem2
> +RDEPENDS_${PN} += "fbset devmem2"
> +
> +#HACK! These are binaries, so we can't guarantee that LDFLAGS match :(
> +INSANE_SKIP_${PN} = "ldflags dev-so"
> +INSANE_SKIP_${PN}-es3 = "ldflags dev-so staticdev"
> +INSANE_SKIP_${PN}-es5 = "ldflags dev-so staticdev"
> +INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> +INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> +INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> +INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> +INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> +INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> +INSANE_SKIP_${PN}-tests = "ldflags"
> +INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> +INSANE_SKIP_${PN}-dev = "ldflags dev-so"
> +
> +inherit update-rc.d
> +
> +INITSCRIPT_NAME = "pvr-init"
> +INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
> +
> +# Append to update-rc.d postinst
> +pkg_postinst_${PN}_append() {
> +rm -f $D${sysconfdir}/powervr-esrev
> +
> +ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> +ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> +
> +
> +}
> +
> +pkg_postinst_${PN}-x11wsegl() {
> +rm -f $D${sysconfdir}/powervr-esrev
> +
> +echo "[default]" > $D${sysconfdir}/powervr.ini
> +echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini
> +}
> +
> +pkg_postinst_${PN}-driwsegl() {
> +rm -f $D${sysconfdir}/powervr-esrev
> +}
> +
> diff --git a/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb b/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
> new file mode 100644
> index 0000000..0e71275
> --- /dev/null
> +++ b/recipes-graphics/libgles/libgles-omap3-x11_4.09.00.01.bb
> @@ -0,0 +1,58 @@
> +require libgles-omap3-x11.inc
> +
> +LICENSE = "TSPA"
> +
> +DEFAULT_PREFERENCE = "-1"
> +
> +BINLOCATION_omap3 = "${S}/gfx_rel_es3.x"
> +BINLOCATION_ti816x = "${S}/gfx_rel_es6.x"
> +BINLOCATION_ti814x = "${S}/gfx_rel_es6.x"
> +BINLOCATION_ti33x = "${S}/gfx_rel_es8.x"
> +
> +PLATFORM = "LinuxARMV7"
> +PVR_INIT = "pvrsrvctl"
> +
> +# download required binary distribution from:
> +# http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html
> +# see libgles-omap3-x11.inc for detailed installation instructions
> +
> +SGXPV = "4_09_00_01"
> +IMGPV = "1.9.2188537"
> +BINFILE = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
> +TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
> + file://cputype \
> + file://rc_dri.pvr \
> + file://sample.desktop \
> + file://99-bufferclass.rules \
> +"
> +SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> +SRC_URI[sha256sum] = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
> +
> +S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> +
> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_DRIWSEGL.so"
> +
> +do_configure_append() {
> + # Change PVR server's user mode library to point to DRI
> + for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> + if [ "$drifile" != "" ]
> + then
> + dir=$(dirname ${drifile})
> + if [ "$SUPPORT_XORG" = "1" ]
> + then
> + mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> + else
> + rm -rf ${dir}/libsrv_um_dri.so
> + fi
> + fi
> +
> + done
> +}
> +
> +do_install_append() {
> + cp -pP ${WORKDIR}/rc_dri.pvr ${D}${sysconfdir}/init.d/pvr-init
> +}
> +
> +RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> +RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> --
> 1.7.1
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 09/10] omap3-sgx-modules-x11: Separate X11 SGX driver package into new recipe
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (6 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 08/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-02 13:39 ` [PATCH 10/10] libgles-omap3: Packge init with right permissions Prabindh Sundareson
2013-05-08 13:18 ` [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Maupin, Chase
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
omap3-sgx-modules now contains only non-X11 drivers. The X11 driver is
available in the omap3-sgx-modules-x11 package.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
.../Compile-fixes-for-38-kernel.patch | 346 ++++++++++++++++++++
.../omap3-sgx-modules-x11/kernel-30.patch | 38 +++
.../omap3-sgx-modules-x11_4.09.00.01.bb | 73 ++++
3 files changed, 457 insertions(+), 0 deletions(-)
create mode 100644 recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch
create mode 100644 recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch
create mode 100644 recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch
new file mode 100644
index 0000000..fc315bc
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/Compile-fixes-for-38-kernel.patch
@@ -0,0 +1,346 @@
+--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c-orig 2011-03-08 04:27:35.000000000 -0800
++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c 2011-03-17 13:11:31.000000000 -0700
+@@ -235,9 +235,20 @@ static OMAP_ERROR UnblankDisplay(OMAPLFB
+ {
+ int res;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_lock();
++#else
+ acquire_console_sem();
++#endif
++
+ res = fb_blank(psDevInfo->psLINFBInfo, 0);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_unlock();
++#else
+ release_console_sem();
++#endif
++
+ #if !defined (CONFIG_OMAP2_DSS)
+ if (res != 0 && res != -EINVAL)
+ {
+@@ -1118,7 +1129,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
+ OMAP_ERROR eError = OMAP_ERROR_GENERIC;
+ unsigned long FBSize;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_lock();
++#else
+ acquire_console_sem();
++#endif
+
+ if (fb_idx < 0 || fb_idx >= num_registered_fb)
+ {
+@@ -1254,7 +1269,11 @@ static OMAP_ERROR InitDev(OMAPLFB_DEVINF
+ errModPut:
+ module_put(psLINFBOwner);
+ errRelSem:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_unlock();
++#else
+ release_console_sem();
++#endif
+ return eError;
+ }
+
+@@ -1263,7 +1282,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
+ struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo;
+ struct module *psLINFBOwner;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_lock();
++#else
+ acquire_console_sem();
++#endif
+
+ psLINFBOwner = psLINFBInfo->fbops->owner;
+
+@@ -1274,7 +1297,11 @@ static void DeInitDev(OMAPLFB_DEVINFO *p
+
+ module_put(psLINFBOwner);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
++ console_unlock();
++#else
+ release_console_sem();
++#endif
+ }
+
+ OMAP_ERROR OMAPLFBInit(void)
+--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-03-08 04:27:35.000000000 -0800
++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-03-17 13:40:15.000000000 -0700
+@@ -24,11 +24,14 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <linux/module.h>
+
+ #include <linux/pci.h>
+--- GFX_Linux_KM/services4/srvkm/common/resman.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/common/resman.c 2011-03-17 14:20:07.000000000 -0700
+@@ -24,15 +24,17 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
+ #include "services_headers.h"
+ #include "resman.h"
+
+ #ifdef __linux__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <linux/sched.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
+ #include <linux/hardirq.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-17 14:33:09.000000000 -0700
+@@ -24,9 +24,13 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_uaccess.h 2011-03-17 14:39:14.000000000 -0700
+@@ -27,11 +27,14 @@
+ #ifndef __PVR_UACCESS_H__
+ #define __PVR_UACCESS_H__
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+
+ static inline unsigned long pvr_copy_to_user(void __user *pvTo, const void *pvFrom, unsigned long ulBytes)
+--- GFX_Linux_KM/services4/srvkm/env/linux/mm.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/mm.c 2011-03-17 14:46:23.000000000 -0700
+@@ -24,11 +24,14 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <linux/mm.h>
+ #include <linux/vmalloc.h>
+ #include <asm/io.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.h-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.h 2011-03-17 14:54:37.000000000 -0700
+@@ -27,11 +27,13 @@
+ #ifndef __IMG_LINUX_MUTILS_H__
+ #define __IMG_LINUX_MUTILS_H__
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
+-
+-#include <linux/version.h>
++#endif
+
+ #if !(defined(__i386__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)))
+ #if defined(SUPPORT_LINUX_X86_PAT)
+--- GFX_Linux_KM/services4/srvkm/env/linux/mm.h-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/mm.h 2011-03-17 15:33:56.000000000 -0700
+@@ -27,11 +27,14 @@
+ #ifndef __IMG_LINUX_MM_H__
+ #define __IMG_LINUX_MM_H__
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <linux/slab.h>
+ #include <linux/mm.h>
+ #include <linux/list.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/mmap.c-orig 2011-03-17 20:39:31.000000000 -0700
++++ GFX_Linux_KM/services4/srvkm/env/linux/mmap.c 2011-03-17 20:40:00.000000000 -0700
+@@ -24,11 +24,14 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
+ #include <linux/vmalloc.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/proc.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/proc.c 2011-03-17 21:01:35.000000000 -0700
+@@ -24,13 +24,16 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+ #include <linux/init.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/fs.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/module.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/module.c 2011-03-17 21:32:19.000000000 -0700
+@@ -24,9 +24,13 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+ #if !defined(SUPPORT_DRI_DRM)
+
+@@ -44,7 +48,6 @@
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/fs.h>
+ #include <linux/proc_fs.h>
+
+--- GFX_Linux_KM/services4/srvkm/env/linux/event.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/event.c 2011-03-18 08:51:42.000000000 -0700
+@@ -24,11 +24,14 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <asm/io.h>
+ #include <asm/page.h>
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
+--- GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c 2011-03-18 08:58:16.000000000 -0700
+@@ -24,11 +24,14 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+-#include <linux/version.h>
+ #include <asm/io.h>
+ #include <asm/page.h>
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
+--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_drm.c 2011-03-18 09:01:06.000000000 -0700
+@@ -26,14 +26,17 @@
+
+ #if defined(SUPPORT_DRI_DRM)
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
++#endif
+
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/fs.h>
+ #include <linux/proc_fs.h>
+ #include <asm/ioctl.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/mutils.c-orig 2011-03-08 04:27:36.000000000 -0800
++++ GFX_Linux_KM/services4/srvkm/env/linux/mutils.c 2011-03-18 09:08:12.000000000 -0700
+@@ -24,10 +24,13 @@
+ *
+ ******************************************************************************/
+
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ #ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
+ #endif
+-#include <linux/version.h>
++#endif
+
+ #include <linux/spinlock.h>
+ #include <linux/mm.h>
+--- GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c-orig 2011-03-31 13:46:48.000000000 -0700
++++ GFX_Linux_KM/services4/srvkm/env/linux/pvr_debug.c 2011-03-31 15:14:10.000000000 -0700
+@@ -76,7 +76,8 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG
+ static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ;
+
+
+-static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(gsDebugLockIRQ);
++
+
+ #if !defined (USE_SPIN_LOCK)
+ #define USE_SPIN_LOCK (in_interrupt() || !preemptible())
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch
new file mode 100644
index 0000000..957a154
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11/kernel-30.patch
@@ -0,0 +1,38 @@
+From: Steve Sakoman
+Subject: omap3-sgx-modules: Fix build for Linux 3.0
+
+This patch implements the header change from plat/display.h to video/omapdss.h
+
+Signed-off-by: Steve Sakoman <steve@sakoman.com>
+
+--- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig 2011-08-01 07:21:45.000000000 -0700
++++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c 2011-08-01 07:29:32.000000000 -0700
+@@ -47,12 +47,12 @@
+ #if defined (SUPPORT_TI_DSS_FW)
+ #include <asm/io.h>
+
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))
++#include <video/omapdss.h>
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
+ #include <plat/display.h>
+-#else
++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+ #include <mach/display.h>
+-#endif
+ #else
+ #include <asm/arch-omap/display.h>
+ #endif
+@@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign
+ extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
+ extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
+ #else
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
++#include <video/omapdss.h>
++#else
+ #include <plat/display.h>
++#endif
+ #include <linux/console.h>
+ #include <linux/fb.h>
+ static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
\ No newline at end of file
diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
new file mode 100644
index 0000000..d439d83
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
@@ -0,0 +1,73 @@
+DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs (for X11)"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea5743acf520dd81ca172e69f818a3d4"
+
+TI_BIN_UNPK_CMDS="Y: qY:workdir:Y"
+require ../../recipes-ti/includes/ti-eula-unpack.inc
+
+SGXPV = "4_09_00_01"
+IMGPV = "1.9.2188537"
+BINFILE = "Graphics_SDK_setuplinux_${SGXPV}_minimal_demos.bin"
+
+inherit module
+
+MACHINE_KERNEL_PR_append = "a"
+PR = "${MACHINE_KERNEL_PR}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE}"
+
+SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
+SRC_URI[sha256sum] = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249247647"
+
+TI_BIN_UNPK_WDEXT="/Graphics_SDK_${SGXPV}"
+S = "${WORKDIR}${TI_BIN_UNPK_WDEXT}/GFX_Linux_KM"
+
+PVRBUILD = "release"
+export KERNELDIR = "${STAGING_KERNEL_DIR}"
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+TI_PLATFORM_omap3 = "omap3630"
+TI_PLATFORM_ti814x = "ti81xx"
+TI_PLATFORM_ti816x = "ti81xx"
+TI_PLATFORM_ti33x = "ti335x"
+
+MODULESLOCATION_omap3 = "dc_omapfb3_linux"
+MODULESLOCATION_ti814x = "dc_ti81xx_linux"
+MODULESLOCATION_ti816x = "dc_ti81xx_linux"
+MODULESLOCATION_ti33x = "dc_ti335x_linux"
+
+export SUPPORT_XORG ?= "1"
+
+MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
+
+do_compile() {
+ export TOOLCHAIN="${TOOLCHAIN_PATH}"
+ export PLAT_CC="${CC}"
+ export PLAT_CPP="${CXX}"
+ export PLAR_AR="${AR}"
+ for kernelver in ${WORKDIR}/../../linux-ti-staging/* ; do
+ cp -f $kernelver/git/drivers/gpu/drm/*.c ${S}/services4/3rdparty/linux_drm/
+ done
+ if [ $(echo -e "${KERNEL_VERSION}\n3.3" | sort --version-sort | head -1) = "3.3" ] ; then
+ cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.3 \
+ ${S}/services4/3rdparty/linux_drm/Kbuild
+ else
+ if [ $(echo -e "${KERNEL_VERSION}\n3.2" | sort --version-sort | head -1) = "3.2" ] ; then
+ cp -f ${S}/services4/3rdparty/linux_drm/Kbuild_3.2 \
+ ${S}/services4/3rdparty/linux_drm/Kbuild
+ fi
+ fi
+ oe_runmake BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}
+}
+
+do_install() {
+ mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
+ cp ${S}/pvrsrvkm.ko \
+ ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
+ ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
+
+ cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
+}
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/10] libgles-omap3: Packge init with right permissions
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (7 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 09/10] omap3-sgx-modules-x11: " Prabindh Sundareson
@ 2013-05-02 13:39 ` Prabindh Sundareson
2013-05-08 13:18 ` [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Maupin, Chase
9 siblings, 0 replies; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-02 13:39 UTC (permalink / raw)
To: meta-ti
pvr-init is not packaged in the rootfs with +x permissions,
causing init to fail.
Signed-off-by: Prabindh Sundareson <prabu@ti.com>
---
recipes-graphics/libgles/libgles-omap3.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index ae69e69..602a798 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -139,6 +139,7 @@ do_install () {
install -d ${D}${sysconfdir}/init.d/
cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+ chmod +x ${D}${sysconfdir}/init.d/pvr-init
install -d ${D}${sysconfdir}
echo "[default]" > ${D}${sysconfdir}/powervr.ini
--
1.7.1
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-02 13:39 [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Prabindh Sundareson
` (8 preceding siblings ...)
2013-05-02 13:39 ` [PATCH 10/10] libgles-omap3: Packge init with right permissions Prabindh Sundareson
@ 2013-05-08 13:18 ` Maupin, Chase
2013-05-10 9:16 ` Sundareson, Prabindh
9 siblings, 1 reply; 26+ messages in thread
From: Maupin, Chase @ 2013-05-08 13:18 UTC (permalink / raw)
To: Sundareson, Prabindh, meta-ti@yoctoproject.org
Prabu,
Overall nice job. A couple of things I noticed.
1. You removed the sample.desktop file but did not put it back in a later recipe.
2. You modified the common .inc file and then added the X11 pieces back for 4.09.00.01. This would break people using the older recipes though. So would it perhaps be a good idea to leave the .inc alone and then create a new include file for newer recipe that do this split going forward? Or would it be simpler to provide the X11 package for the older versions as well? This is just a thought and I'm hoping others will chime in here.
Thanks for the patches, it is really good to see this work being done :)
> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> Sent: Thursday, May 02, 2013 8:39 AM
> To: meta-ti@yoctoproject.org
> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> related build and packaging
>
> The SGX530 driver for X11 is only buildable and testable
> standalone
> with the pre-built X11 package provided with the Graphics SDK.
> This patch removes X11 build from the default recipe, to enable
> moving X11 build to a separate recipe.
>
> This is part of a clean up of the Graphics recipe starting from
> 4.09.00.01 version of the Graphics SDK.
>
> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> ---
> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++--
> --------------
> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +-----
> 2 files changed, 30 insertions(+), 181 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> b/recipes-graphics/libgles/libgles-omap3.inc
> index 9a90c56..130dc49 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -7,10 +7,6 @@ PR = "r35"
>
> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
>
> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> '${X11DEPENDS}', '', d)}"
> -
> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> 'x11', '1', '0', d)}"
> PVR_INIT ?= "pvrsrvinit"
>
> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> SRC_URI = "http://software-
> dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> }/exports/${BINFILE} \
> file://cputype \
> file://rc.pvr \
> - file://sample.desktop \
> file://99-bufferclass.rules \
> "
>
> @@ -79,87 +74,53 @@ do_compile() {
> export PLAT_CPP="${CXX}"
> export PLAR_AR="${AR}"
>
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> - mkdir -p ${S}/demos/x11
> - mkdir -p ${S}/trainingcourses/x11
> - fi
> -
> mkdir -p ${S}/demos/raw
> mkdir -p ${S}/trainingcourses/raw
>
> # Rebuild demos
> - for X11BUILD in 0 1 ; do
> - # Don't rebuild demos with X11 support for a non X11
> distro
> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> then
> - continue
> - fi
> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> do
> + cd $demo/OGLES/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> +
> + install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> + done
> +
> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> do
> + cd $demo/OGLES2/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
>
> - for demo in
> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> - cd $demo/OGLES/Build/LinuxGeneric
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> -
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
> - sed -e s:NAME:$(basename $demo): \
> - -e
> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> - ${WORKDIR}/sample.desktop >
> ${WORKDIR}/$(basename $demo).desktop
> - else
> - install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> - fi
> - done
> -
> - for demo in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> - cd $demo/OGLES2/Build/LinuxGeneric
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm -f
> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> -
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> true
> - sed -e s:NAME:$(basename $demo): \
> - -e
> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> - ${WORKDIR}/sample.desktop >
> ${WORKDIR}/$(basename $demo).desktop
> - else
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> true
> - fi
> - done
> + install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> true
> done
>
> find ${S} -name "*_org" -delete
>
> # Build OGLES2 Trainingcourses
> - for X11BUILD in 0 1 ; do
> - # Don't rebuild training courses with X11 support for
> a non X11 distro
> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> then
> - continue
> + for training in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> ] ; then
> + cd $training/OGLES2/Build/LinuxGeneric
> fi
>
> - for training in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> - if [ -e
> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> - cd $training/OGLES2/Build/LinuxGeneric
> - fi
> -
> - if [ -e
> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> - cd $training/OGLES2/Build/${PLATFORM}
> - fi
> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> ; then
> + cd $training/OGLES2/Build/${PLATFORM}
> + fi
>
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm -f
> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
>
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> ${S}/trainingcourses/x11 || true
> - else
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> - fi
> - done
> + install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> done
>
> +
> }
>
> do_install () {
> install -d ${D}${libdir}
> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> + rm ${D}${libdir}/libsrv_um_dri.so*
> + rm ${D}${libdir}/pvr_drv.so*
> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
>
> install -d ${D}${bindir}/
> @@ -169,12 +130,6 @@ do_install () {
> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
>
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - install -m 0755 ${BINLOCATION}/xgles1test1
> ${D}${bindir}/
> - install -m 0755
> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> ${D}${bindir}/|| true
> - cp -pPR
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> b/*X11WS* ${D}${libdir} || true
> - fi
> -
> install -d ${D}${includedir}
> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/
> @@ -211,13 +166,12 @@ do_install () {
>
> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> sgx_render_flip_test"
> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> xovg_unit_test"
>
> for esrev in 2 3 5 6 8 ; do
> ESLOCATION=$(eval echo $(echo
> \$\{ES${esrev}LOCATION\}))
> if [ -e ${ESLOCATION} ] ; then
> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> ${ESLOCATION}/pvr_drv.so ${ESLOCATION}/*.a
> ${D}${libdir}/ES${esrev}.0/
> - for esprog in $shared_prog $raw_prog
> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> + for esprog in $shared_prog $raw_prog ; do
> install -m 0755 ${ESLOCATION}/$esprog
> ${D}${bindir}/ES${esrev}.0/ 2>/dev/null || true
> done
> fi
> @@ -225,17 +179,6 @@ do_install () {
>
> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> ${D}${bindir}/pdsasm -f || true
>
> - install -d ${D}${prefix}/share/applications
> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> - rm ${D}${prefix}/share/applications/sample.desktop
> -
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - install -d ${D}${bindir}/SGX/demos/X11/
> - install -m 0755 ${S}/demos/x11/*
> ${D}${bindir}/SGX/demos/X11/
> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> 2>/dev/null || true
> - install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> - fi
> -
> install -d ${D}${bindir}/SGX/demos/Raw/
> install -m 0755 ${S}/demos/raw/*
> ${D}${bindir}/SGX/demos/Raw/
> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> 2>/dev/null || true
> @@ -251,8 +194,7 @@ do_install () {
>
> }
>
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> d)} \
> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> tests"
> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> tests"
> # Package the base libraries per silicon revision
> PACKAGES =+ "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> ${PN}-es8"
> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> libIMGegl.so libsrv_um.so libOpenVG.so li
>
>
> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> ${PN}-linuxfbwsegl"
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11wsegl ${PN}-driwsegl" ,"", d)}"
> +
> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> FILES_${PN}-frontwsegl = "${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> FILES_${PN}-linuxfbwsegl =
> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> ${bindir}/x* ${bindir}/*x"
> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> ${libdir}/libsrv_um_dri*"
>
> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl-
> es8"
>
> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> driwsegl-es6 ${PN}-driwsegl-es8 "
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> 'x11',"${X11_SEGL}" ,"", d)}"
> FILES_${PN}-blitwsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-blitwsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-blitwsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> FILES_${PN}-linuxfbwsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2 ${PN}-
> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> ${PN}-linuxfbwsegl-es8"
>
> -FILES_${PN}-x11wsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> ${bindir}/ES2*/*x"
> -FILES_${PN}-x11wsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> ${bindir}/ES3*/*x"
> -FILES_${PN}-x11wsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> ${bindir}/ES5*/*x"
> -FILES_${PN}-x11wsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> ${bindir}/ES6*/*x"
> -FILES_${PN}-x11wsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> ${bindir}/ES8*/*x"
> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> x11wsegl-es8"
> -
> -FILES_${PN}-driwsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES2*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES3*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES5*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES6*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES8*/libsrv_um_dri*"
> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> driwsegl-es8"
> -
> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
>
> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
>
> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> FILES_${PN}-tests = "${bindir}/*test*"
> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> ${libdir}/ES*/.debug ${bindir}/*/.debug\
> @@ -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> ${bindir}/.debug/* \
> "
>
> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> ${prefix}/share/applications "
> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
>
> FILES_${PN}-rawtrainingcourses =
> "${bindir}/SGX/trainingcourses/Raw/*"
> -FILES_${PN}-x11trainingcourses =
> "${bindir}/SGX/trainingcourses/X11/*"
> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
>
> # The libs need the kernel-modules
> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> staticdev"
> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> INSANE_SKIP_${PN}-tests = "ldflags"
> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
>
> # Quality control is really poor on these SDKs, so hack around
> the latest madness:
> FILES_${PN} += "${libdir}/*.so "
> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> 0 1 6 ."
> # Append to update-rc.d postinst
> pkg_postinst_${PN}_append() {
> rm -f $D${sysconfdir}/powervr-esrev
> -
> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> -fi
> -
> }
>
> pkg_postinst_${PN}-blitwsegl() {
> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() {
> rm -f $D${sysconfdir}/powervr-esrev
> }
>
> -pkg_postinst_${PN}-x11wsegl() {
> -rm -f $D${sysconfdir}/powervr-esrev
> -
> -echo "[default]" > $D${sysconfdir}/powervr.ini
> -echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> $D${sysconfdir}/powervr.ini
> -}
> -
> -pkg_postinst_${PN}-driwsegl() {
> -rm -f $D${sysconfdir}/powervr-esrev
> -}
> -
> diff --git a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> index 7c6f231..165a406 100644
> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> SRC_URI = "http://software-
> dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> }/exports/${BINFILE} \
> file://cputype \
> file://rc.pvr \
> - file://rc_dri.pvr \
> - file://sample.desktop \
> file://99-bufferclass.rules \
> "
> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
>
> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
>
> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> d)}"
> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
>
> -do_configure_append() {
> -
> - # Change PVR server's user mode library to point to DRI
> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> - if [ "$drifile" != "" ]
> - then
> - dir=$(dirname ${drifile})
> - if [ "$SUPPORT_XORG" = "1" ]
> - then
> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> - else
> - rm -rf ${dir}/libsrv_um_dri.so
> - fi
> - fi
> -
> - done
> -}
> -
> -do_install_append() {
> -
> - # In this version of the graphics SDK the following
> directories do not exist:
> - #
> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> (doesn't exist)
> - #
> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> s.h (doesn't exist)
> - # Therefore, need to copy these files manually at the only
> location that they do exist
> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> -
> - rm ${D}${sysconfdir}/init.d/pvr-init
> -
> - if [ "$SUPPORT_XORG" = "1" ]; then
> - cp -pP ${WORKDIR}/rc_dri.pvr
> ${D}${sysconfdir}/init.d/pvr-init
> - else
> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> init
> - fi
> -
> -}
> -
> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> --
> 1.7.1
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-08 13:18 ` [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging Maupin, Chase
@ 2013-05-10 9:16 ` Sundareson, Prabindh
2013-05-10 13:27 ` Maupin, Chase
0 siblings, 1 reply; 26+ messages in thread
From: Sundareson, Prabindh @ 2013-05-10 9:16 UTC (permalink / raw)
To: Maupin, Chase, meta-ti@yoctoproject.org
Chase, thanks for the review,
1) Ok, I will add it. By "later recipe", you mean the separated x11 recipe, right ?
2) Good point - I am ok to leave the old .inc and create a new one with the changes starting from 4.09 then. Is this ok ?
regards,
Prabu
-----Original Message-----
From: Maupin, Chase
Sent: Wednesday, May 08, 2013 6:48 PM
To: Sundareson, Prabindh; meta-ti@yoctoproject.org
Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
Prabu,
Overall nice job. A couple of things I noticed.
1. You removed the sample.desktop file but did not put it back in a later recipe.
2. You modified the common .inc file and then added the X11 pieces back for 4.09.00.01. This would break people using the older recipes though. So would it perhaps be a good idea to leave the .inc alone and then create a new include file for newer recipe that do this split going forward? Or would it be simpler to provide the X11 package for the older versions as well? This is just a thought and I'm hoping others will chime in here.
Thanks for the patches, it is really good to see this work being done :)
> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> Sent: Thursday, May 02, 2013 8:39 AM
> To: meta-ti@yoctoproject.org
> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related
> build and packaging
>
> The SGX530 driver for X11 is only buildable and testable standalone
> with the pre-built X11 package provided with the Graphics SDK.
> This patch removes X11 build from the default recipe, to enable moving
> X11 build to a separate recipe.
>
> This is part of a clean up of the Graphics recipe starting from
> 4.09.00.01 version of the Graphics SDK.
>
> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> ---
> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++--
> --------------
> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +-----
> 2 files changed, 30 insertions(+), 181 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> b/recipes-graphics/libgles/libgles-omap3.inc
> index 9a90c56..130dc49 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -7,10 +7,6 @@ PR = "r35"
>
> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
>
> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> '${X11DEPENDS}', '', d)}"
> -
> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> 'x11', '1', '0', d)}"
> PVR_INIT ?= "pvrsrvinit"
>
> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> SRC_URI = "http://software-
> dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> }/exports/${BINFILE} \
> file://cputype \
> file://rc.pvr \
> - file://sample.desktop \
> file://99-bufferclass.rules \
> "
>
> @@ -79,87 +74,53 @@ do_compile() {
> export PLAT_CPP="${CXX}"
> export PLAR_AR="${AR}"
>
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> - mkdir -p ${S}/demos/x11
> - mkdir -p ${S}/trainingcourses/x11
> - fi
> -
> mkdir -p ${S}/demos/raw
> mkdir -p ${S}/trainingcourses/raw
>
> # Rebuild demos
> - for X11BUILD in 0 1 ; do
> - # Don't rebuild demos with X11 support for a non X11
> distro
> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> then
> - continue
> - fi
> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> do
> + cd $demo/OGLES/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> +
> + install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> + done
> +
> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> do
> + cd $demo/OGLES2/Build/LinuxGeneric
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
>
> - for demo in
> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> - cd $demo/OGLES/Build/LinuxGeneric
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> -
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
> - sed -e s:NAME:$(basename $demo): \
> - -e
> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> - ${WORKDIR}/sample.desktop >
> ${WORKDIR}/$(basename $demo).desktop
> - else
> - install -m 0755
> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> - fi
> - done
> -
> - for demo in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> - cd $demo/OGLES2/Build/LinuxGeneric
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm -f
> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> -
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 || true
> - sed -e s:NAME:$(basename $demo): \
> - -e
> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> - ${WORKDIR}/sample.desktop >
> ${WORKDIR}/$(basename $demo).desktop
> - else
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> - fi
> - done
> + install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
> done
>
> find ${S} -name "*_org" -delete
>
> # Build OGLES2 Trainingcourses
> - for X11BUILD in 0 1 ; do
> - # Don't rebuild training courses with X11 support for
> a non X11 distro
> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> then
> - continue
> + for training in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> ] ; then
> + cd $training/OGLES2/Build/LinuxGeneric
> fi
>
> - for training in
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> - if [ -e
> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> - cd $training/OGLES2/Build/LinuxGeneric
> - fi
> -
> - if [ -e
> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> - cd $training/OGLES2/Build/${PLATFORM}
> - fi
> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> ; then
> + cd $training/OGLES2/Build/${PLATFORM}
> + fi
>
> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> - rm -f
> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
>
> - if [ $X11BUILD -eq 1 ] ; then
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> ${S}/trainingcourses/x11 || true
> - else
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> - fi
> - done
> + install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> done
>
> +
> }
>
> do_install () {
> install -d ${D}${libdir}
> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> + rm ${D}${libdir}/libsrv_um_dri.so*
> + rm ${D}${libdir}/pvr_drv.so*
> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
>
> install -d ${D}${bindir}/
> @@ -169,12 +130,6 @@ do_install () {
> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
>
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - install -m 0755 ${BINLOCATION}/xgles1test1
> ${D}${bindir}/
> - install -m 0755
> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> ${D}${bindir}/|| true
> - cp -pPR
> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> b/*X11WS* ${D}${libdir} || true
> - fi
> -
> install -d ${D}${includedir}
> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -211,13
> +166,12 @@ do_install () {
>
> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> sgx_render_flip_test"
> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> xovg_unit_test"
>
> for esrev in 2 3 5 6 8 ; do
> ESLOCATION=$(eval echo $(echo
> \$\{ES${esrev}LOCATION\}))
> if [ -e ${ESLOCATION} ] ; then
> cp -pPR ${ESLOCATION}/lib*${IMGPV} ${ESLOCATION}/pvr_drv.so
> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> - for esprog in $shared_prog $raw_prog
> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> + for esprog in $shared_prog $raw_prog ; do
> install -m 0755 ${ESLOCATION}/$esprog ${D}${bindir}/ES${esrev}.0/
> 2>/dev/null || true
> done
> fi
> @@ -225,17 +179,6 @@ do_install () {
>
> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> ${D}${bindir}/pdsasm -f || true
>
> - install -d ${D}${prefix}/share/applications
> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> - rm ${D}${prefix}/share/applications/sample.desktop
> -
> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - install -d ${D}${bindir}/SGX/demos/X11/
> - install -m 0755 ${S}/demos/x11/*
> ${D}${bindir}/SGX/demos/X11/
> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> 2>/dev/null || true
> - install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> - fi
> -
> install -d ${D}${bindir}/SGX/demos/Raw/
> install -m 0755 ${S}/demos/raw/*
> ${D}${bindir}/SGX/demos/Raw/
> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> 2>/dev/null || true
> @@ -251,8 +194,7 @@ do_install () {
>
> }
>
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"", d)}
> \
> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> tests"
> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> tests"
> # Package the base libraries per silicon revision PACKAGES =+
> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> ${PN}-es8"
> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> libIMGegl.so libsrv_um.so libOpenVG.so li
>
>
> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> ${PN}-linuxfbwsegl"
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11wsegl ${PN}-driwsegl" ,"", d)}"
> +
> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> FILES_${PN}-frontwsegl = "${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> FILES_${PN}-linuxfbwsegl =
> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> ${bindir}/x* ${bindir}/*x"
> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> ${libdir}/libsrv_um_dri*"
>
> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-linuxfbwsegl- es8"
>
> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> driwsegl-es6 ${PN}-driwsegl-es8 "
> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> 'x11',"${X11_SEGL}" ,"", d)}"
> FILES_${PN}-blitwsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-blitwsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> FILES_${PN}-blitwsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> FILES_${PN}-linuxfbwsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2 ${PN}-
> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> ${PN}-linuxfbwsegl-es8"
>
> -FILES_${PN}-x11wsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> ${bindir}/ES2*/*x"
> -FILES_${PN}-x11wsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> ${bindir}/ES3*/*x"
> -FILES_${PN}-x11wsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> ${bindir}/ES5*/*x"
> -FILES_${PN}-x11wsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> ${bindir}/ES6*/*x"
> -FILES_${PN}-x11wsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> ${bindir}/ES8*/*x"
> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> x11wsegl-es8"
> -
> -FILES_${PN}-driwsegl-es2 =
> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES2*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es3 =
> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES3*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es5 =
> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES5*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es6 =
> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES6*/libsrv_um_dri*"
> -FILES_${PN}-driwsegl-es8 =
> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> ${libdir}/ES8*/libsrv_um_dri*"
> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> driwsegl-es8"
> -
> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
>
> FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/${PVR_INIT}
> ${bindir}/cputype ${bindir}/*"
>
> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> FILES_${PN}-tests = "${bindir}/*test*"
> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> ${bindir}/.debug/* \
> "
>
> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> ${prefix}/share/applications "
> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
>
> FILES_${PN}-rawtrainingcourses =
> "${bindir}/SGX/trainingcourses/Raw/*"
> -FILES_${PN}-x11trainingcourses =
> "${bindir}/SGX/trainingcourses/X11/*"
> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
>
> # The libs need the kernel-modules
> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so staticdev"
> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 = "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> INSANE_SKIP_${PN}-tests = "ldflags"
> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
>
> # Quality control is really poor on these SDKs, so hack around the
> latest madness:
> FILES_${PN} += "${libdir}/*.so "
> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> 0 1 6 ."
> # Append to update-rc.d postinst
> pkg_postinst_${PN}_append() {
> rm -f $D${sysconfdir}/powervr-esrev
> -
> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> -fi
> -
> }
>
> pkg_postinst_${PN}-blitwsegl() {
> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> $D${sysconfdir}/powervr-esrev }
>
> -pkg_postinst_${PN}-x11wsegl() {
> -rm -f $D${sysconfdir}/powervr-esrev
> -
> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> $D${sysconfdir}/powervr.ini -}
> -
> -pkg_postinst_${PN}-driwsegl() {
> -rm -f $D${sysconfdir}/powervr-esrev
> -}
> -
> diff --git a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> index 7c6f231..165a406 100644
> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> SRC_URI = "http://software-
> dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> }/exports/${BINFILE} \
> file://cputype \
> file://rc.pvr \
> - file://rc_dri.pvr \
> - file://sample.desktop \
> file://99-bufferclass.rules \ "
> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
>
> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
>
> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
>
> -do_configure_append() {
> -
> - # Change PVR server's user mode library to point to DRI
> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> - if [ "$drifile" != "" ]
> - then
> - dir=$(dirname ${drifile})
> - if [ "$SUPPORT_XORG" = "1" ]
> - then
> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> - else
> - rm -rf ${dir}/libsrv_um_dri.so
> - fi
> - fi
> -
> - done
> -}
> -
> -do_install_append() {
> -
> - # In this version of the graphics SDK the following
> directories do not exist:
> - #
> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> (doesn't exist)
> - #
> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> s.h (doesn't exist)
> - # Therefore, need to copy these files manually at the only
> location that they do exist
> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> -
> - rm ${D}${sysconfdir}/init.d/pvr-init
> -
> - if [ "$SUPPORT_XORG" = "1" ]; then
> - cp -pP ${WORKDIR}/rc_dri.pvr
> ${D}${sysconfdir}/init.d/pvr-init
> - else
> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> init
> - fi
> -
> -}
> -
> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> --
> 1.7.1
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-10 9:16 ` Sundareson, Prabindh
@ 2013-05-10 13:27 ` Maupin, Chase
2013-05-14 17:23 ` Denys Dmytriyenko
0 siblings, 1 reply; 26+ messages in thread
From: Maupin, Chase @ 2013-05-10 13:27 UTC (permalink / raw)
To: Sundareson, Prabindh, meta-ti@yoctoproject.org
>-----Original Message-----
>From: Sundareson, Prabindh
>Sent: Friday, May 10, 2013 4:17 AM
>To: Maupin, Chase; meta-ti@yoctoproject.org
>Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
>related build and packaging
>
>Chase, thanks for the review,
>
>1) Ok, I will add it. By "later recipe", you mean the separated
>x11 recipe, right ?
Yes sir
>
>2) Good point - I am ok to leave the old .inc and create a new one
>with the changes starting from 4.09 then. Is this ok ?
I'm OK with the approach. Denys, any concern here?
>
>regards,
>Prabu
>
>
>-----Original Message-----
>From: Maupin, Chase
>Sent: Wednesday, May 08, 2013 6:48 PM
>To: Sundareson, Prabindh; meta-ti@yoctoproject.org
>Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
>related build and packaging
>
>Prabu,
>
>Overall nice job. A couple of things I noticed.
>
>1. You removed the sample.desktop file but did not put it back in
>a later recipe.
>2. You modified the common .inc file and then added the X11 pieces
>back for 4.09.00.01. This would break people using the older
>recipes though. So would it perhaps be a good idea to leave the
>.inc alone and then create a new include file for newer recipe
>that do this split going forward? Or would it be simpler to
>provide the X11 package for the older versions as well? This is
>just a thought and I'm hoping others will chime in here.
>
>Thanks for the patches, it is really good to see this work being
>done :)
>
>> -----Original Message-----
>> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
>> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
>> Sent: Thursday, May 02, 2013 8:39 AM
>> To: meta-ti@yoctoproject.org
>> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
>related
>> build and packaging
>>
>> The SGX530 driver for X11 is only buildable and testable
>standalone
>> with the pre-built X11 package provided with the Graphics SDK.
>> This patch removes X11 build from the default recipe, to enable
>moving
>> X11 build to a separate recipe.
>>
>> This is part of a clean up of the Graphics recipe starting from
>> 4.09.00.01 version of the Graphics SDK.
>>
>> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
>> ---
>> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
>-
>> --------------
>> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
>-
>> 2 files changed, 30 insertions(+), 181 deletions(-)
>>
>> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
>> b/recipes-graphics/libgles/libgles-omap3.inc
>> index 9a90c56..130dc49 100644
>> --- a/recipes-graphics/libgles/libgles-omap3.inc
>> +++ b/recipes-graphics/libgles/libgles-omap3.inc
>> @@ -7,10 +7,6 @@ PR = "r35"
>>
>> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
>>
>> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
>> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
>> '${X11DEPENDS}', '', d)}"
>> -
>> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
>> 'x11', '1', '0', d)}"
>> PVR_INIT ?= "pvrsrvinit"
>>
>> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
>> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
>> SRC_URI = "http://software-
>>
>dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
>> }/exports/${BINFILE} \
>> file://cputype \
>> file://rc.pvr \
>> - file://sample.desktop \
>> file://99-bufferclass.rules \
>> "
>>
>> @@ -79,87 +74,53 @@ do_compile() {
>> export PLAT_CPP="${CXX}"
>> export PLAR_AR="${AR}"
>>
>> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
>> - export X11ROOT="${STAGING_DIR_HOST}/usr"
>> - mkdir -p ${S}/demos/x11
>> - mkdir -p ${S}/trainingcourses/x11
>> - fi
>> -
>> mkdir -p ${S}/demos/raw
>> mkdir -p ${S}/trainingcourses/raw
>>
>> # Rebuild demos
>> - for X11BUILD in 0 1 ; do
>> - # Don't rebuild demos with X11 support for a non X11
>> distro
>> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
>> then
>> - continue
>> - fi
>> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
>> do
>> + cd $demo/OGLES/Build/LinuxGeneric
>> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
>> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
>> +
>> + install -m 0755
>> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
>true
>> + done
>> +
>> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
>> do
>> + cd $demo/OGLES2/Build/LinuxGeneric
>> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
>> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
>>
>> - for demo in
>> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
>> - cd $demo/OGLES/Build/LinuxGeneric
>> - oe_runmake Common=1 PLATFORM=${PLATFORM}
>> X11BUILD=$X11BUILD
>> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
>> -
>> - if [ $X11BUILD -eq 1 ] ; then
>> - install -m 0755
>> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
>true
>> - sed -e s:NAME:$(basename $demo): \
>> - -e
>> s:EXEC:${bindir}/SGX/demos/X11/$(basename
>> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
>> - ${WORKDIR}/sample.desktop >
>> ${WORKDIR}/$(basename $demo).desktop
>> - else
>> - install -m 0755
>> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
>true
>> - fi
>> - done
>> -
>> - for demo in
>> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
>> - cd $demo/OGLES2/Build/LinuxGeneric
>> - oe_runmake Common=1 PLATFORM=${PLATFORM}
>> X11BUILD=$X11BUILD
>> - rm -f
>> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
>> -
>> - if [ $X11BUILD -eq 1 ] ; then
>> - install -m 0755
>> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
>true
>> - sed -e s:NAME:$(basename $demo): \
>> - -e
>> s:EXEC:${bindir}/SGX/demos/X11/$(basename
>> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
>> - ${WORKDIR}/sample.desktop >
>> ${WORKDIR}/$(basename $demo).desktop
>> - else
>> - install -m 0755
>> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
>true
>> - fi
>> - done
>> + install -m 0755
>> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
>true
>> done
>>
>> find ${S} -name "*_org" -delete
>>
>> # Build OGLES2 Trainingcourses
>> - for X11BUILD in 0 1 ; do
>> - # Don't rebuild training courses with X11 support for
>> a non X11 distro
>> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
>> then
>> - continue
>> + for training in
>> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
>> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
>> ] ; then
>> + cd $training/OGLES2/Build/LinuxGeneric
>> fi
>>
>> - for training in
>> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
>> - if [ -e
>> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
>> - cd $training/OGLES2/Build/LinuxGeneric
>> - fi
>> -
>> - if [ -e
>> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
>> - cd $training/OGLES2/Build/${PLATFORM}
>> - fi
>> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
>> ; then
>> + cd $training/OGLES2/Build/${PLATFORM}
>> + fi
>>
>> - oe_runmake Common=1 PLATFORM=${PLATFORM}
>> X11BUILD=$X11BUILD
>> - rm -f
>> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
>> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
>> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
>>
>> - if [ $X11BUILD -eq 1 ] ; then
>> - install -m 0755
>> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
>> ${S}/trainingcourses/x11 || true
>> - else
>> - install -m 0755
>> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
>> ${S}/trainingcourses/raw || true
>> - fi
>> - done
>> + install -m 0755
>> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
>> ${S}/trainingcourses/raw || true
>> done
>>
>> +
>> }
>>
>> do_install () {
>> install -d ${D}${libdir}
>> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
>> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
>> + rm ${D}${libdir}/libsrv_um_dri.so*
>> + rm ${D}${libdir}/pvr_drv.so*
>> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
>>
>> install -d ${D}${bindir}/
>> @@ -169,12 +130,6 @@ do_install () {
>> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
>> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
>>
>> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
>> - install -m 0755 ${BINLOCATION}/xgles1test1
>> ${D}${bindir}/
>> - install -m 0755
>> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
>> ${D}${bindir}/|| true
>> - cp -pPR
>>
>${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
>> b/*X11WS* ${D}${libdir} || true
>> - fi
>> -
>> install -d ${D}${includedir}
>> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
>> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
>211,13
>> +166,12 @@ do_install () {
>>
>> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
>> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
>> sgx_render_flip_test"
>> raw_prog="gles1test1 gles2test1 ovg_unit_test"
>> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
>> xovg_unit_test"
>>
>> for esrev in 2 3 5 6 8 ; do
>> ESLOCATION=$(eval echo $(echo
>> \$\{ES${esrev}LOCATION\}))
>> if [ -e ${ESLOCATION} ] ; then
>> cp -pPR ${ESLOCATION}/lib*${IMGPV}
>${ESLOCATION}/pvr_drv.so
>> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
>> - for esprog in $shared_prog $raw_prog
>> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
>do
>> + for esprog in $shared_prog $raw_prog ; do
>> install -m 0755 ${ESLOCATION}/$esprog
>${D}${bindir}/ES${esrev}.0/
>> 2>/dev/null || true
>> done
>> fi
>> @@ -225,17 +179,6 @@ do_install () {
>>
>> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
>> ${D}${bindir}/pdsasm -f || true
>>
>> - install -d ${D}${prefix}/share/applications
>> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
>> - rm ${D}${prefix}/share/applications/sample.desktop
>> -
>> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
>> - install -d ${D}${bindir}/SGX/demos/X11/
>> - install -m 0755 ${S}/demos/x11/*
>> ${D}${bindir}/SGX/demos/X11/
>> - install -d ${D}${bindir}/SGX/trainingcourses/X11
>> 2>/dev/null || true
>> - install -m 0755 ${S}/trainingcourses/x11/*
>> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
>> - fi
>> -
>> install -d ${D}${bindir}/SGX/demos/Raw/
>> install -m 0755 ${S}/demos/raw/*
>> ${D}${bindir}/SGX/demos/Raw/
>> install -d ${D}${bindir}/SGX/trainingcourses/Raw
>> 2>/dev/null || true
>> @@ -251,8 +194,7 @@ do_install () {
>>
>> }
>>
>> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
>> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
>,"", d)}
>> \
>> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
>> tests"
>> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
>> tests"
>> # Package the base libraries per silicon revision PACKAGES =+
>> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
>> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
>> ${PN}-es8"
>> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
>> libIMGegl.so libsrv_um.so libOpenVG.so li
>>
>>
>> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
>> ${PN}-linuxfbwsegl"
>> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
>> x11wsegl ${PN}-driwsegl" ,"", d)}"
>> +
>> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
>> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
>> FILES_${PN}-frontwsegl =
>"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
>> FILES_${PN}-linuxfbwsegl =
>> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
>> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
>> ${bindir}/x* ${bindir}/*x"
>> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
>> ${libdir}/libsrv_um_dri*"
>>
>> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
>> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
>> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
>> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
>> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
>> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
>> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
>linuxfbwsegl- es8"
>>
>> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
>> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
>> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
>> driwsegl-es6 ${PN}-driwsegl-es8 "
>> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
>> 'x11',"${X11_SEGL}" ,"", d)}"
>> FILES_${PN}-blitwsegl-es2 =
>> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
>> FILES_${PN}-blitwsegl-es3 =
>> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
>> FILES_${PN}-blitwsegl-es5 =
>> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
>> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
>> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
>> FILES_${PN}-linuxfbwsegl-es8 =
>> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
>> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
>${PN}-
>> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
>> ${PN}-linuxfbwsegl-es8"
>>
>> -FILES_${PN}-x11wsegl-es2 =
>> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
>> ${bindir}/ES2*/*x"
>> -FILES_${PN}-x11wsegl-es3 =
>> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
>> ${bindir}/ES3*/*x"
>> -FILES_${PN}-x11wsegl-es5 =
>> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
>> ${bindir}/ES5*/*x"
>> -FILES_${PN}-x11wsegl-es6 =
>> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
>> ${bindir}/ES6*/*x"
>> -FILES_${PN}-x11wsegl-es8 =
>> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
>> ${bindir}/ES8*/*x"
>> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
>> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
>> x11wsegl-es8"
>> -
>> -FILES_${PN}-driwsegl-es2 =
>> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
>> ${libdir}/ES2*/libsrv_um_dri*"
>> -FILES_${PN}-driwsegl-es3 =
>> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
>> ${libdir}/ES3*/libsrv_um_dri*"
>> -FILES_${PN}-driwsegl-es5 =
>> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
>> ${libdir}/ES5*/libsrv_um_dri*"
>> -FILES_${PN}-driwsegl-es6 =
>> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
>> ${libdir}/ES6*/libsrv_um_dri*"
>> -FILES_${PN}-driwsegl-es8 =
>> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
>> ${libdir}/ES8*/libsrv_um_dri*"
>> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
>> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
>> driwsegl-es8"
>> -
>> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
>>
>> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
>${bindir}/${PVR_INIT}
>> ${bindir}/cputype ${bindir}/*"
>>
>> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
>> FILES_${PN}-tests = "${bindir}/*test*"
>> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
>> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
>> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
>> ${bindir}/.debug/* \
>> "
>>
>> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
>> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
>> ${prefix}/share/applications "
>> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
>>
>> FILES_${PN}-rawtrainingcourses =
>> "${bindir}/SGX/trainingcourses/Raw/*"
>> -FILES_${PN}-x11trainingcourses =
>> "${bindir}/SGX/trainingcourses/X11/*"
>> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
>>
>> # The libs need the kernel-modules
>> RRECOMMENDS_${PN} += "omap3-sgx-modules"
>> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
>staticdev"
>> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
>> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
>> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
>> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
>> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
>> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
>> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
>> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
>"ldflags"
>> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
>> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
>> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
>> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
>> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
>> INSANE_SKIP_${PN}-tests = "ldflags"
>> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
>>
>> # Quality control is really poor on these SDKs, so hack around
>the
>> latest madness:
>> FILES_${PN} += "${libdir}/*.so "
>> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
>> 0 1 6 ."
>> # Append to update-rc.d postinst
>> pkg_postinst_${PN}_append() {
>> rm -f $D${sysconfdir}/powervr-esrev
>> -
>> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
>> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
>> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
>> -fi
>> -
>> }
>>
>> pkg_postinst_${PN}-blitwsegl() {
>> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
>> $D${sysconfdir}/powervr-esrev }
>>
>> -pkg_postinst_${PN}-x11wsegl() {
>> -rm -f $D${sysconfdir}/powervr-esrev
>> -
>> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
>> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
>> $D${sysconfdir}/powervr.ini -}
>> -
>> -pkg_postinst_${PN}-driwsegl() {
>> -rm -f $D${sysconfdir}/powervr-esrev
>> -}
>> -
>> diff --git a/recipes-graphics/libgles/libgles-
>omap3_4.09.00.01.bb
>> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
>> index 7c6f231..165a406 100644
>> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
>> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
>> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
>> SRC_URI = "http://software-
>>
>dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
>> }/exports/${BINFILE} \
>> file://cputype \
>> file://rc.pvr \
>> - file://rc_dri.pvr \
>> - file://sample.desktop \
>> file://99-bufferclass.rules \ "
>> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
>> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
>> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
>>
>> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
>>
>> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
>> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
>d)}"
>> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
>>
>> -do_configure_append() {
>> -
>> - # Change PVR server's user mode library to point to DRI
>> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
>> - if [ "$drifile" != "" ]
>> - then
>> - dir=$(dirname ${drifile})
>> - if [ "$SUPPORT_XORG" = "1" ]
>> - then
>> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
>> - else
>> - rm -rf ${dir}/libsrv_um_dri.so
>> - fi
>> - fi
>> -
>> - done
>> -}
>> -
>> -do_install_append() {
>> -
>> - # In this version of the graphics SDK the following
>> directories do not exist:
>> - #
>> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
>> (doesn't exist)
>> - #
>>
>/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
>> s.h (doesn't exist)
>> - # Therefore, need to copy these files manually at the only
>> location that they do exist
>> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
>> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
>> -
>> - rm ${D}${sysconfdir}/init.d/pvr-init
>> -
>> - if [ "$SUPPORT_XORG" = "1" ]; then
>> - cp -pP ${WORKDIR}/rc_dri.pvr
>> ${D}${sysconfdir}/init.d/pvr-init
>> - else
>> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
>> init
>> - fi
>> -
>> -}
>> -
>> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
>> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
>> --
>> 1.7.1
>>
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-10 13:27 ` Maupin, Chase
@ 2013-05-14 17:23 ` Denys Dmytriyenko
2013-05-14 17:46 ` Denys Dmytriyenko
0 siblings, 1 reply; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-05-14 17:23 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-ti@yoctoproject.org
On Fri, May 10, 2013 at 01:27:09PM +0000, Maupin, Chase wrote:
>
> >-----Original Message-----
> >From: Sundareson, Prabindh
> >Sent: Friday, May 10, 2013 4:17 AM
> >To: Maupin, Chase; meta-ti@yoctoproject.org
> >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> >related build and packaging
> >
> >Chase, thanks for the review,
> >
> >1) Ok, I will add it. By "later recipe", you mean the separated
> >x11 recipe, right ?
>
> Yes sir
>
> >
> >2) Good point - I am ok to leave the old .inc and create a new one
> >with the changes starting from 4.09 then. Is this ok ?
>
> I'm OK with the approach. Denys, any concern here?
Sounds good - there are still some users of 4.08 out there...
> >regards,
> >Prabu
> >
> >
> >-----Original Message-----
> >From: Maupin, Chase
> >Sent: Wednesday, May 08, 2013 6:48 PM
> >To: Sundareson, Prabindh; meta-ti@yoctoproject.org
> >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> >related build and packaging
> >
> >Prabu,
> >
> >Overall nice job. A couple of things I noticed.
> >
> >1. You removed the sample.desktop file but did not put it back in
> >a later recipe.
> >2. You modified the common .inc file and then added the X11 pieces
> >back for 4.09.00.01. This would break people using the older
> >recipes though. So would it perhaps be a good idea to leave the
> >.inc alone and then create a new include file for newer recipe
> >that do this split going forward? Or would it be simpler to
> >provide the X11 package for the older versions as well? This is
> >just a thought and I'm hoping others will chime in here.
> >
> >Thanks for the patches, it is really good to see this work being
> >done :)
> >
> >> -----Original Message-----
> >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> >> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> >> Sent: Thursday, May 02, 2013 8:39 AM
> >> To: meta-ti@yoctoproject.org
> >> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> >related
> >> build and packaging
> >>
> >> The SGX530 driver for X11 is only buildable and testable
> >standalone
> >> with the pre-built X11 package provided with the Graphics SDK.
> >> This patch removes X11 build from the default recipe, to enable
> >moving
> >> X11 build to a separate recipe.
> >>
> >> This is part of a clean up of the Graphics recipe starting from
> >> 4.09.00.01 version of the Graphics SDK.
> >>
> >> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> >> ---
> >> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
> >-
> >> --------------
> >> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
> >-
> >> 2 files changed, 30 insertions(+), 181 deletions(-)
> >>
> >> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> >> b/recipes-graphics/libgles/libgles-omap3.inc
> >> index 9a90c56..130dc49 100644
> >> --- a/recipes-graphics/libgles/libgles-omap3.inc
> >> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> >> @@ -7,10 +7,6 @@ PR = "r35"
> >>
> >> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> >>
> >> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> >> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> >> '${X11DEPENDS}', '', d)}"
> >> -
> >> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> >> 'x11', '1', '0', d)}"
> >> PVR_INIT ?= "pvrsrvinit"
> >>
> >> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> >> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> >> SRC_URI = "http://software-
> >>
> >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> >> }/exports/${BINFILE} \
> >> file://cputype \
> >> file://rc.pvr \
> >> - file://sample.desktop \
> >> file://99-bufferclass.rules \
> >> "
> >>
> >> @@ -79,87 +74,53 @@ do_compile() {
> >> export PLAT_CPP="${CXX}"
> >> export PLAR_AR="${AR}"
> >>
> >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> >> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> >> - mkdir -p ${S}/demos/x11
> >> - mkdir -p ${S}/trainingcourses/x11
> >> - fi
> >> -
> >> mkdir -p ${S}/demos/raw
> >> mkdir -p ${S}/trainingcourses/raw
> >>
> >> # Rebuild demos
> >> - for X11BUILD in 0 1 ; do
> >> - # Don't rebuild demos with X11 support for a non X11
> >> distro
> >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> >> then
> >> - continue
> >> - fi
> >> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> >> do
> >> + cd $demo/OGLES/Build/LinuxGeneric
> >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> >> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> >> +
> >> + install -m 0755
> >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> >true
> >> + done
> >> +
> >> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> >> do
> >> + cd $demo/OGLES2/Build/LinuxGeneric
> >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> >> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> >>
> >> - for demo in
> >> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> >> - cd $demo/OGLES/Build/LinuxGeneric
> >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> >> X11BUILD=$X11BUILD
> >> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> >> -
> >> - if [ $X11BUILD -eq 1 ] ; then
> >> - install -m 0755
> >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> >true
> >> - sed -e s:NAME:$(basename $demo): \
> >> - -e
> >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> >> - ${WORKDIR}/sample.desktop >
> >> ${WORKDIR}/$(basename $demo).desktop
> >> - else
> >> - install -m 0755
> >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> >true
> >> - fi
> >> - done
> >> -
> >> - for demo in
> >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> >> - cd $demo/OGLES2/Build/LinuxGeneric
> >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> >> X11BUILD=$X11BUILD
> >> - rm -f
> >> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> >> -
> >> - if [ $X11BUILD -eq 1 ] ; then
> >> - install -m 0755
> >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> >true
> >> - sed -e s:NAME:$(basename $demo): \
> >> - -e
> >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> >> - ${WORKDIR}/sample.desktop >
> >> ${WORKDIR}/$(basename $demo).desktop
> >> - else
> >> - install -m 0755
> >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> >true
> >> - fi
> >> - done
> >> + install -m 0755
> >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> >true
> >> done
> >>
> >> find ${S} -name "*_org" -delete
> >>
> >> # Build OGLES2 Trainingcourses
> >> - for X11BUILD in 0 1 ; do
> >> - # Don't rebuild training courses with X11 support for
> >> a non X11 distro
> >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> >> then
> >> - continue
> >> + for training in
> >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> >> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> >> ] ; then
> >> + cd $training/OGLES2/Build/LinuxGeneric
> >> fi
> >>
> >> - for training in
> >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> >> - if [ -e
> >> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> >> - cd $training/OGLES2/Build/LinuxGeneric
> >> - fi
> >> -
> >> - if [ -e
> >> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> >> - cd $training/OGLES2/Build/${PLATFORM}
> >> - fi
> >> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> >> ; then
> >> + cd $training/OGLES2/Build/${PLATFORM}
> >> + fi
> >>
> >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> >> X11BUILD=$X11BUILD
> >> - rm -f
> >> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> >> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> >>
> >> - if [ $X11BUILD -eq 1 ] ; then
> >> - install -m 0755
> >> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> >> ${S}/trainingcourses/x11 || true
> >> - else
> >> - install -m 0755
> >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> >> ${S}/trainingcourses/raw || true
> >> - fi
> >> - done
> >> + install -m 0755
> >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> >> ${S}/trainingcourses/raw || true
> >> done
> >>
> >> +
> >> }
> >>
> >> do_install () {
> >> install -d ${D}${libdir}
> >> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> >> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> >> + rm ${D}${libdir}/libsrv_um_dri.so*
> >> + rm ${D}${libdir}/pvr_drv.so*
> >> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> >>
> >> install -d ${D}${bindir}/
> >> @@ -169,12 +130,6 @@ do_install () {
> >> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> >> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> >>
> >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> >> - install -m 0755 ${BINLOCATION}/xgles1test1
> >> ${D}${bindir}/
> >> - install -m 0755
> >> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> >> ${D}${bindir}/|| true
> >> - cp -pPR
> >>
> >${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> >> b/*X11WS* ${D}${libdir} || true
> >> - fi
> >> -
> >> install -d ${D}${includedir}
> >> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> >> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
> >211,13
> >> +166,12 @@ do_install () {
> >>
> >> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> >> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> >> sgx_render_flip_test"
> >> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> >> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> >> xovg_unit_test"
> >>
> >> for esrev in 2 3 5 6 8 ; do
> >> ESLOCATION=$(eval echo $(echo
> >> \$\{ES${esrev}LOCATION\}))
> >> if [ -e ${ESLOCATION} ] ; then
> >> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> >${ESLOCATION}/pvr_drv.so
> >> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> >> - for esprog in $shared_prog $raw_prog
> >> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
> >do
> >> + for esprog in $shared_prog $raw_prog ; do
> >> install -m 0755 ${ESLOCATION}/$esprog
> >${D}${bindir}/ES${esrev}.0/
> >> 2>/dev/null || true
> >> done
> >> fi
> >> @@ -225,17 +179,6 @@ do_install () {
> >>
> >> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> >> ${D}${bindir}/pdsasm -f || true
> >>
> >> - install -d ${D}${prefix}/share/applications
> >> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> >> - rm ${D}${prefix}/share/applications/sample.desktop
> >> -
> >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> >> - install -d ${D}${bindir}/SGX/demos/X11/
> >> - install -m 0755 ${S}/demos/x11/*
> >> ${D}${bindir}/SGX/demos/X11/
> >> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> >> 2>/dev/null || true
> >> - install -m 0755 ${S}/trainingcourses/x11/*
> >> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> >> - fi
> >> -
> >> install -d ${D}${bindir}/SGX/demos/Raw/
> >> install -m 0755 ${S}/demos/raw/*
> >> ${D}${bindir}/SGX/demos/Raw/
> >> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> >> 2>/dev/null || true
> >> @@ -251,8 +194,7 @@ do_install () {
> >>
> >> }
> >>
> >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> >> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> >,"", d)}
> >> \
> >> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> >> tests"
> >> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> >> tests"
> >> # Package the base libraries per silicon revision PACKAGES =+
> >> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> >> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> >> ${PN}-es8"
> >> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> >> libIMGegl.so libsrv_um.so libOpenVG.so li
> >>
> >>
> >> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> >> ${PN}-linuxfbwsegl"
> >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> >> x11wsegl ${PN}-driwsegl" ,"", d)}"
> >> +
> >> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> >> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> >> FILES_${PN}-frontwsegl =
> >"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> >> FILES_${PN}-linuxfbwsegl =
> >> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> >> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> >> ${bindir}/x* ${bindir}/*x"
> >> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> >> ${libdir}/libsrv_um_dri*"
> >>
> >> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> >> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> >> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> >> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> >> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> >> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> >> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
> >linuxfbwsegl- es8"
> >>
> >> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> >> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> >> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> >> driwsegl-es6 ${PN}-driwsegl-es8 "
> >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> >> 'x11',"${X11_SEGL}" ,"", d)}"
> >> FILES_${PN}-blitwsegl-es2 =
> >> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> >> FILES_${PN}-blitwsegl-es3 =
> >> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> >> FILES_${PN}-blitwsegl-es5 =
> >> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> >> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> >> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> >> FILES_${PN}-linuxfbwsegl-es8 =
> >> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> >> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
> >${PN}-
> >> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> >> ${PN}-linuxfbwsegl-es8"
> >>
> >> -FILES_${PN}-x11wsegl-es2 =
> >> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> >> ${bindir}/ES2*/*x"
> >> -FILES_${PN}-x11wsegl-es3 =
> >> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> >> ${bindir}/ES3*/*x"
> >> -FILES_${PN}-x11wsegl-es5 =
> >> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> >> ${bindir}/ES5*/*x"
> >> -FILES_${PN}-x11wsegl-es6 =
> >> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> >> ${bindir}/ES6*/*x"
> >> -FILES_${PN}-x11wsegl-es8 =
> >> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> >> ${bindir}/ES8*/*x"
> >> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> >> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> >> x11wsegl-es8"
> >> -
> >> -FILES_${PN}-driwsegl-es2 =
> >> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> >> ${libdir}/ES2*/libsrv_um_dri*"
> >> -FILES_${PN}-driwsegl-es3 =
> >> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> >> ${libdir}/ES3*/libsrv_um_dri*"
> >> -FILES_${PN}-driwsegl-es5 =
> >> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> >> ${libdir}/ES5*/libsrv_um_dri*"
> >> -FILES_${PN}-driwsegl-es6 =
> >> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> >> ${libdir}/ES6*/libsrv_um_dri*"
> >> -FILES_${PN}-driwsegl-es8 =
> >> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> >> ${libdir}/ES8*/libsrv_um_dri*"
> >> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> >> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> >> driwsegl-es8"
> >> -
> >> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> >>
> >> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> >${bindir}/${PVR_INIT}
> >> ${bindir}/cputype ${bindir}/*"
> >>
> >> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> >> FILES_${PN}-tests = "${bindir}/*test*"
> >> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> >> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> >> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> >> ${bindir}/.debug/* \
> >> "
> >>
> >> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> >> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> >> ${prefix}/share/applications "
> >> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> >>
> >> FILES_${PN}-rawtrainingcourses =
> >> "${bindir}/SGX/trainingcourses/Raw/*"
> >> -FILES_${PN}-x11trainingcourses =
> >> "${bindir}/SGX/trainingcourses/X11/*"
> >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> >>
> >> # The libs need the kernel-modules
> >> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> >> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> >staticdev"
> >> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> >> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> >> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> >> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> >> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> >> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> >> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> >> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> >"ldflags"
> >> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> >> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> >> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> >> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> >> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> >> INSANE_SKIP_${PN}-tests = "ldflags"
> >> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> >>
> >> # Quality control is really poor on these SDKs, so hack around
> >the
> >> latest madness:
> >> FILES_${PN} += "${libdir}/*.so "
> >> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> >> 0 1 6 ."
> >> # Append to update-rc.d postinst
> >> pkg_postinst_${PN}_append() {
> >> rm -f $D${sysconfdir}/powervr-esrev
> >> -
> >> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> >> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> >> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> >> -fi
> >> -
> >> }
> >>
> >> pkg_postinst_${PN}-blitwsegl() {
> >> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> >> $D${sysconfdir}/powervr-esrev }
> >>
> >> -pkg_postinst_${PN}-x11wsegl() {
> >> -rm -f $D${sysconfdir}/powervr-esrev
> >> -
> >> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> >> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> >> $D${sysconfdir}/powervr.ini -}
> >> -
> >> -pkg_postinst_${PN}-driwsegl() {
> >> -rm -f $D${sysconfdir}/powervr-esrev
> >> -}
> >> -
> >> diff --git a/recipes-graphics/libgles/libgles-
> >omap3_4.09.00.01.bb
> >> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> >> index 7c6f231..165a406 100644
> >> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> >> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> >> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> >> SRC_URI = "http://software-
> >>
> >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> >> }/exports/${BINFILE} \
> >> file://cputype \
> >> file://rc.pvr \
> >> - file://rc_dri.pvr \
> >> - file://sample.desktop \
> >> file://99-bufferclass.rules \ "
> >> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> >> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> >> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
> >>
> >> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> >>
> >> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> >> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> >d)}"
> >> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
> >>
> >> -do_configure_append() {
> >> -
> >> - # Change PVR server's user mode library to point to DRI
> >> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> >> - if [ "$drifile" != "" ]
> >> - then
> >> - dir=$(dirname ${drifile})
> >> - if [ "$SUPPORT_XORG" = "1" ]
> >> - then
> >> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> >> - else
> >> - rm -rf ${dir}/libsrv_um_dri.so
> >> - fi
> >> - fi
> >> -
> >> - done
> >> -}
> >> -
> >> -do_install_append() {
> >> -
> >> - # In this version of the graphics SDK the following
> >> directories do not exist:
> >> - #
> >> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> >> (doesn't exist)
> >> - #
> >>
> >/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> >> s.h (doesn't exist)
> >> - # Therefore, need to copy these files manually at the only
> >> location that they do exist
> >> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> >> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> >> -
> >> - rm ${D}${sysconfdir}/init.d/pvr-init
> >> -
> >> - if [ "$SUPPORT_XORG" = "1" ]; then
> >> - cp -pP ${WORKDIR}/rc_dri.pvr
> >> ${D}${sysconfdir}/init.d/pvr-init
> >> - else
> >> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> >> init
> >> - fi
> >> -
> >> -}
> >> -
> >> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> >> --
> >> 1.7.1
> >>
> >> _______________________________________________
> >> meta-ti mailing list
> >> meta-ti@yoctoproject.org
> >> https://lists.yoctoproject.org/listinfo/meta-ti
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-14 17:23 ` Denys Dmytriyenko
@ 2013-05-14 17:46 ` Denys Dmytriyenko
2013-05-15 2:48 ` Sundareson, Prabindh
0 siblings, 1 reply; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-05-14 17:46 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-ti@yoctoproject.org
Prabu,
I don't think I have any more comments, than for 01, 06 and 08. Will you be
re-submitting the entire set later? I'll go ahead and remove this set from my
queue as it will be "superseded". Thanks!
--
Denys
On Tue, May 14, 2013 at 01:23:16PM -0400, Denys Dmytriyenko wrote:
> On Fri, May 10, 2013 at 01:27:09PM +0000, Maupin, Chase wrote:
> >
> > >-----Original Message-----
> > >From: Sundareson, Prabindh
> > >Sent: Friday, May 10, 2013 4:17 AM
> > >To: Maupin, Chase; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Chase, thanks for the review,
> > >
> > >1) Ok, I will add it. By "later recipe", you mean the separated
> > >x11 recipe, right ?
> >
> > Yes sir
> >
> > >
> > >2) Good point - I am ok to leave the old .inc and create a new one
> > >with the changes starting from 4.09 then. Is this ok ?
> >
> > I'm OK with the approach. Denys, any concern here?
>
> Sounds good - there are still some users of 4.08 out there...
>
>
> > >regards,
> > >Prabu
> > >
> > >
> > >-----Original Message-----
> > >From: Maupin, Chase
> > >Sent: Wednesday, May 08, 2013 6:48 PM
> > >To: Sundareson, Prabindh; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Prabu,
> > >
> > >Overall nice job. A couple of things I noticed.
> > >
> > >1. You removed the sample.desktop file but did not put it back in
> > >a later recipe.
> > >2. You modified the common .inc file and then added the X11 pieces
> > >back for 4.09.00.01. This would break people using the older
> > >recipes though. So would it perhaps be a good idea to leave the
> > >.inc alone and then create a new include file for newer recipe
> > >that do this split going forward? Or would it be simpler to
> > >provide the X11 package for the older versions as well? This is
> > >just a thought and I'm hoping others will chime in here.
> > >
> > >Thanks for the patches, it is really good to see this work being
> > >done :)
> > >
> > >> -----Original Message-----
> > >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > >> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> > >> Sent: Thursday, May 02, 2013 8:39 AM
> > >> To: meta-ti@yoctoproject.org
> > >> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related
> > >> build and packaging
> > >>
> > >> The SGX530 driver for X11 is only buildable and testable
> > >standalone
> > >> with the pre-built X11 package provided with the Graphics SDK.
> > >> This patch removes X11 build from the default recipe, to enable
> > >moving
> > >> X11 build to a separate recipe.
> > >>
> > >> This is part of a clean up of the Graphics recipe starting from
> > >> 4.09.00.01 version of the Graphics SDK.
> > >>
> > >> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > >> ---
> > >> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
> > >-
> > >> --------------
> > >> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
> > >-
> > >> 2 files changed, 30 insertions(+), 181 deletions(-)
> > >>
> > >> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > >> b/recipes-graphics/libgles/libgles-omap3.inc
> > >> index 9a90c56..130dc49 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3.inc
> > >> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > >> @@ -7,10 +7,6 @@ PR = "r35"
> > >>
> > >> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> > >>
> > >> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > >> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> > >> '${X11DEPENDS}', '', d)}"
> > >> -
> > >> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11', '1', '0', d)}"
> > >> PVR_INIT ?= "pvrsrvinit"
> > >>
> > >> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> > >> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \
> > >> "
> > >>
> > >> @@ -79,87 +74,53 @@ do_compile() {
> > >> export PLAT_CPP="${CXX}"
> > >> export PLAR_AR="${AR}"
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > >> - mkdir -p ${S}/demos/x11
> > >> - mkdir -p ${S}/trainingcourses/x11
> > >> - fi
> > >> -
> > >> mkdir -p ${S}/demos/raw
> > >> mkdir -p ${S}/trainingcourses/raw
> > >>
> > >> # Rebuild demos
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild demos with X11 support for a non X11
> > >> distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> - fi
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> +
> > >> + install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> + done
> > >> +
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES2/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> -
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES2/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> done
> > >>
> > >> find ${S} -name "*_org" -delete
> > >>
> > >> # Build OGLES2 Trainingcourses
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild training courses with X11 support for
> > >> a non X11 distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> + for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> > >> ] ; then
> > >> + cd $training/OGLES2/Build/LinuxGeneric
> > >> fi
> > >>
> > >> - for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> - if [ -e
> > >> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/LinuxGeneric
> > >> - fi
> > >> -
> > >> - if [ -e
> > >> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/${PLATFORM}
> > >> - fi
> > >> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> > >> ; then
> > >> + cd $training/OGLES2/Build/${PLATFORM}
> > >> + fi
> > >>
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > >> ${S}/trainingcourses/x11 || true
> > >> - else
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> done
> > >>
> > >> +
> > >> }
> > >>
> > >> do_install () {
> > >> install -d ${D}${libdir}
> > >> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> > >> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> + rm ${D}${libdir}/libsrv_um_dri.so*
> > >> + rm ${D}${libdir}/pvr_drv.so*
> > >> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> > >>
> > >> install -d ${D}${bindir}/
> > >> @@ -169,12 +130,6 @@ do_install () {
> > >> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > >> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -m 0755 ${BINLOCATION}/xgles1test1
> > >> ${D}${bindir}/
> > >> - install -m 0755
> > >> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> > >> ${D}${bindir}/|| true
> > >> - cp -pPR
> > >>
> > >${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> > >> b/*X11WS* ${D}${libdir} || true
> > >> - fi
> > >> -
> > >> install -d ${D}${includedir}
> > >> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> > >> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
> > >211,13
> > >> +166,12 @@ do_install () {
> > >>
> > >> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> > >> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > >> sgx_render_flip_test"
> > >> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> > >> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> > >> xovg_unit_test"
> > >>
> > >> for esrev in 2 3 5 6 8 ; do
> > >> ESLOCATION=$(eval echo $(echo
> > >> \$\{ES${esrev}LOCATION\}))
> > >> if [ -e ${ESLOCATION} ] ; then
> > >> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> > >${ESLOCATION}/pvr_drv.so
> > >> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> > >> - for esprog in $shared_prog $raw_prog
> > >> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
> > >do
> > >> + for esprog in $shared_prog $raw_prog ; do
> > >> install -m 0755 ${ESLOCATION}/$esprog
> > >${D}${bindir}/ES${esrev}.0/
> > >> 2>/dev/null || true
> > >> done
> > >> fi
> > >> @@ -225,17 +179,6 @@ do_install () {
> > >>
> > >> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> > >> ${D}${bindir}/pdsasm -f || true
> > >>
> > >> - install -d ${D}${prefix}/share/applications
> > >> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > >> - rm ${D}${prefix}/share/applications/sample.desktop
> > >> -
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -d ${D}${bindir}/SGX/demos/X11/
> > >> - install -m 0755 ${S}/demos/x11/*
> > >> ${D}${bindir}/SGX/demos/X11/
> > >> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > >> 2>/dev/null || true
> > >> - install -m 0755 ${S}/trainingcourses/x11/*
> > >> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> > >> - fi
> > >> -
> > >> install -d ${D}${bindir}/SGX/demos/Raw/
> > >> install -m 0755 ${S}/demos/raw/*
> > >> ${D}${bindir}/SGX/demos/Raw/
> > >> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > >> 2>/dev/null || true
> > >> @@ -251,8 +194,7 @@ do_install () {
> > >>
> > >> }
> > >>
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> > >,"", d)}
> > >> \
> > >> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> # Package the base libraries per silicon revision PACKAGES =+
> > >> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> > >> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> > >> ${PN}-es8"
> > >> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> > >> libIMGegl.so libsrv_um.so libOpenVG.so li
> > >>
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> > >> ${PN}-linuxfbwsegl"
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11wsegl ${PN}-driwsegl" ,"", d)}"
> > >> +
> > >> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> > >> FILES_${PN}-frontwsegl =
> > >"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl =
> > >> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> > >> ${bindir}/x* ${bindir}/*x"
> > >> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> ${libdir}/libsrv_um_dri*"
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> > >> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> > >> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> > >> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> > >> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> > >> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> > >> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
> > >linuxfbwsegl- es8"
> > >>
> > >> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> > >> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> > >> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> > >> driwsegl-es6 ${PN}-driwsegl-es8 "
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"${X11_SEGL}" ,"", d)}"
> > >> FILES_${PN}-blitwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
> > >${PN}-
> > >> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> > >> ${PN}-linuxfbwsegl-es8"
> > >>
> > >> -FILES_${PN}-x11wsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> > >> ${bindir}/ES2*/*x"
> > >> -FILES_${PN}-x11wsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> > >> ${bindir}/ES3*/*x"
> > >> -FILES_${PN}-x11wsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> > >> ${bindir}/ES5*/*x"
> > >> -FILES_${PN}-x11wsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> > >> ${bindir}/ES6*/*x"
> > >> -FILES_${PN}-x11wsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> > >> ${bindir}/ES8*/*x"
> > >> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> > >> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> > >> x11wsegl-es8"
> > >> -
> > >> -FILES_${PN}-driwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES2*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES3*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES5*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES6*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES8*/libsrv_um_dri*"
> > >> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> > >> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> > >> driwsegl-es8"
> > >> -
> > >> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> > >>
> > >> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > >${bindir}/${PVR_INIT}
> > >> ${bindir}/cputype ${bindir}/*"
> > >>
> > >> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > >> FILES_${PN}-tests = "${bindir}/*test*"
> > >> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> > >> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> > >> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> > >> ${bindir}/.debug/* \
> > >> "
> > >>
> > >> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> > >> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> > >> ${prefix}/share/applications "
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> > >>
> > >> FILES_${PN}-rawtrainingcourses =
> > >> "${bindir}/SGX/trainingcourses/Raw/*"
> > >> -FILES_${PN}-x11trainingcourses =
> > >> "${bindir}/SGX/trainingcourses/X11/*"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> > >>
> > >> # The libs need the kernel-modules
> > >> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> > >> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> > >staticdev"
> > >> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> > >> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> > >> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> > >> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> > >"ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> > >> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> > >> INSANE_SKIP_${PN}-tests = "ldflags"
> > >> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> > >>
> > >> # Quality control is really poor on these SDKs, so hack around
> > >the
> > >> latest madness:
> > >> FILES_${PN} += "${libdir}/*.so "
> > >> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > >> 0 1 6 ."
> > >> # Append to update-rc.d postinst
> > >> pkg_postinst_${PN}_append() {
> > >> rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> > >> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> > >> -fi
> > >> -
> > >> }
> > >>
> > >> pkg_postinst_${PN}-blitwsegl() {
> > >> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> > >> $D${sysconfdir}/powervr-esrev }
> > >>
> > >> -pkg_postinst_${PN}-x11wsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> > >> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> > >> $D${sysconfdir}/powervr.ini -}
> > >> -
> > >> -pkg_postinst_${PN}-driwsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -}
> > >> -
> > >> diff --git a/recipes-graphics/libgles/libgles-
> > >omap3_4.09.00.01.bb
> > >> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> index 7c6f231..165a406 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://rc_dri.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \ "
> > >> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> > >> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> > >> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
> > >>
> > >> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> > >>
> > >> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> > >d)}"
> > >> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
> > >>
> > >> -do_configure_append() {
> > >> -
> > >> - # Change PVR server's user mode library to point to DRI
> > >> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> > >> - if [ "$drifile" != "" ]
> > >> - then
> > >> - dir=$(dirname ${drifile})
> > >> - if [ "$SUPPORT_XORG" = "1" ]
> > >> - then
> > >> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> > >> - else
> > >> - rm -rf ${dir}/libsrv_um_dri.so
> > >> - fi
> > >> - fi
> > >> -
> > >> - done
> > >> -}
> > >> -
> > >> -do_install_append() {
> > >> -
> > >> - # In this version of the graphics SDK the following
> > >> directories do not exist:
> > >> - #
> > >> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> > >> (doesn't exist)
> > >> - #
> > >>
> > >/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> > >> s.h (doesn't exist)
> > >> - # Therefore, need to copy these files manually at the only
> > >> location that they do exist
> > >> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> > >> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> > >> -
> > >> - rm ${D}${sysconfdir}/init.d/pvr-init
> > >> -
> > >> - if [ "$SUPPORT_XORG" = "1" ]; then
> > >> - cp -pP ${WORKDIR}/rc_dri.pvr
> > >> ${D}${sysconfdir}/init.d/pvr-init
> > >> - else
> > >> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> > >> init
> > >> - fi
> > >> -
> > >> -}
> > >> -
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> > >> --
> > >> 1.7.1
> > >>
> > >> _______________________________________________
> > >> meta-ti mailing list
> > >> meta-ti@yoctoproject.org
> > >> https://lists.yoctoproject.org/listinfo/meta-ti
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-14 17:46 ` Denys Dmytriyenko
@ 2013-05-15 2:48 ` Sundareson, Prabindh
2013-05-17 17:02 ` Prabindh Sundareson
0 siblings, 1 reply; 26+ messages in thread
From: Sundareson, Prabindh @ 2013-05-15 2:48 UTC (permalink / raw)
To: Dmytriyenko, Denys, Maupin, Chase; +Cc: meta-ti@yoctoproject.org
Denys,
Thanks for the review. I will resubmit the patch-set for review - with below comments implemented.
regards,
Prabu
-----Original Message-----
From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-bounces@yoctoproject.org] On Behalf Of Dmytriyenko, Denys
Sent: Tuesday, May 14, 2013 11:17 PM
To: Maupin, Chase
Cc: meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
Prabu,
I don't think I have any more comments, than for 01, 06 and 08. Will you be re-submitting the entire set later? I'll go ahead and remove this set from my queue as it will be "superseded". Thanks!
--
Denys
On Tue, May 14, 2013 at 01:23:16PM -0400, Denys Dmytriyenko wrote:
> On Fri, May 10, 2013 at 01:27:09PM +0000, Maupin, Chase wrote:
> >
> > >-----Original Message-----
> > >From: Sundareson, Prabindh
> > >Sent: Friday, May 10, 2013 4:17 AM
> > >To: Maupin, Chase; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Chase, thanks for the review,
> > >
> > >1) Ok, I will add it. By "later recipe", you mean the separated
> > >x11 recipe, right ?
> >
> > Yes sir
> >
> > >
> > >2) Good point - I am ok to leave the old .inc and create a new one
> > >with the changes starting from 4.09 then. Is this ok ?
> >
> > I'm OK with the approach. Denys, any concern here?
>
> Sounds good - there are still some users of 4.08 out there...
>
>
> > >regards,
> > >Prabu
> > >
> > >
> > >-----Original Message-----
> > >From: Maupin, Chase
> > >Sent: Wednesday, May 08, 2013 6:48 PM
> > >To: Sundareson, Prabindh; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Prabu,
> > >
> > >Overall nice job. A couple of things I noticed.
> > >
> > >1. You removed the sample.desktop file but did not put it back in
> > >a later recipe.
> > >2. You modified the common .inc file and then added the X11 pieces
> > >back for 4.09.00.01. This would break people using the older
> > >recipes though. So would it perhaps be a good idea to leave the
> > >.inc alone and then create a new include file for newer recipe
> > >that do this split going forward? Or would it be simpler to
> > >provide the X11 package for the older versions as well? This is
> > >just a thought and I'm hoping others will chime in here.
> > >
> > >Thanks for the patches, it is really good to see this work being
> > >done :)
> > >
> > >> -----Original Message-----
> > >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > >> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> > >> Sent: Thursday, May 02, 2013 8:39 AM
> > >> To: meta-ti@yoctoproject.org
> > >> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related
> > >> build and packaging
> > >>
> > >> The SGX530 driver for X11 is only buildable and testable
> > >standalone
> > >> with the pre-built X11 package provided with the Graphics SDK.
> > >> This patch removes X11 build from the default recipe, to enable
> > >moving
> > >> X11 build to a separate recipe.
> > >>
> > >> This is part of a clean up of the Graphics recipe starting from
> > >> 4.09.00.01 version of the Graphics SDK.
> > >>
> > >> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > >> ---
> > >> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
> > >-
> > >> --------------
> > >> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
> > >-
> > >> 2 files changed, 30 insertions(+), 181 deletions(-)
> > >>
> > >> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > >> b/recipes-graphics/libgles/libgles-omap3.inc
> > >> index 9a90c56..130dc49 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3.inc
> > >> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > >> @@ -7,10 +7,6 @@ PR = "r35"
> > >>
> > >> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> > >>
> > >> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > >> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> > >> '${X11DEPENDS}', '', d)}"
> > >> -
> > >> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11', '1', '0', d)}"
> > >> PVR_INIT ?= "pvrsrvinit"
> > >>
> > >> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> > >> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \
> > >> "
> > >>
> > >> @@ -79,87 +74,53 @@ do_compile() {
> > >> export PLAT_CPP="${CXX}"
> > >> export PLAR_AR="${AR}"
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > >> - mkdir -p ${S}/demos/x11
> > >> - mkdir -p ${S}/trainingcourses/x11
> > >> - fi
> > >> -
> > >> mkdir -p ${S}/demos/raw
> > >> mkdir -p ${S}/trainingcourses/raw
> > >>
> > >> # Rebuild demos
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild demos with X11 support for a non X11
> > >> distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> - fi
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> +
> > >> + install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> + done
> > >> +
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES2/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> -
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES2/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> done
> > >>
> > >> find ${S} -name "*_org" -delete
> > >>
> > >> # Build OGLES2 Trainingcourses
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild training courses with X11 support for
> > >> a non X11 distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> + for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> > >> ] ; then
> > >> + cd $training/OGLES2/Build/LinuxGeneric
> > >> fi
> > >>
> > >> - for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> - if [ -e
> > >> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/LinuxGeneric
> > >> - fi
> > >> -
> > >> - if [ -e
> > >> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/${PLATFORM}
> > >> - fi
> > >> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> > >> ; then
> > >> + cd $training/OGLES2/Build/${PLATFORM}
> > >> + fi
> > >>
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > >> ${S}/trainingcourses/x11 || true
> > >> - else
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> done
> > >>
> > >> +
> > >> }
> > >>
> > >> do_install () {
> > >> install -d ${D}${libdir}
> > >> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> > >> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> + rm ${D}${libdir}/libsrv_um_dri.so*
> > >> + rm ${D}${libdir}/pvr_drv.so*
> > >> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> > >>
> > >> install -d ${D}${bindir}/
> > >> @@ -169,12 +130,6 @@ do_install () {
> > >> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > >> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -m 0755 ${BINLOCATION}/xgles1test1
> > >> ${D}${bindir}/
> > >> - install -m 0755
> > >> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> > >> ${D}${bindir}/|| true
> > >> - cp -pPR
> > >>
> > >${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> > >> b/*X11WS* ${D}${libdir} || true
> > >> - fi
> > >> -
> > >> install -d ${D}${includedir}
> > >> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> > >> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
> > >211,13
> > >> +166,12 @@ do_install () {
> > >>
> > >> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> > >> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > >> sgx_render_flip_test"
> > >> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> > >> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> > >> xovg_unit_test"
> > >>
> > >> for esrev in 2 3 5 6 8 ; do
> > >> ESLOCATION=$(eval echo $(echo
> > >> \$\{ES${esrev}LOCATION\}))
> > >> if [ -e ${ESLOCATION} ] ; then
> > >> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> > >${ESLOCATION}/pvr_drv.so
> > >> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> > >> - for esprog in $shared_prog $raw_prog
> > >> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
> > >do
> > >> + for esprog in $shared_prog $raw_prog ; do
> > >> install -m 0755 ${ESLOCATION}/$esprog
> > >${D}${bindir}/ES${esrev}.0/
> > >> 2>/dev/null || true
> > >> done
> > >> fi
> > >> @@ -225,17 +179,6 @@ do_install () {
> > >>
> > >> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> > >> ${D}${bindir}/pdsasm -f || true
> > >>
> > >> - install -d ${D}${prefix}/share/applications
> > >> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > >> - rm ${D}${prefix}/share/applications/sample.desktop
> > >> -
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -d ${D}${bindir}/SGX/demos/X11/
> > >> - install -m 0755 ${S}/demos/x11/*
> > >> ${D}${bindir}/SGX/demos/X11/
> > >> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > >> 2>/dev/null || true
> > >> - install -m 0755 ${S}/trainingcourses/x11/*
> > >> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> > >> - fi
> > >> -
> > >> install -d ${D}${bindir}/SGX/demos/Raw/
> > >> install -m 0755 ${S}/demos/raw/*
> > >> ${D}${bindir}/SGX/demos/Raw/
> > >> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > >> 2>/dev/null || true
> > >> @@ -251,8 +194,7 @@ do_install () {
> > >>
> > >> }
> > >>
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> > >,"", d)}
> > >> \
> > >> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> # Package the base libraries per silicon revision PACKAGES =+
> > >> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> > >> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> > >> ${PN}-es8"
> > >> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> > >> libIMGegl.so libsrv_um.so libOpenVG.so li
> > >>
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> > >> ${PN}-linuxfbwsegl"
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11wsegl ${PN}-driwsegl" ,"", d)}"
> > >> +
> > >> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> > >> FILES_${PN}-frontwsegl =
> > >"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl =
> > >> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> > >> ${bindir}/x* ${bindir}/*x"
> > >> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> ${libdir}/libsrv_um_dri*"
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> > >> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> > >> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> > >> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> > >> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> > >> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> > >> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
> > >linuxfbwsegl- es8"
> > >>
> > >> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> > >> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> > >> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> > >> driwsegl-es6 ${PN}-driwsegl-es8 "
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"${X11_SEGL}" ,"", d)}"
> > >> FILES_${PN}-blitwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
> > >${PN}-
> > >> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> > >> ${PN}-linuxfbwsegl-es8"
> > >>
> > >> -FILES_${PN}-x11wsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> > >> ${bindir}/ES2*/*x"
> > >> -FILES_${PN}-x11wsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> > >> ${bindir}/ES3*/*x"
> > >> -FILES_${PN}-x11wsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> > >> ${bindir}/ES5*/*x"
> > >> -FILES_${PN}-x11wsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> > >> ${bindir}/ES6*/*x"
> > >> -FILES_${PN}-x11wsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> > >> ${bindir}/ES8*/*x"
> > >> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> > >> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> > >> x11wsegl-es8"
> > >> -
> > >> -FILES_${PN}-driwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES2*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES3*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES5*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES6*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES8*/libsrv_um_dri*"
> > >> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> > >> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> > >> driwsegl-es8"
> > >> -
> > >> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> > >>
> > >> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > >${bindir}/${PVR_INIT}
> > >> ${bindir}/cputype ${bindir}/*"
> > >>
> > >> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > >> FILES_${PN}-tests = "${bindir}/*test*"
> > >> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> > >> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> > >> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> > >> ${bindir}/.debug/* \
> > >> "
> > >>
> > >> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> > >> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> > >> ${prefix}/share/applications "
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> > >>
> > >> FILES_${PN}-rawtrainingcourses =
> > >> "${bindir}/SGX/trainingcourses/Raw/*"
> > >> -FILES_${PN}-x11trainingcourses =
> > >> "${bindir}/SGX/trainingcourses/X11/*"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> > >>
> > >> # The libs need the kernel-modules
> > >> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> > >> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> > >staticdev"
> > >> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> > >> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> > >> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> > >> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> > >"ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> > >> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> > >> INSANE_SKIP_${PN}-tests = "ldflags"
> > >> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> > >>
> > >> # Quality control is really poor on these SDKs, so hack around
> > >the
> > >> latest madness:
> > >> FILES_${PN} += "${libdir}/*.so "
> > >> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > >> 0 1 6 ."
> > >> # Append to update-rc.d postinst
> > >> pkg_postinst_${PN}_append() {
> > >> rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> > >> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> > >> -fi
> > >> -
> > >> }
> > >>
> > >> pkg_postinst_${PN}-blitwsegl() {
> > >> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> > >> $D${sysconfdir}/powervr-esrev }
> > >>
> > >> -pkg_postinst_${PN}-x11wsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> > >> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> > >> $D${sysconfdir}/powervr.ini -}
> > >> -
> > >> -pkg_postinst_${PN}-driwsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -}
> > >> -
> > >> diff --git a/recipes-graphics/libgles/libgles-
> > >omap3_4.09.00.01.bb
> > >> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> index 7c6f231..165a406 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://rc_dri.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \ "
> > >> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> > >> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> > >> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
> > >>
> > >> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> > >>
> > >> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> > >d)}"
> > >> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
> > >>
> > >> -do_configure_append() {
> > >> -
> > >> - # Change PVR server's user mode library to point to DRI
> > >> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> > >> - if [ "$drifile" != "" ]
> > >> - then
> > >> - dir=$(dirname ${drifile})
> > >> - if [ "$SUPPORT_XORG" = "1" ]
> > >> - then
> > >> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> > >> - else
> > >> - rm -rf ${dir}/libsrv_um_dri.so
> > >> - fi
> > >> - fi
> > >> -
> > >> - done
> > >> -}
> > >> -
> > >> -do_install_append() {
> > >> -
> > >> - # In this version of the graphics SDK the following
> > >> directories do not exist:
> > >> - #
> > >> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> > >> (doesn't exist)
> > >> - #
> > >>
> > >/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> > >> s.h (doesn't exist)
> > >> - # Therefore, need to copy these files manually at the only
> > >> location that they do exist
> > >> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> > >> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> > >> -
> > >> - rm ${D}${sysconfdir}/init.d/pvr-init
> > >> -
> > >> - if [ "$SUPPORT_XORG" = "1" ]; then
> > >> - cp -pP ${WORKDIR}/rc_dri.pvr
> > >> ${D}${sysconfdir}/init.d/pvr-init
> > >> - else
> > >> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> > >> init
> > >> - fi
> > >> -
> > >> -}
> > >> -
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> > >> --
> > >> 1.7.1
> > >>
> > >> _______________________________________________
> > >> meta-ti mailing list
> > >> meta-ti@yoctoproject.org
> > >> https://lists.yoctoproject.org/listinfo/meta-ti
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
_______________________________________________
meta-ti mailing list
meta-ti@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-15 2:48 ` Sundareson, Prabindh
@ 2013-05-17 17:02 ` Prabindh Sundareson
2013-05-17 17:07 ` Denys Dmytriyenko
0 siblings, 1 reply; 26+ messages in thread
From: Prabindh Sundareson @ 2013-05-17 17:02 UTC (permalink / raw)
To: Sundareson, Prabindh, Dmytriyenko, Denys, Maupin, Chase
Cc: meta-ti@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 26371 bytes --]
Chase, Denys,
I have resubmitted the patches with comments incorporated. RPROVIDES clarification is pending so still keeping as it was. Please review,
regards
Prabu
________________________________
From: "Sundareson, Prabindh" <prabu@ti.com>
To: "Dmytriyenko, Denys" <denys@ti.com>; "Maupin, Chase" <chase.maupin@ti.com>
Cc: "meta-ti@yoctoproject.org" <meta-ti@yoctoproject.org>
Sent: Wednesday, May 15, 2013 8:18 AM
Subject: Re: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
Denys,
Thanks for the review. I will resubmit the patch-set for review - with below comments implemented.
regards,
Prabu
-----Original Message-----
From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-bounces@yoctoproject.org] On Behalf Of Dmytriyenko, Denys
Sent: Tuesday, May 14, 2013 11:17 PM
To: Maupin, Chase
Cc: meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
Prabu,
I don't think I have any more comments, than for 01, 06 and 08. Will you be re-submitting the entire set later? I'll go ahead and remove this set from my queue as it will be "superseded". Thanks!
--
Denys
On Tue, May 14, 2013 at 01:23:16PM -0400, Denys Dmytriyenko wrote:
> On Fri, May 10, 2013 at 01:27:09PM +0000, Maupin, Chase wrote:
> >
> > >-----Original Message-----
> > >From: Sundareson, Prabindh
> > >Sent: Friday, May 10, 2013 4:17 AM
> > >To: Maupin, Chase; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Chase, thanks for the review,
> > >
> > >1) Ok, I will add it. By "later recipe", you mean the separated
> > >x11 recipe, right ?
> >
> > Yes sir
> >
> > >
> > >2) Good point - I am ok to leave the old .inc and create a new one
> > >with the changes starting from 4.09 then. Is this ok ?
> >
> > I'm OK with the approach. Denys, any concern here?
>
> Sounds good - there are still some users of 4.08 out there...
>
>
> > >regards,
> > >Prabu
> > >
> > >
> > >-----Original Message-----
> > >From: Maupin, Chase
> > >Sent: Wednesday, May 08, 2013 6:48 PM
> > >To: Sundareson, Prabindh; meta-ti@yoctoproject.org
> > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related build and packaging
> > >
> > >Prabu,
> > >
> > >Overall nice job. A couple of things I noticed.
> > >
> > >1. You removed the sample.desktop file but did not put it back in
> > >a later recipe.
> > >2. You modified the common .inc file and then added the X11 pieces
> > >back for 4.09.00.01. This would break people using the older
> > >recipes though. So would it perhaps be a good idea to leave the
> > >.inc alone and then create a new include file for newer recipe
> > >that do this split going forward? Or would it be simpler to
> > >provide the X11 package for the older versions as well? This is
> > >just a thought and I'm hoping others will chime in here.
> > >
> > >Thanks for the patches, it is really good to see this work being
> > >done :)
> > >
> > >> -----Original Message-----
> > >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > >> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> > >> Sent: Thursday, May 02, 2013 8:39 AM
> > >> To: meta-ti@yoctoproject.org
> > >> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > >related
> > >> build and packaging
> > >>
> > >> The SGX530 driver for X11 is only buildable and testable
> > >standalone
> > >> with the pre-built X11 package provided with the Graphics SDK.
> > >> This patch removes X11 build from the default recipe, to enable
> > >moving
> > >> X11 build to a separate recipe.
> > >>
> > >> This is part of a clean up of the Graphics recipe starting from
> > >> 4.09.00.01 version of the Graphics SDK.
> > >>
> > >> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > >> ---
> > >> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
> > >-
> > >> --------------
> > >> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
> > >-
> > >> 2 files changed, 30 insertions(+), 181 deletions(-)
> > >>
> > >> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > >> b/recipes-graphics/libgles/libgles-omap3.inc
> > >> index 9a90c56..130dc49 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3.inc
> > >> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > >> @@ -7,10 +7,6 @@ PR = "r35"
> > >>
> > >> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> > >>
> > >> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > >> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> > >> '${X11DEPENDS}', '', d)}"
> > >> -
> > >> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11', '1', '0', d)}"
> > >> PVR_INIT ?= "pvrsrvinit"
> > >>
> > >> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> > >> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \
> > >> "
> > >>
> > >> @@ -79,87 +74,53 @@ do_compile() {
> > >> export PLAT_CPP="${CXX}"
> > >> export PLAR_AR="${AR}"
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > >> - mkdir -p ${S}/demos/x11
> > >> - mkdir -p ${S}/trainingcourses/x11
> > >> - fi
> > >> -
> > >> mkdir -p ${S}/demos/raw
> > >> mkdir -p ${S}/trainingcourses/raw
> > >>
> > >> # Rebuild demos
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild demos with X11 support for a non X11
> > >> distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> - fi
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> +
> > >> + install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> + done
> > >> +
> > >> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> > >> do
> > >> + cd $demo/OGLES2/Build/LinuxGeneric
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> -
> > >> - for demo in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> > >> - cd $demo/OGLES2/Build/LinuxGeneric
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> -
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > >true
> > >> - sed -e s:NAME:$(basename $demo): \
> > >> - -e
> > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> > >> - ${WORKDIR}/sample.desktop >
> > >> ${WORKDIR}/$(basename $demo).desktop
> > >> - else
> > >> - install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > >true
> > >> done
> > >>
> > >> find ${S} -name "*_org" -delete
> > >>
> > >> # Build OGLES2 Trainingcourses
> > >> - for X11BUILD in 0 1 ; do
> > >> - # Don't rebuild training courses with X11 support for
> > >> a non X11 distro
> > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > >> then
> > >> - continue
> > >> + for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> > >> ] ; then
> > >> + cd $training/OGLES2/Build/LinuxGeneric
> > >> fi
> > >>
> > >> - for training in
> > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > >> - if [ -e
> > >> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/LinuxGeneric
> > >> - fi
> > >> -
> > >> - if [ -e
> > >> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> > >> - cd $training/OGLES2/Build/${PLATFORM}
> > >> - fi
> > >> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> > >> ; then
> > >> + cd $training/OGLES2/Build/${PLATFORM}
> > >> + fi
> > >>
> > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > >> X11BUILD=$X11BUILD
> > >> - rm -f
> > >> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > >> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > >>
> > >> - if [ $X11BUILD -eq 1 ] ; then
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > >> ${S}/trainingcourses/x11 || true
> > >> - else
> > >> - install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> - fi
> > >> - done
> > >> + install -m 0755
> > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > >> ${S}/trainingcourses/raw || true
> > >> done
> > >>
> > >> +
> > >> }
> > >>
> > >> do_install () {
> > >> install -d ${D}${libdir}
> > >> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> > >> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> + rm ${D}${libdir}/libsrv_um_dri.so*
> > >> + rm ${D}${libdir}/pvr_drv.so*
> > >> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> > >>
> > >> install -d ${D}${bindir}/
> > >> @@ -169,12 +130,6 @@ do_install () {
> > >> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > >> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> > >>
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -m 0755 ${BINLOCATION}/xgles1test1
> > >> ${D}${bindir}/
> > >> - install -m 0755
> > >> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> > >> ${D}${bindir}/|| true
> > >> - cp -pPR
> > >>
> > >${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> > >> b/*X11WS* ${D}${libdir} || true
> > >> - fi
> > >> -
> > >> install -d ${D}${includedir}
> > >> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> > >> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
> > >211,13
> > >> +166,12 @@ do_install () {
> > >>
> > >> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> > >> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > >> sgx_render_flip_test"
> > >> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> > >> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> > >> xovg_unit_test"
> > >>
> > >> for esrev in 2 3 5 6 8 ; do
> > >> ESLOCATION=$(eval echo $(echo
> > >> \$\{ES${esrev}LOCATION\}))
> > >> if [ -e ${ESLOCATION} ] ; then
> > >> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> > >${ESLOCATION}/pvr_drv.so
> > >> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> > >> - for esprog in $shared_prog $raw_prog
> > >> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
> > >do
> > >> + for esprog in $shared_prog $raw_prog ; do
> > >> install -m 0755 ${ESLOCATION}/$esprog
> > >${D}${bindir}/ES${esrev}.0/
> > >> 2>/dev/null || true
> > >> done
> > >> fi
> > >> @@ -225,17 +179,6 @@ do_install () {
> > >>
> > >> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> > >> ${D}${bindir}/pdsasm -f || true
> > >>
> > >> - install -d ${D}${prefix}/share/applications
> > >> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > >> - rm ${D}${prefix}/share/applications/sample.desktop
> > >> -
> > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - install -d ${D}${bindir}/SGX/demos/X11/
> > >> - install -m 0755 ${S}/demos/x11/*
> > >> ${D}${bindir}/SGX/demos/X11/
> > >> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > >> 2>/dev/null || true
> > >> - install -m 0755 ${S}/trainingcourses/x11/*
> > >> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> > >> - fi
> > >> -
> > >> install -d ${D}${bindir}/SGX/demos/Raw/
> > >> install -m 0755 ${S}/demos/raw/*
> > >> ${D}${bindir}/SGX/demos/Raw/
> > >> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > >> 2>/dev/null || true
> > >> @@ -251,8 +194,7 @@ do_install () {
> > >>
> > >> }
> > >>
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> > >,"", d)}
> > >> \
> > >> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > >> tests"
> > >> # Package the base libraries per silicon revision PACKAGES =+
> > >> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> > >> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> > >> ${PN}-es8"
> > >> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> > >> libIMGegl.so libsrv_um.so libOpenVG.so li
> > >>
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> > >> ${PN}-linuxfbwsegl"
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > >> x11wsegl ${PN}-driwsegl" ,"", d)}"
> > >> +
> > >> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> > >> FILES_${PN}-frontwsegl =
> > >"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl =
> > >> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> > >> ${bindir}/x* ${bindir}/*x"
> > >> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > >> ${libdir}/libsrv_um_dri*"
> > >>
> > >> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> > >> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> > >> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> > >> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> > >> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> > >> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> > >> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
> > >linuxfbwsegl- es8"
> > >>
> > >> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> > >> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> > >> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> > >> driwsegl-es6 ${PN}-driwsegl-es8 "
> > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"${X11_SEGL}" ,"", d)}"
> > >> FILES_${PN}-blitwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> FILES_${PN}-blitwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> > >> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> FILES_${PN}-linuxfbwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > >> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
> > >${PN}-
> > >> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> > >> ${PN}-linuxfbwsegl-es8"
> > >>
> > >> -FILES_${PN}-x11wsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> > >> ${bindir}/ES2*/*x"
> > >> -FILES_${PN}-x11wsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> > >> ${bindir}/ES3*/*x"
> > >> -FILES_${PN}-x11wsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> > >> ${bindir}/ES5*/*x"
> > >> -FILES_${PN}-x11wsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> > >> ${bindir}/ES6*/*x"
> > >> -FILES_${PN}-x11wsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> > >> ${bindir}/ES8*/*x"
> > >> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> > >> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> > >> x11wsegl-es8"
> > >> -
> > >> -FILES_${PN}-driwsegl-es2 =
> > >> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES2*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es3 =
> > >> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES3*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es5 =
> > >> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES5*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es6 =
> > >> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES6*/libsrv_um_dri*"
> > >> -FILES_${PN}-driwsegl-es8 =
> > >> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> > >> ${libdir}/ES8*/libsrv_um_dri*"
> > >> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> > >> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> > >> driwsegl-es8"
> > >> -
> > >> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> > >>
> > >> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > >${bindir}/${PVR_INIT}
> > >> ${bindir}/cputype ${bindir}/*"
> > >>
> > >> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > >> FILES_${PN}-tests = "${bindir}/*test*"
> > >> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> > >> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> > >> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> > >> ${bindir}/.debug/* \
> > >> "
> > >>
> > >> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> > >> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> > >> ${prefix}/share/applications "
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> > >>
> > >> FILES_${PN}-rawtrainingcourses =
> > >> "${bindir}/SGX/trainingcourses/Raw/*"
> > >> -FILES_${PN}-x11trainingcourses =
> > >> "${bindir}/SGX/trainingcourses/X11/*"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> > >>
> > >> # The libs need the kernel-modules
> > >> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> > >> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> > >staticdev"
> > >> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> > >> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> > >> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> > >> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> > >> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> > >> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> > >"ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> > >> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> > >> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> > >> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> > >> INSANE_SKIP_${PN}-tests = "ldflags"
> > >> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> > >>
> > >> # Quality control is really poor on these SDKs, so hack around
> > >the
> > >> latest madness:
> > >> FILES_${PN} += "${libdir}/*.so "
> > >> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > >> 0 1 6 ."
> > >> # Append to update-rc.d postinst
> > >> pkg_postinst_${PN}_append() {
> > >> rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > >> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> > >> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> > >> -fi
> > >> -
> > >> }
> > >>
> > >> pkg_postinst_${PN}-blitwsegl() {
> > >> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> > >> $D${sysconfdir}/powervr-esrev }
> > >>
> > >> -pkg_postinst_${PN}-x11wsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -
> > >> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> > >> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> > >> $D${sysconfdir}/powervr.ini -}
> > >> -
> > >> -pkg_postinst_${PN}-driwsegl() {
> > >> -rm -f $D${sysconfdir}/powervr-esrev
> > >> -}
> > >> -
> > >> diff --git a/recipes-graphics/libgles/libgles-
> > >omap3_4.09.00.01.bb
> > >> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> index 7c6f231..165a406 100644
> > >> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > >> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> > >> SRC_URI = "http://software-
> > >>
> > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > >> }/exports/${BINFILE} \
> > >> file://cputype \
> > >> file://rc.pvr \
> > >> - file://rc_dri.pvr \
> > >> - file://sample.desktop \
> > >> file://99-bufferclass.rules \ "
> > >> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> > >> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> > >> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
> > >>
> > >> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> > >>
> > >> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> > >> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> > >d)}"
> > >> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
> > >>
> > >> -do_configure_append() {
> > >> -
> > >> - # Change PVR server's user mode library to point to DRI
> > >> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> > >> - if [ "$drifile" != "" ]
> > >> - then
> > >> - dir=$(dirname ${drifile})
> > >> - if [ "$SUPPORT_XORG" = "1" ]
> > >> - then
> > >> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> > >> - else
> > >> - rm -rf ${dir}/libsrv_um_dri.so
> > >> - fi
> > >> - fi
> > >> -
> > >> - done
> > >> -}
> > >> -
> > >> -do_install_append() {
> > >> -
> > >> - # In this version of the graphics SDK the following
> > >> directories do not exist:
> > >> - #
> > >> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> > >> (doesn't exist)
> > >> - #
> > >>
> > >/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> > >> s.h (doesn't exist)
> > >> - # Therefore, need to copy these files manually at the only
> > >> location that they do exist
> > >> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> > >> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> > >> -
> > >> - rm ${D}${sysconfdir}/init.d/pvr-init
> > >> -
> > >> - if [ "$SUPPORT_XORG" = "1" ]; then
> > >> - cp -pP ${WORKDIR}/rc_dri.pvr
> > >> ${D}${sysconfdir}/init.d/pvr-init
> > >> - else
> > >> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> > >> init
> > >> - fi
> > >> -
> > >> -}
> > >> -
> > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> > >> --
> > >> 1.7.1
> > >>
> > >> _______________________________________________
> > >> meta-ti mailing list
> > >> meta-ti@yoctoproject.org
> > >> https://lists.yoctoproject.org/listinfo/meta-ti
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> >
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
_______________________________________________
meta-ti mailing list
meta-ti@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-ti
_______________________________________________
meta-ti mailing list
meta-ti@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-ti
[-- Attachment #2: Type: text/html, Size: 42695 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
2013-05-17 17:02 ` Prabindh Sundareson
@ 2013-05-17 17:07 ` Denys Dmytriyenko
0 siblings, 0 replies; 26+ messages in thread
From: Denys Dmytriyenko @ 2013-05-17 17:07 UTC (permalink / raw)
To: Prabindh Sundareson; +Cc: meta-ti@yoctoproject.org
On Fri, May 17, 2013 at 10:02:15AM -0700, Prabindh Sundareson wrote:
> Chase, Denys,
>
> I have resubmitted the patches with comments incorporated. RPROVIDES
> clarification is pending so still keeping as it was. Please review,
Thanks! I'll take a look.
--
Denys
> ________________________________
> From: "Sundareson, Prabindh" <prabu@ti.com>
> To: "Dmytriyenko, Denys" <denys@ti.com>; "Maupin, Chase" <chase.maupin@ti.com>
> Cc: "meta-ti@yoctoproject.org" <meta-ti@yoctoproject.org>
> Sent: Wednesday, May 15, 2013 8:18 AM
> Subject: Re: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
>
>
> Denys,
>
> Thanks for the review. I will resubmit the patch-set for review - with below comments implemented.
>
> regards,
> Prabu
>
>
> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-bounces@yoctoproject.org] On Behalf Of Dmytriyenko, Denys
> Sent: Tuesday, May 14, 2013 11:17 PM
> To: Maupin, Chase
> Cc: meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11 related build and packaging
>
> Prabu,
>
> I don't think I have any more comments, than for 01, 06 and 08. Will you be re-submitting the entire set later? I'll go ahead and remove this set from my queue as it will be "superseded". Thanks!
>
> --
> Denys
>
>
> On Tue, May 14, 2013 at 01:23:16PM -0400, Denys Dmytriyenko wrote:
> > On Fri, May 10, 2013 at 01:27:09PM +0000, Maupin, Chase wrote:
> > >
> > > >-----Original Message-----
> > > >From: Sundareson, Prabindh
> > > >Sent: Friday, May 10, 2013 4:17 AM
> > > >To: Maupin, Chase; meta-ti@yoctoproject.org
> > > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > > >related build and packaging
> > > >
> > > >Chase, thanks for the review,
> > > >
> > > >1) Ok, I will add it. By "later recipe", you mean the separated
> > > >x11 recipe, right ?
> > >
> > > Yes sir
> > >
> > > >
> > > >2) Good point - I am ok to leave the old .inc and create a new one
> > > >with the changes starting from 4.09 then. Is this ok ?
> > >
> > > I'm OK with the approach. Denys, any concern here?
> >
> > Sounds good - there are still some users of 4.08 out there...
> >
> >
> > > >regards,
> > > >Prabu
> > > >
> > > >
> > > >-----Original Message-----
> > > >From: Maupin, Chase
> > > >Sent: Wednesday, May 08, 2013 6:48 PM
> > > >To: Sundareson, Prabindh; meta-ti@yoctoproject.org
> > > >Subject: RE: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > > >related build and packaging
> > > >
> > > >Prabu,
> > > >
> > > >Overall nice job. A couple of things I noticed.
> > > >
> > > >1. You removed the sample.desktop file but did not put it back in
> > > >a later recipe.
> > > >2. You modified the common .inc file and then added the X11 pieces
> > > >back for 4.09.00.01. This would break people using the older
> > > >recipes though. So would it perhaps be a good idea to leave the
> > > >.inc alone and then create a new include file for newer recipe
> > > >that do this split going forward? Or would it be simpler to
> > > >provide the X11 package for the older versions as well? This is
> > > >just a thought and I'm hoping others will chime in here.
> > > >
> > > >Thanks for the patches, it is really good to see this work being
> > > >done :)
> > > >
> > > >> -----Original Message-----
> > > >> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > > >> bounces@yoctoproject.org] On Behalf Of Sundareson, Prabindh
> > > >> Sent: Thursday, May 02, 2013 8:39 AM
> > > >> To: meta-ti@yoctoproject.org
> > > >> Subject: [meta-ti] [PATCH 01/10] libgles-omap3: Remove X11
> > > >related
> > > >> build and packaging
> > > >>
> > > >> The SGX530 driver for X11 is only buildable and testable
> > > >standalone
> > > >> with the pre-built X11 package provided with the Graphics SDK.
> > > >> This patch removes X11 build from the default recipe, to enable
> > > >moving
> > > >> X11 build to a separate recipe.
> > > >>
> > > >> This is part of a clean up of the Graphics recipe starting from
> > > >> 4.09.00.01 version of the Graphics SDK.
> > > >>
> > > >> Signed-off-by: Prabindh Sundareson <prabu@ti.com>
> > > >> ---
> > > >> recipes-graphics/libgles/libgles-omap3.inc | 168 ++++-
> > > >-
> > > >> --------------
> > > >> .../libgles/libgles-omap3_4.09.00.01.bb | 43 +----
> > > >-
> > > >> 2 files changed, 30 insertions(+), 181 deletions(-)
> > > >>
> > > >> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > > >> b/recipes-graphics/libgles/libgles-omap3.inc
> > > >> index 9a90c56..130dc49 100644
> > > >> --- a/recipes-graphics/libgles/libgles-omap3.inc
> > > >> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > > >> @@ -7,10 +7,6 @@ PR = "r35"
> > > >>
> > > >> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> > > >>
> > > >> -X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > > >> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11',
> > > >> '${X11DEPENDS}', '', d)}"
> > > >> -
> > > >> -export SUPPORT_XORG ?= "${@base_contains('DISTRO_FEATURES',
> > > >> 'x11', '1', '0', d)}"
> > > >> PVR_INIT ?= "pvrsrvinit"
> > > >>
> > > >> PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
> > > >> @@ -22,7 +18,6 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
> > > >> SRC_URI = "http://software-
> > > >>
> > > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > > >> }/exports/${BINFILE} \
> > > >> file://cputype \
> > > >> file://rc.pvr \
> > > >> - file://sample.desktop \
> > > >> file://99-bufferclass.rules \
> > > >> "
> > > >>
> > > >> @@ -79,87 +74,53 @@ do_compile() {
> > > >> export PLAT_CPP="${CXX}"
> > > >> export PLAR_AR="${AR}"
> > > >>
> > > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > > >> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > > >> - mkdir -p ${S}/demos/x11
> > > >> - mkdir -p ${S}/trainingcourses/x11
> > > >> - fi
> > > >> -
> > > >> mkdir -p ${S}/demos/raw
> > > >> mkdir -p ${S}/trainingcourses/raw
> > > >>
> > > >> # Rebuild demos
> > > >> - for X11BUILD in 0 1 ; do
> > > >> - # Don't rebuild demos with X11 support for a non X11
> > > >> distro
> > > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > > >> then
> > > >> - continue
> > > >> - fi
> > > >> + for demo in ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ;
> > > >> do
> > > >> + cd $demo/OGLES/Build/LinuxGeneric
> > > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > > >> + rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > > >> +
> > > >> + install -m 0755
> > > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > > >true
> > > >> + done
> > > >> +
> > > >> + for demo in ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ;
> > > >> do
> > > >> + cd $demo/OGLES2/Build/LinuxGeneric
> > > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > > >> + rm -f $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > > >>
> > > >> - for demo in
> > > >> ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Demos/* ; do
> > > >> - cd $demo/OGLES/Build/LinuxGeneric
> > > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > > >> X11BUILD=$X11BUILD
> > > >> - rm $demo/OGLES/Build/${PLATFORM}/Release*/*.o
> > > >> -
> > > >> - if [ $X11BUILD -eq 1 ] ; then
> > > >> - install -m 0755
> > > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > > >true
> > > >> - sed -e s:NAME:$(basename $demo): \
> > > >> - -e
> > > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > > >> $demo/OGLES/Build/${PLATFORM}/ReleaseX11/*): \
> > > >> - ${WORKDIR}/sample.desktop >
> > > >> ${WORKDIR}/$(basename $demo).desktop
> > > >> - else
> > > >> - install -m 0755
> > > >> $demo/OGLES/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > > >true
> > > >> - fi
> > > >> - done
> > > >> -
> > > >> - for demo in
> > > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Demos/* ; do
> > > >> - cd $demo/OGLES2/Build/LinuxGeneric
> > > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > > >> X11BUILD=$X11BUILD
> > > >> - rm -f
> > > >> $demo/OGLES2/Build/${PLATFORM}/Release*/*.o
> > > >> -
> > > >> - if [ $X11BUILD -eq 1 ] ; then
> > > >> - install -m 0755
> > > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > > >true
> > > >> - sed -e s:NAME:$(basename $demo): \
> > > >> - -e
> > > >> s:EXEC:${bindir}/SGX/demos/X11/$(basename
> > > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/*): \
> > > >> - ${WORKDIR}/sample.desktop >
> > > >> ${WORKDIR}/$(basename $demo).desktop
> > > >> - else
> > > >> - install -m 0755
> > > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > > >true
> > > >> - fi
> > > >> - done
> > > >> + install -m 0755
> > > >> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > > >true
> > > >> done
> > > >>
> > > >> find ${S} -name "*_org" -delete
> > > >>
> > > >> # Build OGLES2 Trainingcourses
> > > >> - for X11BUILD in 0 1 ; do
> > > >> - # Don't rebuild training courses with X11 support for
> > > >> a non X11 distro
> > > >> - if [ ${SUPPORT_XORG} -eq 0 -a $X11BUILD -eq 1 ] ;
> > > >> then
> > > >> - continue
> > > >> + for training in
> > > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > > >> + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile
> > > >> ] ; then
> > > >> + cd $training/OGLES2/Build/LinuxGeneric
> > > >> fi
> > > >>
> > > >> - for training in
> > > >> ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/TrainingCourse/* ; do
> > > >> - if [ -e
> > > >> $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then
> > > >> - cd $training/OGLES2/Build/LinuxGeneric
> > > >> - fi
> > > >> -
> > > >> - if [ -e
> > > >> $training/OGLES2/Build/${PLATFORM}/Makefile ] ; then
> > > >> - cd $training/OGLES2/Build/${PLATFORM}
> > > >> - fi
> > > >> + if [ -e $training/OGLES2/Build/${PLATFORM}/Makefile ]
> > > >> ; then
> > > >> + cd $training/OGLES2/Build/${PLATFORM}
> > > >> + fi
> > > >>
> > > >> - oe_runmake Common=1 PLATFORM=${PLATFORM}
> > > >> X11BUILD=$X11BUILD
> > > >> - rm -f
> > > >> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > > >> + oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=0
> > > >> + rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > > >>
> > > >> - if [ $X11BUILD -eq 1 ] ; then
> > > >> - install -m 0755
> > > >> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > > >> ${S}/trainingcourses/x11 || true
> > > >> - else
> > > >> - install -m 0755
> > > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > > >> ${S}/trainingcourses/raw || true
> > > >> - fi
> > > >> - done
> > > >> + install -m 0755
> > > >> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > > >> ${S}/trainingcourses/raw || true
> > > >> done
> > > >>
> > > >> +
> > > >> }
> > > >>
> > > >> do_install () {
> > > >> install -d ${D}${libdir}
> > > >> cp -pPR ${BINLOCATION}/*.so* ${D}${libdir}
> > > >> + rm ${D}${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > > >> + rm ${D}${libdir}/libsrv_um_dri.so*
> > > >> + rm ${D}${libdir}/pvr_drv.so*
> > > >> install -m 0644 ${BINLOCATION}/*.a ${D}${libdir}
> > > >>
> > > >> install -d ${D}${bindir}/
> > > >> @@ -169,12 +130,6 @@ do_install () {
> > > >> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > > >> install -m 0755 ${BINLOCATION}/${PVR_INIT} ${D}${bindir}/
> > > >>
> > > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > > >> - install -m 0755 ${BINLOCATION}/xgles1test1
> > > >> ${D}${bindir}/
> > > >> - install -m 0755
> > > >> ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx
> > > >> ${D}${bindir}/|| true
> > > >> - cp -pPR
> > > >>
> > > >${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/${PLATFORM}/li
> > > >> b/*X11WS* ${D}${libdir} || true
> > > >> - fi
> > > >> -
> > > >> install -d ${D}${includedir}
> > > >> cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
> > > >> cp -pPR ${S}/GFX_Linux_KM/services4 ${D}${includedir}/ @@ -
> > > >211,13
> > > >> +166,12 @@ do_install () {
> > > >>
> > > >> shared_prog="eglinfo pvr2d_test ${PVR_INIT} services_test
> > > >> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > > >> sgx_render_flip_test"
> > > >> raw_prog="gles1test1 gles2test1 ovg_unit_test"
> > > >> - x11_prog="eglinfo_x xgles1test1 xgles2test1 xmultiegltest
> > > >> xovg_unit_test"
> > > >>
> > > >> for esrev in 2 3 5 6 8 ; do
> > > >> ESLOCATION=$(eval echo $(echo
> > > >> \$\{ES${esrev}LOCATION\}))
> > > >> if [ -e ${ESLOCATION} ] ; then
> > > >> cp -pPR ${ESLOCATION}/lib*${IMGPV}
> > > >${ESLOCATION}/pvr_drv.so
> > > >> ${ESLOCATION}/*.a ${D}${libdir}/ES${esrev}.0/
> > > >> - for esprog in $shared_prog $raw_prog
> > > >> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ;
> > > >do
> > > >> + for esprog in $shared_prog $raw_prog ; do
> > > >> install -m 0755 ${ESLOCATION}/$esprog
> > > >${D}${bindir}/ES${esrev}.0/
> > > >> 2>/dev/null || true
> > > >> done
> > > >> fi
> > > >> @@ -225,17 +179,6 @@ do_install () {
> > > >>
> > > >> rm ${D}${bindir}/ES*/*.h ${D}${bindir}/ES*/pdsasm
> > > >> ${D}${bindir}/pdsasm -f || true
> > > >>
> > > >> - install -d ${D}${prefix}/share/applications
> > > >> - cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > > >> - rm ${D}${prefix}/share/applications/sample.desktop
> > > >> -
> > > >> - if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > > >> - install -d ${D}${bindir}/SGX/demos/X11/
> > > >> - install -m 0755 ${S}/demos/x11/*
> > > >> ${D}${bindir}/SGX/demos/X11/
> > > >> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > > >> 2>/dev/null || true
> > > >> - install -m 0755 ${S}/trainingcourses/x11/*
> > > >> ${D}${bindir}/SGX/trainingcourses/X11/ 2>/dev/null || true
> > > >> - fi
> > > >> -
> > > >> install -d ${D}${bindir}/SGX/demos/Raw/
> > > >> install -m 0755 ${S}/demos/raw/*
> > > >> ${D}${bindir}/SGX/demos/Raw/
> > > >> install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > > >> 2>/dev/null || true
> > > >> @@ -251,8 +194,7 @@ do_install () {
> > > >>
> > > >> }
> > > >>
> > > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > > >> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx"
> > > >,"", d)}
> > > >> \
> > > >> - ${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > > >> tests"
> > > >> +PACKAGES =+ "${PN}-rawdemos ${PN}-rawtrainingcourses ${PN}-
> > > >> tests"
> > > >> # Package the base libraries per silicon revision PACKAGES =+
> > > >> "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6 ${PN}-es8"
> > > >> RRECOMMENDS_${PN} += "${PN}-es2 ${PN}-es3 ${PN}-es5 ${PN}-es6
> > > >> ${PN}-es8"
> > > >> @@ -271,18 +213,14 @@ PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so
> > > >> libIMGegl.so libsrv_um.so libOpenVG.so li
> > > >>
> > > >>
> > > >> PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl
> > > >> ${PN}-linuxfbwsegl"
> > > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > > >> x11wsegl ${PN}-driwsegl" ,"", d)}"
> > > >> +
> > > >> FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
> > > >> FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
> > > >> FILES_${PN}-frontwsegl =
> > > >"${libdir}/libpvrPVR2D_FRONTWSEGL.so.*"
> > > >> FILES_${PN}-linuxfbwsegl =
> > > >> "${libdir}/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > > >> -FILES_${PN}-x11wsegl = "${libdir}/libpvrPVR2D_X11WSEGL.so*
> > > >> ${bindir}/x* ${bindir}/*x"
> > > >> -FILES_${PN}-driwsegl = "${libdir}/libpvrPVR2D_DRIWSEGL.so*
> > > >> ${libdir}/libsrv_um_dri*"
> > > >>
> > > >> PACKAGES =+ "${PN}-blitwsegl-es2 ${PN}-blitwsegl-es3 ${PN}-
> > > >> blitwsegl-es5 ${PN}-blitwsegl-es6 ${PN}-blitwsegl-es8 ${PN}-
> > > >> flipwsegl-es2 ${PN}-flipwsegl-es3 ${PN}-flipwsegl-es5 ${PN}-
> > > >> flipwsegl-es6 ${PN}-flipwsegl-es8 ${PN}-frontwsegl-es2 ${PN}-
> > > >> frontwsegl-es3 ${PN}-frontwsegl-es5 ${PN}-frontwsegl-es6 ${PN}-
> > > >> frontwsegl-es8 ${PN}-linuxfbwsegl-es2 ${PN}-linuxfbwsegl-es3
> > > >> ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6 ${PN}-
> > > >linuxfbwsegl- es8"
> > > >>
> > > >> -X11_SEGL = " ${PN}-x11wsegl-es2 ${PN}-x11wsegl-es3 ${PN}-
> > > >> x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-x11wsegl-es8 ${PN}-
> > > >> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-
> > > >> driwsegl-es6 ${PN}-driwsegl-es8 "
> > > >> -PACKAGES =+ "${@base_contains('DISTRO_FEATURES',
> > > >> 'x11',"${X11_SEGL}" ,"", d)}"
> > > >> FILES_${PN}-blitwsegl-es2 =
> > > >> "${libdir}/ES2*/libpvrPVR2D_BLITWSEGL.so.*"
> > > >> FILES_${PN}-blitwsegl-es3 =
> > > >> "${libdir}/ES3*/libpvrPVR2D_BLITWSEGL.so.*"
> > > >> FILES_${PN}-blitwsegl-es5 =
> > > >> "${libdir}/ES5*/libpvrPVR2D_BLITWSEGL.so.*"
> > > >> @@ -311,25 +249,10 @@ FILES_${PN}-linuxfbwsegl-es6 =
> > > >> "${libdir}/ES6*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > > >> FILES_${PN}-linuxfbwsegl-es8 =
> > > >> "${libdir}/ES8*/libpvrPVR2D_LINUXFBWSEGL.so.*"
> > > >> RRECOMMENDS_${PN}-linuxfbwsegl = " ${PN}-linuxfbwsegl-es2
> > > >${PN}-
> > > >> linuxfbwsegl-es3 ${PN}-linuxfbwsegl-es5 ${PN}-linuxfbwsegl-es6
> > > >> ${PN}-linuxfbwsegl-es8"
> > > >>
> > > >> -FILES_${PN}-x11wsegl-es2 =
> > > >> "${libdir}/ES2*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES2*/x*
> > > >> ${bindir}/ES2*/*x"
> > > >> -FILES_${PN}-x11wsegl-es3 =
> > > >> "${libdir}/ES3*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES3*/x*
> > > >> ${bindir}/ES3*/*x"
> > > >> -FILES_${PN}-x11wsegl-es5 =
> > > >> "${libdir}/ES5*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES5*/x*
> > > >> ${bindir}/ES5*/*x"
> > > >> -FILES_${PN}-x11wsegl-es6 =
> > > >> "${libdir}/ES6*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES6*/x*
> > > >> ${bindir}/ES6*/*x"
> > > >> -FILES_${PN}-x11wsegl-es8 =
> > > >> "${libdir}/ES8*/libpvrPVR2D_X11WSEGL.so.* ${bindir}/ES8*/x*
> > > >> ${bindir}/ES8*/*x"
> > > >> -RRECOMMENDS_${PN}-x11wsegl = " ${PN}-x11wsegl-es2 ${PN}-
> > > >> x11wsegl-es3 ${PN}-x11wsegl-es5 ${PN}-x11wsegl-es6 ${PN}-
> > > >> x11wsegl-es8"
> > > >> -
> > > >> -FILES_${PN}-driwsegl-es2 =
> > > >> "${libdir}/ES2*/libpvrPVR2D_DRIWSEGL.so.*
> > > >> ${libdir}/ES2*/libsrv_um_dri*"
> > > >> -FILES_${PN}-driwsegl-es3 =
> > > >> "${libdir}/ES3*/libpvrPVR2D_DRIWSEGL.so.*
> > > >> ${libdir}/ES3*/libsrv_um_dri*"
> > > >> -FILES_${PN}-driwsegl-es5 =
> > > >> "${libdir}/ES5*/libpvrPVR2D_DRIWSEGL.so.*
> > > >> ${libdir}/ES5*/libsrv_um_dri*"
> > > >> -FILES_${PN}-driwsegl-es6 =
> > > >> "${libdir}/ES6*/libpvrPVR2D_DRIWSEGL.so.*
> > > >> ${libdir}/ES6*/libsrv_um_dri*"
> > > >> -FILES_${PN}-driwsegl-es8 =
> > > >> "${libdir}/ES8*/libpvrPVR2D_DRIWSEGL.so.*
> > > >> ${libdir}/ES8*/libsrv_um_dri*"
> > > >> -RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-
> > > >> driwsegl-es3 ${PN}-driwsegl-es5 ${PN}-driwsegl-es6 ${PN}-
> > > >> driwsegl-es8"
> > > >> -
> > > >> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> > > >>
> > > >> FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > > >${bindir}/${PVR_INIT}
> > > >> ${bindir}/cputype ${bindir}/*"
> > > >>
> > > >> -FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > > >> FILES_${PN}-tests = "${bindir}/*test*"
> > > >> FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
> > > >> ${libdir}/ES*/.debug ${bindir}/*/.debug\ @@
> > > >> -338,12 +261,8 @@ FILES_${PN}-dbg = "${libdir}/.debug/*
> > > >> ${bindir}/.debug/* \
> > > >> "
> > > >>
> > > >> FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
> > > >> -FILES_${PN}-x11demos = "${bindir}/SGX/demos/X11/*
> > > >> ${prefix}/share/applications "
> > > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-x11wsegl"
> > > >>
> > > >> FILES_${PN}-rawtrainingcourses =
> > > >> "${bindir}/SGX/trainingcourses/Raw/*"
> > > >> -FILES_${PN}-x11trainingcourses =
> > > >> "${bindir}/SGX/trainingcourses/X11/*"
> > > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-x11wsegl"
> > > >>
> > > >> # The libs need the kernel-modules
> > > >> RRECOMMENDS_${PN} += "omap3-sgx-modules"
> > > >> @@ -358,7 +277,6 @@ INSANE_SKIP_${PN}-es5 = "ldflags dev-so
> > > >staticdev"
> > > >> INSANE_SKIP_${PN}-es6 = "ldflags dev-so staticdev"
> > > >> INSANE_SKIP_${PN}-es8 = "ldflags dev-so staticdev"
> > > >> INSANE_SKIP_${PN}-rawdemos = "ldflags dev-so useless-rpaths"
> > > >> -INSANE_SKIP_${PN}-x11demos = "ldflags dev-so useless-rpaths"
> > > >> INSANE_SKIP_${PN}-blitwsegl = "ldflags"
> > > >> INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
> > > >> INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
> > > >> @@ -379,18 +297,7 @@ INSANE_SKIP_${PN}-linuxfbwsegl-es3 =
> > > >"ldflags"
> > > >> INSANE_SKIP_${PN}-linuxfbwsegl-es5 = "ldflags"
> > > >> INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
> > > >> INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
> > > >> -INSANE_SKIP_${PN}-x11wsegl = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-x11wsegl-es3 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-x11wsegl-es5 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-x11wsegl-es6 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-x11wsegl-es8 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-driwsegl = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-driwsegl-es3 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-driwsegl-es5 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-driwsegl-es6 = "ldflags dev-so"
> > > >> -INSANE_SKIP_${PN}-driwsegl-es8 = "ldflags dev-so"
> > > >> INSANE_SKIP_${PN}-tests = "ldflags"
> > > >> -INSANE_SKIP_xserver-kdrive-powervrsgx = "ldflags"
> > > >>
> > > >> # Quality control is really poor on these SDKs, so hack around
> > > >the
> > > >> latest madness:
> > > >> FILES_${PN} += "${libdir}/*.so "
> > > >> @@ -404,12 +311,6 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > > >> 0 1 6 ."
> > > >> # Append to update-rc.d postinst
> > > >> pkg_postinst_${PN}_append() {
> > > >> rm -f $D${sysconfdir}/powervr-esrev
> > > >> -
> > > >> -if [ ${SUPPORT_XORG} -eq 1 ] ; then
> > > >> - ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0
> > > >> - ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
> > > >> -fi
> > > >> -
> > > >> }
> > > >>
> > > >> pkg_postinst_${PN}-blitwsegl() {
> > > >> @@ -427,14 +328,3 @@ pkg_postinst_${PN}-linuxfbwsegl() { rm -f
> > > >> $D${sysconfdir}/powervr-esrev }
> > > >>
> > > >> -pkg_postinst_${PN}-x11wsegl() {
> > > >> -rm -f $D${sysconfdir}/powervr-esrev
> > > >> -
> > > >> -echo "[default]" > $D${sysconfdir}/powervr.ini -echo
> > > >> "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >>
> > > >> $D${sysconfdir}/powervr.ini -}
> > > >> -
> > > >> -pkg_postinst_${PN}-driwsegl() {
> > > >> -rm -f $D${sysconfdir}/powervr-esrev
> > > >> -}
> > > >> -
> > > >> diff --git a/recipes-graphics/libgles/libgles-
> > > >omap3_4.09.00.01.bb
> > > >> b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > > >> index 7c6f231..165a406 100644
> > > >> --- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > > >> +++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
> > > >> @@ -23,8 +23,6 @@ TI_BIN_UNPK_WDEXT := "/Graphics_SDK_${SGXPV}"
> > > >> SRC_URI = "http://software-
> > > >>
> > > >dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV
> > > >> }/exports/${BINFILE} \
> > > >> file://cputype \
> > > >> file://rc.pvr \
> > > >> - file://rc_dri.pvr \
> > > >> - file://sample.desktop \
> > > >> file://99-bufferclass.rules \ "
> > > >> SRC_URI[md5sum] = "bd35e9d8843aff3a2aca9d41e7db1c7d"
> > > >> @@ -32,44 +30,5 @@ SRC_URI[sha256sum] =
> > > >> "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249
> > > >>
> > > >> S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
> > > >>
> > > >> -LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES',
> > > >> 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1",
> > > >d)}"
> > > >> +LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
> > > >>
> > > >> -do_configure_append() {
> > > >> -
> > > >> - # Change PVR server's user mode library to point to DRI
> > > >> - for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
> > > >> - if [ "$drifile" != "" ]
> > > >> - then
> > > >> - dir=$(dirname ${drifile})
> > > >> - if [ "$SUPPORT_XORG" = "1" ]
> > > >> - then
> > > >> - mv ${dir}/libsrv_um_dri.so ${dir}/libsrv_um.so
> > > >> - else
> > > >> - rm -rf ${dir}/libsrv_um_dri.so
> > > >> - fi
> > > >> - fi
> > > >> -
> > > >> - done
> > > >> -}
> > > >> -
> > > >> -do_install_append() {
> > > >> -
> > > >> - # In this version of the graphics SDK the following
> > > >> directories do not exist:
> > > >> - #
> > > >> /GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/pvr2d.h
> > > >> (doesn't exist)
> > > >> - #
> > > >>
> > > >/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/GLES/egltype
> > > >> s.h (doesn't exist)
> > > >> - # Therefore, need to copy these files manually at the only
> > > >> location that they do exist
> > > >> - cp -pPr ${S}/include/pvr2d/*.h ${D}${includedir}
> > > >> - cp -pPr ${S}/include/OGLES/GLES ${D}${includedir}/
> > > >> -
> > > >> - rm ${D}${sysconfdir}/init.d/pvr-init
> > > >> -
> > > >> - if [ "$SUPPORT_XORG" = "1" ]; then
> > > >> - cp -pP ${WORKDIR}/rc_dri.pvr
> > > >> ${D}${sysconfdir}/init.d/pvr-init
> > > >> - else
> > > >> - cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-
> > > >> init
> > > >> - fi
> > > >> -
> > > >> -}
> > > >> -
> > > >> -RRECOMMENDS_${PN}-x11demos = "${PN}-driwsegl"
> > > >> -RRECOMMENDS_${PN}-x11trainingcourses = "${PN}-driwsegl"
> > > >> --
> > > >> 1.7.1
> > > >>
> > > >> _______________________________________________
> > > >> meta-ti mailing list
> > > >> meta-ti@yoctoproject.org
> > > >> https://lists.yoctoproject.org/listinfo/meta-ti
> > > _______________________________________________
> > > meta-ti mailing list
> > > meta-ti@yoctoproject.org
> > > https://lists.yoctoproject.org/listinfo/meta-ti
> > >
> > _______________________________________________
> > meta-ti mailing list
> > meta-ti@yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/meta-ti
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 26+ messages in thread