meta-ti -- Mailing list for the meta-ti layer of yocto ()

headers

Denys Dmytriyenko | 18 May 2013 03:23

[nightly] Distroless meta-ti/master minimal build 2013-05-17_21-01-44

Status for 05/17/13

BUILD_ID: build-2013-05-17_21-02-52

Clean Build: false

Clean Sources: false

Repository Revisions

Repository Git URL Branch Commit ID Layers

bitbake	git://git.openembedded.org/bitbake	master	HEAD	layers=
meta-ti	git://git.yoctoproject.org/meta-ti	master	HEAD	layers=
oe-core	git://git.openembedded.org/openembedded-core	master	HEAD	layers=meta

Build and Target Test Results

Machine Build Result Target Test Result

am335x-evm	PASSED	FAILED
am37x-evm	PASSED	FAILED
am3517-evm	PASSED	FAILED
am180x-evm	PASSED	FAILED: CRITICAL
omap5-evm	PASSED	SKIPPED
keystone-evm	PASSED	FAILED: CRITICAL
beagleboard	PASSED	FAILED
beaglebone	PASSED	SKIPPED
pandaboard	PASSED	SKIPPED

These builds were performed using the build-oesdk.sh script at:

git://arago-project.org/git/projects/tisdk-build-scripts.git

The configuration file passed to this script had the contents:

MANDATORY_INPUTS="MACHINES NUM_ARM9_BUILDS NUM_CORTEX_BUILDS BUILD_ID SCRIPTS_ROOT BUILD_ROOT TEST_ROOT PACKAGE_ROOT DEPLOY_ROOT FS_FILTER FS_IMAGE_TYPE NFS_ROOT CONFIG_FILE LOG_DIR TISDK_VERSION"
TISDK_VERSION="2013.05"
MACHINES="am335x-evm am37x-evm am3517-evm am180x-evm omap5-evm keystone-evm beagleboard beaglebone pandaboard"
NUM_ARM9_BUILDS="1"
NUM_CORTEX_BUILDS="2"
BUILD_ID="`date +build-%F_%H-%M-%S`"
SCRIPTS_ROOT="$PWD"
BUILD_ROOT="/home/jenkins/distroless-build"
TEST_ROOT="$BUILD_ROOT/testing"
PACKAGE_ROOT="$BUILD_ROOT/packaging"
DEPLOY_ROOT="$BUILD_ROOT/deploy/$TISDK_VERSION"
FS_FILTER="core-image-minimal-"
FS_IMAGE_TYPE="tar.gz"
NFS_ROOT="/home/jenkins/nfs-root"
SOURCE_DIR="${BUILD_ROOT}/sources"
CLEAN_BUILD="false"
CLEAN_ALL="false"
CONFIG_FILE="${BUILD_ROOT}/configs/distroless-meta-ti-config.txt"
LOG_DIR="${BUILD_ROOT}/log-files"
DL_DIR="/OE/downloads"
INSTALLER_EXTRAS_ROOT="/home/jenkins/extra-files/installer_content"
TEST_SCRIPTS="$SCRIPTS_ROOT/test-scripts"
TEST_SCRIPTS_TGT="home/root/test-scripts"
TEST_LOCAL_IFACE="eth1"
OPENTEST_CLI="$SCRIPTS_ROOT/opentest_cli_0.7.tar.gz"
OPENTEST_TEE_IP="10.218.102.142"
RUN_BUILD_TESTS="true"
STAF_ROOT="/usr/local/staf"
SKIP_TEST_FAILURES="false"
PRODUCTIZE_SDK="false"
BITBAKE_COMMAND="core-image-minimal"
RESULTS_CONFIG_COMMENTS="false"
BACKUP_RESULTS="/home/jenkins/jobs/distroless-meta-ti-nightly/workspace"

<div>

<h2>Status for 05/17/13</h2>

<h2>BUILD_ID: build-2013-05-17_21-02-52</h2>

<h2>Clean Build: false</h2>

<h2>Clean Sources: false</h2>
<h2>Repository Revisions</h2>
<table border="1" cellspacing="1" cellpadding="1">
<tr>Repository
        Git URL
        Branch
        Commit ID
        Layers
    </tr>
<tr>
<td>bitbake</td>
        <td>git://git.openembedded.org/bitbake</td>
        <td>master</td>
        <td>HEAD</td>
        <td>layers=</td>
    </tr>
<tr>
<td>meta-ti</td>
        <td>git://git.yoctoproject.org/meta-ti</td>
        <td>master</td>
        <td>HEAD</td>
        <td>layers=</td>
    </tr>
<tr>
<td>oe-core</td>
        <td>git://git.openembedded.org/openembedded-core</td>
        <td>master</td>
        <td>HEAD</td>
        <td>layers=meta</td>
    </tr>
</table>
<h2>Build and Target Test Results</h2>
<table border="1" cellspacing="1" cellpadding="1">
<tr>Machine
        Build Result
        Target Test Result
    </tr>
<tr>
<td>am335x-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED</td>
    </tr>
<tr>
<td>am37x-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED</td>
    </tr>
<tr>
<td>am3517-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED</td>
    </tr>
<tr>
<td>am180x-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED: CRITICAL</td>
    </tr>
<tr>
<td>omap5-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="yellow">SKIPPED</td>
    </tr>
<tr>
<td>keystone-evm</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED: CRITICAL</td>
    </tr>
<tr>
<td>beagleboard</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="red">FAILED</td>
    </tr>
<tr>
<td>beaglebone</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="yellow">SKIPPED</td>
    </tr>
<tr>
<td>pandaboard</td>
        <td bgcolor="lime">PASSED</td>
        <td bgcolor="yellow">SKIPPED</td>
    </tr>
</table>
<p>
These builds were performed using the build-oesdk.sh script at:
</p>
<p>
git://arago-project.org/git/projects/tisdk-build-scripts.git
</p>

<p>
The configuration file passed to this script had the contents:
</p>
<p>
MANDATORY_INPUTS="MACHINES NUM_ARM9_BUILDS NUM_CORTEX_BUILDS BUILD_ID SCRIPTS_ROOT BUILD_ROOT TEST_ROOT PACKAGE_ROOT DEPLOY_ROOT FS_FILTER FS_IMAGE_TYPE NFS_ROOT CONFIG_FILE LOG_DIR TISDK_VERSION"<br>
TISDK_VERSION="2013.05"<br>
MACHINES="am335x-evm am37x-evm am3517-evm am180x-evm omap5-evm keystone-evm beagleboard beaglebone pandaboard"<br>
NUM_ARM9_BUILDS="1"<br>
NUM_CORTEX_BUILDS="2"<br>
BUILD_ID="`date +build-%F_%H-%M-%S`"<br>
SCRIPTS_ROOT="$PWD"<br>
BUILD_ROOT="/home/jenkins/distroless-build"<br>
TEST_ROOT="$BUILD_ROOT/testing"<br>
PACKAGE_ROOT="$BUILD_ROOT/packaging"<br>
DEPLOY_ROOT="$BUILD_ROOT/deploy/$TISDK_VERSION"<br>
FS_FILTER="core-image-minimal-"<br>
FS_IMAGE_TYPE="tar.gz"<br>
NFS_ROOT="/home/jenkins/nfs-root"<br>
SOURCE_DIR="${BUILD_ROOT}/sources"<br>
CLEAN_BUILD="false"<br>
CLEAN_ALL="false"<br>
CONFIG_FILE="${BUILD_ROOT}/configs/distroless-meta-ti-config.txt"<br>
LOG_DIR="${BUILD_ROOT}/log-files"<br>
DL_DIR="/OE/downloads"<br>
INSTALLER_EXTRAS_ROOT="/home/jenkins/extra-files/installer_content"<br>
TEST_SCRIPTS="$SCRIPTS_ROOT/test-scripts"<br>
TEST_SCRIPTS_TGT="home/root/test-scripts"<br>
TEST_LOCAL_IFACE="eth1"<br>
OPENTEST_CLI="$SCRIPTS_ROOT/opentest_cli_0.7.tar.gz"<br>
OPENTEST_TEE_IP="10.218.102.142"<br>
RUN_BUILD_TESTS="true"<br>
STAF_ROOT="/usr/local/staf"<br>
SKIP_TEST_FAILURES="false"<br>
PRODUCTIZE_SDK="false"<br>
BITBAKE_COMMAND="core-image-minimal"<br>
RESULTS_CONFIG_COMMENTS="false"<br>
BACKUP_RESULTS="/home/jenkins/jobs/distroless-meta-ti-nightly/workspace"<br></p>

</div>

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 02/10] omap3-sgx-modules: 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 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@...>
---
 .../omap3-sgx-modules_4.09.00.01.bb                |    9 ++-------
 1 files changed, 2 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..923e6a5 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
 <at>  <at>  -39,9 +39,7  <at>  <at>  MODULESLOCATION_ti814x = "dc_ti81xx_linux"
 MODULESLOCATION_ti816x = "dc_ti81xx_linux"
 MODULESLOCATION_ti33x = "dc_ti335x_linux"

-export SUPPORT_XORG ?= "${ <at> 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
 <at>  <at>  -49,8 +47,5  <at>  <at>  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

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 07/10] libgles-omap3: Remove unnecessary inclusion of folders into package

Inclusion of all .so files is not necessary for the
package build.

Signed-off-by: Prabindh Sundareson <prabu@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 8e5dad6..4521d59 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -285,10 +285,6  <at>  <at>  INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
 INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
 INSANE_SKIP_${PN}-tests = "ldflags"

-# Quality control is really poor on these SDKs, so hack around the latest madness:
-FILES_${PN} += "${libdir}/*.so "
-FILES_${PN}-dev = "${includedir}"
-
 inherit update-rc.d

 INITSCRIPT_NAME = "pvr-init"
--

-- 
1.7.1

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 05/10] libgles-omap3: Remove copying of unused header files

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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 0c41d76..1704e1a 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -133,12 +133,9  <at>  <at>  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

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 03/10] libgles-omap3: Remove unsupported core build option ES2.0

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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |   27 +++++++---------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 31c5b8e..95cf166 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -28,7 +28,6  <at>  <at>  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"
 <at>  <at>  -150,24 +149,22  <at>  <at>  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

 	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/
 <at>  <at>  -196,16 +193,14  <at>  <at>  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"
 <at>  <at>  -218,35 +213,31  <at>  <at>  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

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 04/10] libgles-omap3: Remove OpenVG references

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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 95cf166..0c41d76 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -137,8 +137,6  <at>  <at>  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
 	
 <at>  <at>  -162,7 +160,7  <at>  <at>  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\}))
 <at>  <at>  -201,11 +199,10  <at>  <at>  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"
 FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
--

-- 
1.7.1

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 10/10] omap3-sgx-modules-x11: Separate X11 SGX driver package into new recipe

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@...>
---
 .../Compile-fixes-for-38-kernel.patch              |  346 ++++++++++++++++++++
 .../omap3-sgx-modules-x11/kernel-30.patch          |   38 +++
 .../omap3-sgx-modules-x11_4.09.00.01.bb            |   74 +++++
 3 files changed, 458 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
 <at>  <at>  -0,0 +1,346  <at>  <at> 
+---
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
+ <at>  <at>  -235,9 +235,20  <at>  <at>  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)
+ 	{
+ <at>  <at>  -1118,7 +1129,11  <at>  <at>  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)
+ 	{
+ <at>  <at>  -1254,7 +1269,11  <at>  <at>  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;
+ }
+ 
+ <at>  <at>  -1263,7 +1282,11  <at>  <at>  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;
+ 
+ <at>  <at>  -1274,7 +1297,11  <at>  <at>  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
+ <at>  <at>  -24,11 +24,14  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -24,15 +24,17  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -24,9 +24,13  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -27,11 +27,14  <at>  <at> 
+ #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
+ <at>  <at>  -24,11 +24,14  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -27,11 +27,13  <at>  <at> 
+ #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
+ <at>  <at>  -27,11 +27,14  <at>  <at> 
+ #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
+ <at>  <at>  -24,11 +24,14  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -24,13 +24,16  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -24,9 +24,13  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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)
+ 	
+ <at>  <at>  -44,7 +48,6  <at>  <at> 
+ #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
+ <at>  <at>  -24,11 +24,14  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -24,11 +24,14  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -26,14 +26,17  <at>  <at> 
+ 
+ #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
+ <at>  <at>  -24,10 +24,13  <at>  <at> 
+  *
+  ******************************************************************************/
+ 
++#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
+ <at>  <at>  -76,7 +76,8  <at>  <at>  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
 <at>  <at>  -0,0 +1,38  <at>  <at> 
+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@...>
+
+--- 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
+ <at>  <at>  -47,12 +47,12  <at>  <at> 
+ #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 
+ <at>  <at>  -64,7 +64,11  <at>  <at>  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..8493814
--- /dev/null
+++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
 <at>  <at>  -0,0 +1,74  <at>  <at> 
+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

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 09/10] libgles-omap3-x11: Separate X11 SGX driver package into new recipe

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@...>
---
 .../libgles/libgles-omap3-x11-4.09.00.01/rc.pvr    |  125 ++++++++
 .../libgles-omap3-x11-4.09.00.01/rc_dri.pvr        |  137 +++++++++
 recipes-graphics/libgles/libgles-omap3-x11.inc     |  323 ++++++++++++++++++++
 3 files changed, 585 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

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..590d06c
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc.pvr
 <at>  <at>  -0,0 +1,125  <at>  <at> 
+#!/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..bc44937
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11-4.09.00.01/rc_dri.pvr
 <at>  <at>  -0,0 +1,137  <at>  <at> 
+#!/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..d819b84
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-x11.inc
 <at>  <at>  -0,0 +1,323  <at>  <at> 
+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 = "x11"
+
+export SUPPORT_XORG ?= "1"
+PVR_INIT ?= "pvrsrvinit"
+
+PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
+
+RREPLACES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
+RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
+RREPLACES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
+
+RPROVIDES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
+RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
+RPROVIDES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
+
+RCONFLICTS_${PN} = "libegl libgles1 libgles2"
+RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
+RCONFLICTS_${PN}-dbg = "libegl-dbg libgles-omap3-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
+}
+
+
--

-- 
1.7.1

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 08/10] libgles-omap3: Package files with right permission

This patch adds the .so library files into the package, with correct
permissions for startup scripts.

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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 4521d59..5bb257d 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -139,6 +139,7  <at>  <at>  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
 <at>  <at>  -285,6 +286,8  <at>  <at>  INSANE_SKIP_${PN}-linuxfbwsegl-es6 = "ldflags"
 INSANE_SKIP_${PN}-linuxfbwsegl-es8 = "ldflags"
 INSANE_SKIP_${PN}-tests = "ldflags"

+FILES_${PN} += "${libdir}/*.so "
+FILES_${PN}-dev = "${includedir}"
 inherit update-rc.d

 INITSCRIPT_NAME = "pvr-init"
--

-- 
1.7.1

headers

Prabindh Sundareson | 17 May 2013 18:57

[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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc    |  330 ++++++++++++++++++++
 .../libgles/libgles-omap3_4.09.00.01.bb            |   45 +---
 2 files changed, 332 insertions(+), 43 deletions(-)
 create mode 100644 recipes-graphics/libgles/libgles-omap3-no-x.inc

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
new file mode 100644
index 0000000..31c5b8e
--- /dev/null
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -0,0 +1,330  <at>  <at> 
+DESCRIPTION = "libGLES for the omap3"
+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)"
+
+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.pvr \
+		   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 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"
+export ES8LOCATION ?= "${S}/gfx_rel_es8.x"
+
+LIBGLESWINDOWSYSTEM ?= "libpvrPVR2D_FRONTWSEGL.so.1"
+
+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}"
+
+	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=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
+
+		install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
+	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=0
+			rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
+
+			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}/
+	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 -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}/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
+	
+	install -d ${D}${sysconfdir}/init.d/
+	cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+
+	install -d ${D}${sysconfdir}
+	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
+
+	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
+		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 ; 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}${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
+	install -m 0755 ${S}/trainingcourses/raw/* ${D}${bindir}/SGX/trainingcourses/Raw/ 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}-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*/*"
+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"
+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}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl"
+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.*"
+
+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"
+
+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"
+
+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"
+
+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"
+
+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"
+
+CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
+
+FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
+
+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}-rawdemos = "${bindir}/SGX/demos/Raw/*"
+
+FILES_${PN}-rawtrainingcourses = "${bindir}/SGX/trainingcourses/Raw/*"
+
+# The libs need the kernel-modules
+RRECOMMENDS_${PN} += "omap3-sgx-modules"
+
+# 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}-rawdemos = "ldflags dev-so useless-rpaths"
+INSANE_SKIP_${PN}-blitwsegl = "ldflags"
+INSANE_SKIP_${PN}-blitwsegl-es3 = "ldflags"
+INSANE_SKIP_${PN}-blitwsegl-es5 = "ldflags"
+INSANE_SKIP_${PN}-blitwsegl-es6 = "ldflags"
+INSANE_SKIP_${PN}-blitwsegl-es8 = "ldflags"
+INSANE_SKIP_${PN}-flipwsegl = "ldflags"
+INSANE_SKIP_${PN}-flipwsegl-es3 = "ldflags"
+INSANE_SKIP_${PN}-flipwsegl-es5 = "ldflags"
+INSANE_SKIP_${PN}-flipwsegl-es6 = "ldflags"
+INSANE_SKIP_${PN}-flipwsegl-es8 = "ldflags"
+INSANE_SKIP_${PN}-frontwsegl = "ldflags"
+INSANE_SKIP_${PN}-frontwsegl-es3 = "ldflags"
+INSANE_SKIP_${PN}-frontwsegl-es5 = "ldflags"
+INSANE_SKIP_${PN}-frontwsegl-es6 = "ldflags"
+INSANE_SKIP_${PN}-frontwsegl-es8 = "ldflags"
+INSANE_SKIP_${PN}-linuxfbwsegl = "ldflags"
+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}-tests = "ldflags"
+
+# Quality control is really poor on these SDKs, so hack around the latest madness:
+FILES_${PN} += "${libdir}/*.so "
+FILES_${PN}-dev = "${includedir}"
+
+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
+
+}
+
+pkg_postinst_${PN}-blitwsegl() {
+rm -f $D${sysconfdir}/powervr-esrev
+}
+
+pkg_postinst_${PN}-flipwsegl() {
+rm -f $D${sysconfdir}/powervr-esrev
+}
+
+pkg_postinst_${PN}-frontwsegl() {
+rm -f $D${sysconfdir}/powervr-esrev
+}
+pkg_postinst_${PN}-linuxfbwsegl() {
+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..e767c37 100644
--- a/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
+++ b/recipes-graphics/libgles/libgles-omap3_4.09.00.01.bb
 <at>  <at>  -1,4 +1,4  <at>  <at> 
-require libgles-omap3.inc
+require libgles-omap3-no-x.inc

 LICENSE = "TSPA"

 <at>  <at>  -23,8 +23,6  <at>  <at>  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"
 <at>  <at>  -32,44 +30,5  <at>  <at>  SRC_URI[sha256sum] = "eb37f75ddde4640b09e760fa86e689beb394330ecdf68786188c34f249

 S = "${WORKDIR}/Graphics_SDK_${SGXPV}"

-LIBGLESWINDOWSYSTEM ?= "${ <at> 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/egltypes.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

headers

Prabindh Sundareson | 17 May 2013 18:57

[PATCH 06/10] libgles-omap3: Add missing RPROVIDES

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@...>
---
 recipes-graphics/libgles/libgles-omap3-no-x.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc
index 1704e1a..8e5dad6 100644
--- a/recipes-graphics/libgles/libgles-omap3-no-x.inc
+++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc
 <at>  <at>  -201,6 +201,8  <at>  <at>  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"
 FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
 FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
--

-- 
1.7.1

102	May 2013
142	April 2013
273	March 2013
165	February 2013
101	January 2013
21	December 2012
124	November 2012
171	October 2012
152	September 2012
85	August 2012
87	July 2012
75	June 2012
225	May 2012
103	April 2012
178	March 2012

Mon	Tue	Wed	Thu	Fri	Sat	Sun

		1	2	3	4	5
6	7	8	9	10	11	12
13	14	15	16	17	18	19
20	21	22	23	24	25	26
27	28	29	30	31