* [PATCH v2] libgles-omap3: Adjust for non X11 distros
@ 2012-10-10 4:23 Franklin S. Cooper Jr
2012-10-10 15:46 ` Maupin, Chase
0 siblings, 1 reply; 6+ messages in thread
From: Franklin S. Cooper Jr @ 2012-10-10 4:23 UTC (permalink / raw)
To: meta-ti
* Non X11 base distros are unable to build this Graphics SDK.
* This patch tweaks the libgles-omap3 include file to always build the
Graphics SDK in Raw mode and also build in X11 mode only if X11 is
apart of the DISTRO_FEATURE.
* Create a new variable PVR_INIT that is by default set to pvrsrvinit. This is
needed for newer version of the Graphics SDK that replaced this file.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
Version 2 changes:
Added PVR_INIT variable.
Made changes to only build and package X11 components if a X11 based distro is
used. Raw mode components are always built and packaged even for X11 based
distros.
recipes-graphics/libgles/libgles-omap3.inc | 208 +++++++++++++++----------
recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
2 files changed, 135 insertions(+), 80 deletions(-)
diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 4525285..523aa52 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
# 'TSPA.txt' might not be the best file to md5sum
LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
-PR = "r32"
+PR = "r33"
COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
-DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
+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"
@@ -31,11 +35,13 @@ 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
+ 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
@@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
PLATFORM ?= "LinuxOMAP3"
do_compile() {
- export X11ROOT="${STAGING_DIR_HOST}/usr"
export TOOLCHAIN="${TOOLCHAIN_PATH}"
-
export PLAT_CC="${CC}"
export PLAT_CPP="${CXX}"
export PLAR_AR="${AR}"
- mkdir -p ${S}/demos/raw
- mkdir -p ${S}/demos/x11
-
- # Rebuild demos for both Raw and X11
- for X11BUILD in 0 1 ; do
- 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
- 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
- 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=$X11BUILD
- 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
- install -m 0755 $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw || true
- done
- done
-
- mkdir -p ${S}/trainingcourses/raw
- mkdir -p ${S}/trainingcourses/x11
+ 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=$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
+ done
find ${S} -name "*_org" -delete
- # Build OGLES2 Trainingcourses for both Raw and X11
- for X11BUILD in 0 1 ; do
- 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=$X11BUILD
- rm -f $training/OGLES2/Build/${PLATFORM}/Release*/*.o
- install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/trainingcourses/x11 || true
- install -m 0755 $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/trainingcourses/raw || true
- done
- done
+ # 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
+ 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
+
+ oe_runmake Common=1 PLATFORM=${PLATFORM} X11BUILD=$X11BUILD
+ 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
+ done
}
@@ -133,12 +169,14 @@ do_install () {
install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
- install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
-
- install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
+ install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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}/lib/*X11WS* ${D}${libdir} || true
+ 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}/lib/*X11WS* ${D}${libdir} || true
+ fi
install -d ${D}${includedir}
cp -pPR ${S}/GFX_Linux_KM/include4 ${D}${includedir}/
@@ -158,7 +196,7 @@ do_install () {
install -d ${D}${sysconfdir}
echo "[default]" > ${D}${sysconfdir}/powervr.ini
- echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >> ${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
@@ -174,11 +212,15 @@ do_install () {
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"
+ 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 eglinfo eglinfo_x gles1test1 gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest xovg_unit_test ; do
+ for esprog in $shared_prog $raw_prog ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
install -m 0755 ${ESLOCATION}/$esprog ${D}${bindir}/ES${esrev}.0/ || true
done
fi
@@ -190,15 +232,19 @@ do_install () {
cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
rm ${D}${prefix}/share/applications/sample.desktop
- install -d ${D}${bindir}/SGX/demos/X11/
- install -d ${D}${bindir}/SGX/demos/Raw/
- install -m 0755 ${S}/demos/x11/* ${D}${bindir}/SGX/demos/X11/
- install -m 0755 ${S}/demos/raw/* ${D}${bindir}/SGX/demos/Raw/
+ 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
+ install -m 0755 ${S}/trainingcourses/x11/* ${D}${bindir}/SGX/trainingcourses/X11/
+ 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
+ install -m 0755 ${S}/trainingcourses/raw/* ${D}${bindir}/SGX/trainingcourses/Raw/
- install -d ${D}${bindir}/SGX/trainingcourses/Raw
- install -d ${D}${bindir}/SGX/trainingcourses/X11
- install -m 0755 ${S}/trainingcourses/x11/* ${D}${bindir}/SGX/trainingcourses/X11/
- install -m 0755 ${S}/trainingcourses/raw/* ${D}${bindir}/SGX/trainingcourses/Raw/
# Delete objects and linker scripts hidden between the headers
find ${D} -name "*.o" -delete
@@ -209,15 +255,8 @@ do_install () {
}
-PACKAGES =+ "${PN}-rawdemos \
- ${PN}-x11demos \
- ${PN}-rawtrainingcourses \
- ${PN}-x11trainingcourses \
-"
-
-PACKAGES += "xserver-kdrive-powervrsgx \
- ${PN}-tests "
-
+PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"", d)} \
+ ${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"
@@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so li
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 ${PN}-x11wsegl ${PN}-driwsegl"
+
+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.*"
@@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
@@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
-FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
+FILES_${PN} = "${sysconfdir} ${libdir}/*.so* ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
FILES_${PN}-tests = "${bindir}/*test*"
@@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
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
+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() {
diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr b/recipes-graphics/libgles/libgles-omap3/rc.pvr
index 00cd994..e5a4cd1 100755
--- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
+++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
@@ -42,6 +42,13 @@ 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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] libgles-omap3: Adjust for non X11 distros
2012-10-10 4:23 [PATCH v2] libgles-omap3: Adjust for non X11 distros Franklin S. Cooper Jr
@ 2012-10-10 15:46 ` Maupin, Chase
2012-10-10 16:18 ` Cooper Jr., Franklin
0 siblings, 1 reply; 6+ messages in thread
From: Maupin, Chase @ 2012-10-10 15:46 UTC (permalink / raw)
To: Franklin S. Cooper Jr, meta-ti
> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Franklin S. Cooper Jr
> Sent: Tuesday, October 09, 2012 11:23 PM
> To: meta-ti@yoctoproject.org
> Subject: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> distros
>
> * Non X11 base distros are unable to build this Graphics SDK.
> * This patch tweaks the libgles-omap3 include file to always
> build the
> Graphics SDK in Raw mode and also build in X11 mode only if X11
> is
> apart of the DISTRO_FEATURE.
Apart => a part
> * Create a new variable PVR_INIT that is by default set to
> pvrsrvinit. This is
> needed for newer version of the Graphics SDK that replaced this
> file.
>
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
> Version 2 changes:
> Added PVR_INIT variable.
> Made changes to only build and package X11 components if a X11
> based distro is
> used. Raw mode components are always built and packaged even for
> X11 based
> distros.
>
> recipes-graphics/libgles/libgles-omap3.inc | 208
> +++++++++++++++----------
> recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
> 2 files changed, 135 insertions(+), 80 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> b/recipes-graphics/libgles/libgles-omap3.inc
> index 4525285..523aa52 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
> # 'TSPA.txt' might not be the best file to md5sum
> LIC_FILES_CHKSUM =
> "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
>
> -PR = "r32"
> +PR = "r33"
>
> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
>
> -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> +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"
>
> @@ -31,11 +35,13 @@ 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"
> +
Why not set this like your line from your other patches
LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES', 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
> 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
> + done
What is the diff here? Whitespace?
>
> # 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
> @@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
> PLATFORM ?= "LinuxOMAP3"
>
> do_compile() {
> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> export TOOLCHAIN="${TOOLCHAIN_PATH}"
> -
> export PLAT_CC="${CC}"
> export PLAT_CPP="${CXX}"
> export PLAR_AR="${AR}"
>
> - mkdir -p ${S}/demos/raw
> - mkdir -p ${S}/demos/x11
> -
> - # Rebuild demos for both Raw and X11
> - for X11BUILD in 0 1 ; do
> - 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
> - 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
> - 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=$X11BUILD
> - 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
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> true
> - done
> - done
> -
> - mkdir -p ${S}/trainingcourses/raw
> - mkdir -p ${S}/trainingcourses/x11
> + 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=$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
In the case that you are now only building X11 if it is a supported feature then shouldn't you care about the return value of this copy? Should we expect the build to fail if the demos are not built?
> + 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
Same comment as above
> + 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
Why rm -f here but not in the similar line in the previous loop?
> +
> + if [ $X11BUILD -eq 1 ]
> + then
> + install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> true
Same comment as above
> + 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
Same comment as above
Also, just a thought and this could likely be put into a future enhancement but these loops are similar enough that you should be able to abstract this to a function that can take the OGLES version (OGLES or OGLES2) and set the directories based on X11BUILD to remove duplicate code.
> + fi
> + done
> + done
>
> find ${S} -name "*_org" -delete
>
> - # Build OGLES2 Trainingcourses for both Raw and X11
> - for X11BUILD in 0 1 ; do
> - 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=$X11BUILD
> - rm -f
> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> ${S}/trainingcourses/x11 || true
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> - done
> - done
> + # 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
> + 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
> +
> + oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> + 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
Same comments about the || true statements as above.
> + done
> + done
>
> }
>
> @@ -133,12 +169,14 @@ do_install () {
>
> install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> - install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
> -
> - install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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
> + 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}/
> @@ -158,7 +196,7 @@ do_install () {
>
> install -d ${D}${sysconfdir}
> echo "[default]" > ${D}${sysconfdir}/powervr.ini
> - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >>
> ${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
>
> @@ -174,11 +212,15 @@ do_install () {
> 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"
> + 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 eglinfo eglinfo_x gles1test1
> gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test
> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest
> xovg_unit_test ; do
> + for esprog in $shared_prog $raw_prog
> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> install -m 0755 ${ESLOCATION}/$esprog
> ${D}${bindir}/ES${esrev}.0/ || true
> done
> fi
> @@ -190,15 +232,19 @@ do_install () {
> cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> rm ${D}${prefix}/share/applications/sample.desktop
>
> - install -d ${D}${bindir}/SGX/demos/X11/
> - install -d ${D}${bindir}/SGX/demos/Raw/
> - install -m 0755 ${S}/demos/x11/*
> ${D}${bindir}/SGX/demos/X11/
> - install -m 0755 ${S}/demos/raw/*
> ${D}${bindir}/SGX/demos/Raw/
> + 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
> + install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/
> + 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
> + install -m 0755 ${S}/trainingcourses/raw/*
> ${D}${bindir}/SGX/trainingcourses/Raw/
>
> - install -d ${D}${bindir}/SGX/trainingcourses/Raw
> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> - install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/
> - install -m 0755 ${S}/trainingcourses/raw/*
> ${D}${bindir}/SGX/trainingcourses/Raw/
>
> # Delete objects and linker scripts hidden between the
> headers
> find ${D} -name "*.o" -delete
> @@ -209,15 +255,8 @@ do_install () {
>
> }
>
> -PACKAGES =+ "${PN}-rawdemos \
> - ${PN}-x11demos \
> - ${PN}-rawtrainingcourses \
> - ${PN}-x11trainingcourses \
> -"
> -
> -PACKAGES += "xserver-kdrive-powervrsgx \
> - ${PN}-tests "
> -
> +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> d)} \
> + ${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"
> @@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so
> libIMGegl.so libsrv_um.so libOpenVG.so li
> 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 ${PN}-x11wsegl ${PN}-driwsegl"
> +
> +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.*"
> @@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
> @@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-
> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
>
> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
>
> -FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
> +FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
>
> FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> FILES_${PN}-tests = "${bindir}/*test*"
> @@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> 0 1 6 ."
> 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
> +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() {
> diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> index 00cd994..e5a4cd1 100755
> --- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> +++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> @@ -42,6 +42,13 @@ 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
> +
Why is this fix here? Doesn't seem related and could be it's own patch.
> modprobe omaplfb
> modprobe bufferclass_ti
>
> --
> 1.7.0.4
>
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] libgles-omap3: Adjust for non X11 distros
2012-10-10 15:46 ` Maupin, Chase
@ 2012-10-10 16:18 ` Cooper Jr., Franklin
2012-11-13 1:47 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Cooper Jr., Franklin @ 2012-10-10 16:18 UTC (permalink / raw)
To: Maupin, Chase, Franklin S. Cooper Jr, meta-ti
See inline.
Chase,
Several of your comments aren't related to my actually changes. I would say almost all of my tweaks is simply moving things around and placing X11 statements within if statements. Everything else is replacing hard coded values with variables. Your points are still valid but this patch isn't the place to address it.
________________________________________
From: meta-ti-bounces@yoctoproject.org [meta-ti-bounces@yoctoproject.org] on behalf of Maupin, Chase
Sent: Wednesday, October 10, 2012 10:46 AM
To: Franklin S. Cooper Jr; meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11 distros
> -----Original Message-----
> From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> bounces@yoctoproject.org] On Behalf Of Franklin S. Cooper Jr
> Sent: Tuesday, October 09, 2012 11:23 PM
> To: meta-ti@yoctoproject.org
> Subject: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> distros
>
> * Non X11 base distros are unable to build this Graphics SDK.
> * This patch tweaks the libgles-omap3 include file to always
> build the
> Graphics SDK in Raw mode and also build in X11 mode only if X11
> is
> apart of the DISTRO_FEATURE.
Apart => a part
> * Create a new variable PVR_INIT that is by default set to
> pvrsrvinit. This is
> needed for newer version of the Graphics SDK that replaced this
> file.
>
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
> Version 2 changes:
> Added PVR_INIT variable.
> Made changes to only build and package X11 components if a X11
> based distro is
> used. Raw mode components are always built and packaged even for
> X11 based
> distros.
>
> recipes-graphics/libgles/libgles-omap3.inc | 208
> +++++++++++++++----------
> recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
> 2 files changed, 135 insertions(+), 80 deletions(-)
>
> diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> b/recipes-graphics/libgles/libgles-omap3.inc
> index 4525285..523aa52 100644
> --- a/recipes-graphics/libgles/libgles-omap3.inc
> +++ b/recipes-graphics/libgles/libgles-omap3.inc
> @@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
> # 'TSPA.txt' might not be the best file to md5sum
> LIC_FILES_CHKSUM =
> "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
>
> -PR = "r32"
> +PR = "r33"
>
> COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
>
> -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> +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"
>
> @@ -31,11 +35,13 @@ 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"
> +
Why not set this like your line from your other patches
LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES', 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
Franklin: Because this will change the default behavior for the current libgles-omap3 recipes which might break things for X11 users. This recipe was simple meant to tweak the settings of this inc to prepare for my newer Graphics SDK patches but it shouldn't modify anything for users using the older Graphics SDK.
> 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
> + done
What is the diff here? Whitespace?
Franklin: Most likely.
>
> # 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
> @@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
> PLATFORM ?= "LinuxOMAP3"
>
> do_compile() {
> - export X11ROOT="${STAGING_DIR_HOST}/usr"
> export TOOLCHAIN="${TOOLCHAIN_PATH}"
> -
> export PLAT_CC="${CC}"
> export PLAT_CPP="${CXX}"
> export PLAR_AR="${AR}"
>
> - mkdir -p ${S}/demos/raw
> - mkdir -p ${S}/demos/x11
> -
> - # Rebuild demos for both Raw and X11
> - for X11BUILD in 0 1 ; do
> - 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
> - 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
> - 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=$X11BUILD
> - 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
> - install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> true
> - done
> - done
> -
> - mkdir -p ${S}/trainingcourses/raw
> - mkdir -p ${S}/trainingcourses/x11
> + 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=$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
In the case that you are now only building X11 if it is a supported feature then shouldn't you care about the return value of this copy? Should we expect the build to fail if the demos are not built?
Franklin: I think some of this "|| true" lines are due to differences between 4.03.00.02.bb vs 4.05.00.03.bb. Files typically get moved between Graphics SDK releases so lines like that are needed since this inc supports multiple Graphics SDK versions.
> + 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
Same comment as above
> + 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
Why rm -f here but not in the similar line in the previous loop?
> +
> + if [ $X11BUILD -eq 1 ]
> + then
> + install -m 0755
> $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> true
Same comment as above
> + 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
Same comment as above
Also, just a thought and this could likely be put into a future enhancement but these loops are similar enough that you should be able to abstract this to a function that can take the OGLES version (OGLES or OGLES2) and set the directories based on X11BUILD to remove duplicate code.
> + fi
> + done
> + done
>
> find ${S} -name "*_org" -delete
>
> - # Build OGLES2 Trainingcourses for both Raw and X11
> - for X11BUILD in 0 1 ; do
> - 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=$X11BUILD
> - rm -f
> $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> ${S}/trainingcourses/x11 || true
> - install -m 0755
> $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> ${S}/trainingcourses/raw || true
> - done
> - done
> + # 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
> + 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
> +
> + oe_runmake Common=1 PLATFORM=${PLATFORM}
> X11BUILD=$X11BUILD
> + 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
Same comments about the || true statements as above.
> + done
> + done
>
> }
>
> @@ -133,12 +169,14 @@ do_install () {
>
> install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> - install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
> -
> - install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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
> + 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}/
> @@ -158,7 +196,7 @@ do_install () {
>
> install -d ${D}${sysconfdir}
> echo "[default]" > ${D}${sysconfdir}/powervr.ini
> - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >>
> ${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
>
> @@ -174,11 +212,15 @@ do_install () {
> 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"
> + 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 eglinfo eglinfo_x gles1test1
> gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test
> sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest
> xovg_unit_test ; do
> + for esprog in $shared_prog $raw_prog
> ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> install -m 0755 ${ESLOCATION}/$esprog
> ${D}${bindir}/ES${esrev}.0/ || true
> done
> fi
> @@ -190,15 +232,19 @@ do_install () {
> cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> rm ${D}${prefix}/share/applications/sample.desktop
>
> - install -d ${D}${bindir}/SGX/demos/X11/
> - install -d ${D}${bindir}/SGX/demos/Raw/
> - install -m 0755 ${S}/demos/x11/*
> ${D}${bindir}/SGX/demos/X11/
> - install -m 0755 ${S}/demos/raw/*
> ${D}${bindir}/SGX/demos/Raw/
> + 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
> + install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/
> + 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
> + install -m 0755 ${S}/trainingcourses/raw/*
> ${D}${bindir}/SGX/trainingcourses/Raw/
>
> - install -d ${D}${bindir}/SGX/trainingcourses/Raw
> - install -d ${D}${bindir}/SGX/trainingcourses/X11
> - install -m 0755 ${S}/trainingcourses/x11/*
> ${D}${bindir}/SGX/trainingcourses/X11/
> - install -m 0755 ${S}/trainingcourses/raw/*
> ${D}${bindir}/SGX/trainingcourses/Raw/
>
> # Delete objects and linker scripts hidden between the
> headers
> find ${D} -name "*.o" -delete
> @@ -209,15 +255,8 @@ do_install () {
>
> }
>
> -PACKAGES =+ "${PN}-rawdemos \
> - ${PN}-x11demos \
> - ${PN}-rawtrainingcourses \
> - ${PN}-x11trainingcourses \
> -"
> -
> -PACKAGES += "xserver-kdrive-powervrsgx \
> - ${PN}-tests "
> -
> +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> d)} \
> + ${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"
> @@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so
> libIMGegl.so libsrv_um.so libOpenVG.so li
> 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 ${PN}-x11wsegl ${PN}-driwsegl"
> +
> +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.*"
> @@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
> @@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-
> driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
>
> CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
>
> -FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
> +FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
>
> FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> FILES_${PN}-tests = "${bindir}/*test*"
> @@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> 0 1 6 ."
> 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
> +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() {
> diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> index 00cd994..e5a4cd1 100755
> --- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> +++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> @@ -42,6 +42,13 @@ 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
> +
Why is this fix here? Doesn't seem related and could be it's own patch.
> modprobe omaplfb
> modprobe bufferclass_ti
>
> --
> 1.7.0.4
>
> _______________________________________________
> 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] 6+ messages in thread
* Re: [PATCH v2] libgles-omap3: Adjust for non X11 distros
2012-10-10 16:18 ` Cooper Jr., Franklin
@ 2012-11-13 1:47 ` Denys Dmytriyenko
2012-11-13 1:52 ` Cooper Jr., Franklin
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2012-11-13 1:47 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-ti
Franklin,
Have you submitted the version that does X11+FB when x11 is enabled and FB
only when not?
Denys
On Wed, Oct 10, 2012 at 04:18:42PM +0000, Cooper Jr., Franklin wrote:
> See inline.
>
> Chase,
>
> Several of your comments aren't related to my actually changes. I would say almost all of my tweaks is simply moving things around and placing X11 statements within if statements. Everything else is replacing hard coded values with variables. Your points are still valid but this patch isn't the place to address it.
> ________________________________________
> From: meta-ti-bounces@yoctoproject.org [meta-ti-bounces@yoctoproject.org] on behalf of Maupin, Chase
> Sent: Wednesday, October 10, 2012 10:46 AM
> To: Franklin S. Cooper Jr; meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11 distros
>
> > -----Original Message-----
> > From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > bounces@yoctoproject.org] On Behalf Of Franklin S. Cooper Jr
> > Sent: Tuesday, October 09, 2012 11:23 PM
> > To: meta-ti@yoctoproject.org
> > Subject: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> > distros
> >
> > * Non X11 base distros are unable to build this Graphics SDK.
> > * This patch tweaks the libgles-omap3 include file to always
> > build the
> > Graphics SDK in Raw mode and also build in X11 mode only if X11
> > is
> > apart of the DISTRO_FEATURE.
>
> Apart => a part
>
> > * Create a new variable PVR_INIT that is by default set to
> > pvrsrvinit. This is
> > needed for newer version of the Graphics SDK that replaced this
> > file.
> >
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> > Version 2 changes:
> > Added PVR_INIT variable.
> > Made changes to only build and package X11 components if a X11
> > based distro is
> > used. Raw mode components are always built and packaged even for
> > X11 based
> > distros.
> >
> > recipes-graphics/libgles/libgles-omap3.inc | 208
> > +++++++++++++++----------
> > recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
> > 2 files changed, 135 insertions(+), 80 deletions(-)
> >
> > diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > b/recipes-graphics/libgles/libgles-omap3.inc
> > index 4525285..523aa52 100644
> > --- a/recipes-graphics/libgles/libgles-omap3.inc
> > +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > @@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
> > # 'TSPA.txt' might not be the best file to md5sum
> > LIC_FILES_CHKSUM =
> > "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
> >
> > -PR = "r32"
> > +PR = "r33"
> >
> > COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> >
> > -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > +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"
> >
> > @@ -31,11 +35,13 @@ 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"
> > +
>
> Why not set this like your line from your other patches
>
> LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES', 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
>
> Franklin: Because this will change the default behavior for the current libgles-omap3 recipes which might break things for X11 users. This recipe was simple meant to tweak the settings of this inc to prepare for my newer Graphics SDK patches but it shouldn't modify anything for users using the older Graphics SDK.
>
> > 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
> > + done
>
> What is the diff here? Whitespace?
>
> Franklin: Most likely.
>
> >
> > # 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
> > @@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
> > PLATFORM ?= "LinuxOMAP3"
> >
> > do_compile() {
> > - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > export TOOLCHAIN="${TOOLCHAIN_PATH}"
> > -
> > export PLAT_CC="${CC}"
> > export PLAT_CPP="${CXX}"
> > export PLAR_AR="${AR}"
> >
> > - mkdir -p ${S}/demos/raw
> > - mkdir -p ${S}/demos/x11
> > -
> > - # Rebuild demos for both Raw and X11
> > - for X11BUILD in 0 1 ; do
> > - 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
> > - 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
> > - 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=$X11BUILD
> > - 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
> > - install -m 0755
> > $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > true
> > - done
> > - done
> > -
> > - mkdir -p ${S}/trainingcourses/raw
> > - mkdir -p ${S}/trainingcourses/x11
> > + 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=$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
>
> In the case that you are now only building X11 if it is a supported feature then shouldn't you care about the return value of this copy? Should we expect the build to fail if the demos are not built?
>
> Franklin: I think some of this "|| true" lines are due to differences between 4.03.00.02.bb vs 4.05.00.03.bb. Files typically get moved between Graphics SDK releases so lines like that are needed since this inc supports multiple Graphics SDK versions.
>
> > + 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
>
> Same comment as above
>
> > + 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
>
> Why rm -f here but not in the similar line in the previous loop?
>
> > +
> > + if [ $X11BUILD -eq 1 ]
> > + then
> > + install -m 0755
> > $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > true
>
> Same comment as above
>
> > + 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
>
> Same comment as above
>
> Also, just a thought and this could likely be put into a future enhancement but these loops are similar enough that you should be able to abstract this to a function that can take the OGLES version (OGLES or OGLES2) and set the directories based on X11BUILD to remove duplicate code.
>
> > + fi
> > + done
> > + done
> >
> > find ${S} -name "*_org" -delete
> >
> > - # Build OGLES2 Trainingcourses for both Raw and X11
> > - for X11BUILD in 0 1 ; do
> > - 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=$X11BUILD
> > - rm -f
> > $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > - install -m 0755
> > $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > ${S}/trainingcourses/x11 || true
> > - install -m 0755
> > $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > ${S}/trainingcourses/raw || true
> > - done
> > - done
> > + # 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
> > + 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
> > +
> > + oe_runmake Common=1 PLATFORM=${PLATFORM}
> > X11BUILD=$X11BUILD
> > + 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
>
> Same comments about the || true statements as above.
>
> > + done
> > + done
> >
> > }
> >
> > @@ -133,12 +169,14 @@ do_install () {
> >
> > install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> > install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > - install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
> > -
> > - install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> > + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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
> > + 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}/
> > @@ -158,7 +196,7 @@ do_install () {
> >
> > install -d ${D}${sysconfdir}
> > echo "[default]" > ${D}${sysconfdir}/powervr.ini
> > - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >>
> > ${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
> >
> > @@ -174,11 +212,15 @@ do_install () {
> > 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"
> > + 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 eglinfo eglinfo_x gles1test1
> > gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test
> > sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest
> > xovg_unit_test ; do
> > + for esprog in $shared_prog $raw_prog
> > ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> > install -m 0755 ${ESLOCATION}/$esprog
> > ${D}${bindir}/ES${esrev}.0/ || true
> > done
> > fi
> > @@ -190,15 +232,19 @@ do_install () {
> > cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > rm ${D}${prefix}/share/applications/sample.desktop
> >
> > - install -d ${D}${bindir}/SGX/demos/X11/
> > - install -d ${D}${bindir}/SGX/demos/Raw/
> > - install -m 0755 ${S}/demos/x11/*
> > ${D}${bindir}/SGX/demos/X11/
> > - install -m 0755 ${S}/demos/raw/*
> > ${D}${bindir}/SGX/demos/Raw/
> > + 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
> > + install -m 0755 ${S}/trainingcourses/x11/*
> > ${D}${bindir}/SGX/trainingcourses/X11/
> > + 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
> > + install -m 0755 ${S}/trainingcourses/raw/*
> > ${D}${bindir}/SGX/trainingcourses/Raw/
> >
> > - install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > - install -m 0755 ${S}/trainingcourses/x11/*
> > ${D}${bindir}/SGX/trainingcourses/X11/
> > - install -m 0755 ${S}/trainingcourses/raw/*
> > ${D}${bindir}/SGX/trainingcourses/Raw/
> >
> > # Delete objects and linker scripts hidden between the
> > headers
> > find ${D} -name "*.o" -delete
> > @@ -209,15 +255,8 @@ do_install () {
> >
> > }
> >
> > -PACKAGES =+ "${PN}-rawdemos \
> > - ${PN}-x11demos \
> > - ${PN}-rawtrainingcourses \
> > - ${PN}-x11trainingcourses \
> > -"
> > -
> > -PACKAGES += "xserver-kdrive-powervrsgx \
> > - ${PN}-tests "
> > -
> > +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> > d)} \
> > + ${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"
> > @@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so
> > libIMGegl.so libsrv_um.so libOpenVG.so li
> > 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 ${PN}-x11wsegl ${PN}-driwsegl"
> > +
> > +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.*"
> > @@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
> > @@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-
> > driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
> >
> > CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> >
> > -FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
> > +FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
> >
> > FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > FILES_${PN}-tests = "${bindir}/*test*"
> > @@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > 0 1 6 ."
> > 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
> > +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() {
> > diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > index 00cd994..e5a4cd1 100755
> > --- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > +++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > @@ -42,6 +42,13 @@ 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
> > +
>
> Why is this fix here? Doesn't seem related and could be it's own patch.
>
> > modprobe omaplfb
> > modprobe bufferclass_ti
> >
> > --
> > 1.7.0.4
> >
> > _______________________________________________
> > 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] 6+ messages in thread
* Re: [PATCH v2] libgles-omap3: Adjust for non X11 distros
2012-11-13 1:47 ` Denys Dmytriyenko
@ 2012-11-13 1:52 ` Cooper Jr., Franklin
2012-11-13 1:59 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Cooper Jr., Franklin @ 2012-11-13 1:52 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-ti
That is what this version of the patch addressed.
I need to send a v3 that addressed some of the comments from this thread.
-----Original Message-----
From: Dmytriyenko, Denys
Sent: Monday, November 12, 2012 7:48 PM
To: Cooper Jr., Franklin
Cc: Maupin, Chase; Franklin S. Cooper Jr; meta-ti@yoctoproject.org
Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11 distros
Franklin,
Have you submitted the version that does X11+FB when x11 is enabled and FB only when not?
Denys
On Wed, Oct 10, 2012 at 04:18:42PM +0000, Cooper Jr., Franklin wrote:
> See inline.
>
> Chase,
>
> Several of your comments aren't related to my actually changes. I would say almost all of my tweaks is simply moving things around and placing X11 statements within if statements. Everything else is replacing hard coded values with variables. Your points are still valid but this patch isn't the place to address it.
> ________________________________________
> From: meta-ti-bounces@yoctoproject.org
> [meta-ti-bounces@yoctoproject.org] on behalf of Maupin, Chase
> Sent: Wednesday, October 10, 2012 10:46 AM
> To: Franklin S. Cooper Jr; meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> distros
>
> > -----Original Message-----
> > From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > bounces@yoctoproject.org] On Behalf Of Franklin S. Cooper Jr
> > Sent: Tuesday, October 09, 2012 11:23 PM
> > To: meta-ti@yoctoproject.org
> > Subject: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> > distros
> >
> > * Non X11 base distros are unable to build this Graphics SDK.
> > * This patch tweaks the libgles-omap3 include file to always build
> > the
> > Graphics SDK in Raw mode and also build in X11 mode only if X11 is
> > apart of the DISTRO_FEATURE.
>
> Apart => a part
>
> > * Create a new variable PVR_INIT that is by default set to
> > pvrsrvinit. This is
> > needed for newer version of the Graphics SDK that replaced this
> > file.
> >
> > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > ---
> > Version 2 changes:
> > Added PVR_INIT variable.
> > Made changes to only build and package X11 components if a X11 based
> > distro is used. Raw mode components are always built and packaged
> > even for
> > X11 based
> > distros.
> >
> > recipes-graphics/libgles/libgles-omap3.inc | 208
> > +++++++++++++++----------
> > recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
> > 2 files changed, 135 insertions(+), 80 deletions(-)
> >
> > diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > b/recipes-graphics/libgles/libgles-omap3.inc
> > index 4525285..523aa52 100644
> > --- a/recipes-graphics/libgles/libgles-omap3.inc
> > +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > @@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
> > # 'TSPA.txt' might not be the best file to md5sum LIC_FILES_CHKSUM
> > = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
> >
> > -PR = "r32"
> > +PR = "r33"
> >
> > COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> >
> > -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > +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"
> >
> > @@ -31,11 +35,13 @@ 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"
> > +
>
> Why not set this like your line from your other patches
>
> LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES', 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
>
> Franklin: Because this will change the default behavior for the current libgles-omap3 recipes which might break things for X11 users. This recipe was simple meant to tweak the settings of this inc to prepare for my newer Graphics SDK patches but it shouldn't modify anything for users using the older Graphics SDK.
>
> > 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
> > + done
>
> What is the diff here? Whitespace?
>
> Franklin: Most likely.
>
> >
> > # 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
> > @@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
> > PLATFORM ?= "LinuxOMAP3"
> >
> > do_compile() {
> > - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > export TOOLCHAIN="${TOOLCHAIN_PATH}"
> > -
> > export PLAT_CC="${CC}"
> > export PLAT_CPP="${CXX}"
> > export PLAR_AR="${AR}"
> >
> > - mkdir -p ${S}/demos/raw
> > - mkdir -p ${S}/demos/x11
> > -
> > - # Rebuild demos for both Raw and X11
> > - for X11BUILD in 0 1 ; do
> > - 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
> > - 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
> > - 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=$X11BUILD
> > - 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
> > - install -m 0755
> > $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > true
> > - done
> > - done
> > -
> > - mkdir -p ${S}/trainingcourses/raw
> > - mkdir -p ${S}/trainingcourses/x11
> > + 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=$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
>
> In the case that you are now only building X11 if it is a supported feature then shouldn't you care about the return value of this copy? Should we expect the build to fail if the demos are not built?
>
> Franklin: I think some of this "|| true" lines are due to differences between 4.03.00.02.bb vs 4.05.00.03.bb. Files typically get moved between Graphics SDK releases so lines like that are needed since this inc supports multiple Graphics SDK versions.
>
> > + 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
>
> Same comment as above
>
> > + 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
>
> Why rm -f here but not in the similar line in the previous loop?
>
> > +
> > + if [ $X11BUILD -eq 1 ]
> > + then
> > + install -m 0755
> > $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > true
>
> Same comment as above
>
> > + 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
>
> Same comment as above
>
> Also, just a thought and this could likely be put into a future enhancement but these loops are similar enough that you should be able to abstract this to a function that can take the OGLES version (OGLES or OGLES2) and set the directories based on X11BUILD to remove duplicate code.
>
> > + fi
> > + done
> > + done
> >
> > find ${S} -name "*_org" -delete
> >
> > - # Build OGLES2 Trainingcourses for both Raw and X11
> > - for X11BUILD in 0 1 ; do
> > - 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=$X11BUILD
> > - rm -f
> > $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > - install -m 0755
> > $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > ${S}/trainingcourses/x11 || true
> > - install -m 0755
> > $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > ${S}/trainingcourses/raw || true
> > - done
> > - done
> > + # 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
> > + 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
> > +
> > + oe_runmake Common=1 PLATFORM=${PLATFORM}
> > X11BUILD=$X11BUILD
> > + 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
>
> Same comments about the || true statements as above.
>
> > + done
> > + done
> >
> > }
> >
> > @@ -133,12 +169,14 @@ do_install () {
> >
> > install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> > install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > - install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
> > -
> > - install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> > + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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
> > + 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}/
> > @@ -158,7 +196,7 @@ do_install () {
> >
> > install -d ${D}${sysconfdir}
> > echo "[default]" > ${D}${sysconfdir}/powervr.ini
> > - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >>
> > ${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
> >
> > @@ -174,11 +212,15 @@ do_install () {
> > 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"
> > + 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 eglinfo eglinfo_x gles1test1
> > gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test
> > sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest
> > xovg_unit_test ; do
> > + for esprog in $shared_prog $raw_prog
> > ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> > install -m 0755 ${ESLOCATION}/$esprog
> > ${D}${bindir}/ES${esrev}.0/ || true
> > done
> > fi
> > @@ -190,15 +232,19 @@ do_install () {
> > cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > rm ${D}${prefix}/share/applications/sample.desktop
> >
> > - install -d ${D}${bindir}/SGX/demos/X11/
> > - install -d ${D}${bindir}/SGX/demos/Raw/
> > - install -m 0755 ${S}/demos/x11/*
> > ${D}${bindir}/SGX/demos/X11/
> > - install -m 0755 ${S}/demos/raw/*
> > ${D}${bindir}/SGX/demos/Raw/
> > + 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
> > + install -m 0755 ${S}/trainingcourses/x11/*
> > ${D}${bindir}/SGX/trainingcourses/X11/
> > + 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
> > + install -m 0755 ${S}/trainingcourses/raw/*
> > ${D}${bindir}/SGX/trainingcourses/Raw/
> >
> > - install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > - install -m 0755 ${S}/trainingcourses/x11/*
> > ${D}${bindir}/SGX/trainingcourses/X11/
> > - install -m 0755 ${S}/trainingcourses/raw/*
> > ${D}${bindir}/SGX/trainingcourses/Raw/
> >
> > # Delete objects and linker scripts hidden between the
> > headers
> > find ${D} -name "*.o" -delete
> > @@ -209,15 +255,8 @@ do_install () {
> >
> > }
> >
> > -PACKAGES =+ "${PN}-rawdemos \
> > - ${PN}-x11demos \
> > - ${PN}-rawtrainingcourses \
> > - ${PN}-x11trainingcourses \
> > -"
> > -
> > -PACKAGES += "xserver-kdrive-powervrsgx \
> > - ${PN}-tests "
> > -
> > +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> > d)} \
> > + ${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"
> > @@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so
> > libIMGegl.so libsrv_um.so libOpenVG.so li
> > 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 ${PN}-x11wsegl ${PN}-driwsegl"
> > +
> > +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.*"
> > @@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
> > @@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-
> > driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
> >
> > CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> >
> > -FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
> > +FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
> >
> > FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > FILES_${PN}-tests = "${bindir}/*test*"
> > @@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > 0 1 6 ."
> > 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
> > +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() {
> > diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > index 00cd994..e5a4cd1 100755
> > --- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > +++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > @@ -42,6 +42,13 @@ 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
> > +
>
> Why is this fix here? Doesn't seem related and could be it's own patch.
>
> > modprobe omaplfb
> > modprobe bufferclass_ti
> >
> > --
> > 1.7.0.4
> >
> > _______________________________________________
> > 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] 6+ messages in thread
* Re: [PATCH v2] libgles-omap3: Adjust for non X11 distros
2012-11-13 1:52 ` Cooper Jr., Franklin
@ 2012-11-13 1:59 ` Denys Dmytriyenko
0 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2012-11-13 1:59 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-ti
On Tue, Nov 13, 2012 at 01:52:14AM +0000, Cooper Jr., Franklin wrote:
> That is what this version of the patch addressed.
Ah, right, I got confused. I see the "v2 chages comments" now...
> I need to send a v3 that addressed some of the comments from this thread.
Ok, I'll wait for v3 then.
Denys
> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Monday, November 12, 2012 7:48 PM
> To: Cooper Jr., Franklin
> Cc: Maupin, Chase; Franklin S. Cooper Jr; meta-ti@yoctoproject.org
> Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11 distros
>
> Franklin,
>
> Have you submitted the version that does X11+FB when x11 is enabled and FB only when not?
>
> Denys
>
>
> On Wed, Oct 10, 2012 at 04:18:42PM +0000, Cooper Jr., Franklin wrote:
> > See inline.
> >
> > Chase,
> >
> > Several of your comments aren't related to my actually changes. I would say almost all of my tweaks is simply moving things around and placing X11 statements within if statements. Everything else is replacing hard coded values with variables. Your points are still valid but this patch isn't the place to address it.
> > ________________________________________
> > From: meta-ti-bounces@yoctoproject.org
> > [meta-ti-bounces@yoctoproject.org] on behalf of Maupin, Chase
> > Sent: Wednesday, October 10, 2012 10:46 AM
> > To: Franklin S. Cooper Jr; meta-ti@yoctoproject.org
> > Subject: Re: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> > distros
> >
> > > -----Original Message-----
> > > From: meta-ti-bounces@yoctoproject.org [mailto:meta-ti-
> > > bounces@yoctoproject.org] On Behalf Of Franklin S. Cooper Jr
> > > Sent: Tuesday, October 09, 2012 11:23 PM
> > > To: meta-ti@yoctoproject.org
> > > Subject: [meta-ti] [PATCH v2] libgles-omap3: Adjust for non X11
> > > distros
> > >
> > > * Non X11 base distros are unable to build this Graphics SDK.
> > > * This patch tweaks the libgles-omap3 include file to always build
> > > the
> > > Graphics SDK in Raw mode and also build in X11 mode only if X11 is
> > > apart of the DISTRO_FEATURE.
> >
> > Apart => a part
> >
> > > * Create a new variable PVR_INIT that is by default set to
> > > pvrsrvinit. This is
> > > needed for newer version of the Graphics SDK that replaced this
> > > file.
> > >
> > > Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> > > ---
> > > Version 2 changes:
> > > Added PVR_INIT variable.
> > > Made changes to only build and package X11 components if a X11 based
> > > distro is used. Raw mode components are always built and packaged
> > > even for
> > > X11 based
> > > distros.
> > >
> > > recipes-graphics/libgles/libgles-omap3.inc | 208
> > > +++++++++++++++----------
> > > recipes-graphics/libgles/libgles-omap3/rc.pvr | 7 +
> > > 2 files changed, 135 insertions(+), 80 deletions(-)
> > >
> > > diff --git a/recipes-graphics/libgles/libgles-omap3.inc
> > > b/recipes-graphics/libgles/libgles-omap3.inc
> > > index 4525285..523aa52 100644
> > > --- a/recipes-graphics/libgles/libgles-omap3.inc
> > > +++ b/recipes-graphics/libgles/libgles-omap3.inc
> > > @@ -3,11 +3,15 @@ LICENSE = "proprietary-binary"
> > > # 'TSPA.txt' might not be the best file to md5sum LIC_FILES_CHKSUM
> > > = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
> > >
> > > -PR = "r32"
> > > +PR = "r33"
> > >
> > > COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
> > >
> > > -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
> > > +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"
> > >
> > > @@ -31,11 +35,13 @@ 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"
> > > +
> >
> > Why not set this like your line from your other patches
> >
> > LIBGLESWINDOWSYSTEM ?= "${@base_contains('DISTRO_FEATURES', 'x11',"libpvrPVR2D_DRIWSEGL.so" ,"libpvrPVR2D_FRONTWSEGL.so.1", d)}"
> >
> > Franklin: Because this will change the default behavior for the current libgles-omap3 recipes which might break things for X11 users. This recipe was simple meant to tweak the settings of this inc to prepare for my newer Graphics SDK patches but it shouldn't modify anything for users using the older Graphics SDK.
> >
> > > 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
> > > + done
> >
> > What is the diff here? Whitespace?
> >
> > Franklin: Most likely.
> >
> > >
> > > # 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
> > > @@ -64,62 +70,92 @@ PARALLEL_MAKE = ""
> > > PLATFORM ?= "LinuxOMAP3"
> > >
> > > do_compile() {
> > > - export X11ROOT="${STAGING_DIR_HOST}/usr"
> > > export TOOLCHAIN="${TOOLCHAIN_PATH}"
> > > -
> > > export PLAT_CC="${CC}"
> > > export PLAT_CPP="${CXX}"
> > > export PLAR_AR="${AR}"
> > >
> > > - mkdir -p ${S}/demos/raw
> > > - mkdir -p ${S}/demos/x11
> > > -
> > > - # Rebuild demos for both Raw and X11
> > > - for X11BUILD in 0 1 ; do
> > > - 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
> > > - 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
> > > - 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=$X11BUILD
> > > - 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
> > > - install -m 0755
> > > $demo/OGLES2/Build/${PLATFORM}/ReleaseRaw/* ${S}/demos/raw ||
> > > true
> > > - done
> > > - done
> > > -
> > > - mkdir -p ${S}/trainingcourses/raw
> > > - mkdir -p ${S}/trainingcourses/x11
> > > + 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=$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
> >
> > In the case that you are now only building X11 if it is a supported feature then shouldn't you care about the return value of this copy? Should we expect the build to fail if the demos are not built?
> >
> > Franklin: I think some of this "|| true" lines are due to differences between 4.03.00.02.bb vs 4.05.00.03.bb. Files typically get moved between Graphics SDK releases so lines like that are needed since this inc supports multiple Graphics SDK versions.
> >
> > > + 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
> >
> > Same comment as above
> >
> > > + 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
> >
> > Why rm -f here but not in the similar line in the previous loop?
> >
> > > +
> > > + if [ $X11BUILD -eq 1 ]
> > > + then
> > > + install -m 0755
> > > $demo/OGLES2/Build/${PLATFORM}/ReleaseX11/* ${S}/demos/x11 ||
> > > true
> >
> > Same comment as above
> >
> > > + 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
> >
> > Same comment as above
> >
> > Also, just a thought and this could likely be put into a future enhancement but these loops are similar enough that you should be able to abstract this to a function that can take the OGLES version (OGLES or OGLES2) and set the directories based on X11BUILD to remove duplicate code.
> >
> > > + fi
> > > + done
> > > + done
> > >
> > > find ${S} -name "*_org" -delete
> > >
> > > - # Build OGLES2 Trainingcourses for both Raw and X11
> > > - for X11BUILD in 0 1 ; do
> > > - 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=$X11BUILD
> > > - rm -f
> > > $training/OGLES2/Build/${PLATFORM}/Release*/*.o
> > > - install -m 0755
> > > $training/OGLES2/Build/${PLATFORM}/ReleaseX11/*
> > > ${S}/trainingcourses/x11 || true
> > > - install -m 0755
> > > $training/OGLES2/Build/${PLATFORM}/ReleaseRaw/*
> > > ${S}/trainingcourses/raw || true
> > > - done
> > > - done
> > > + # 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
> > > + 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
> > > +
> > > + oe_runmake Common=1 PLATFORM=${PLATFORM}
> > > X11BUILD=$X11BUILD
> > > + 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
> >
> > Same comments about the || true statements as above.
> >
> > > + done
> > > + done
> > >
> > > }
> > >
> > > @@ -133,12 +169,14 @@ do_install () {
> > >
> > > install -m 0755 ${BINLOCATION}/*_test ${D}${bindir}/
> > > install -m 0755 ${BINLOCATION}/gl* ${D}${bindir}/
> > > - install -m 0755 ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
> > > -
> > > - install -m 0755 ${BINLOCATION}/xgles1test1 ${D}${bindir}/
> > > + install -m 0755 ${BINLOCATION}/${PVR_INIT} ${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
> > > + 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}/
> > > @@ -158,7 +196,7 @@ do_install () {
> > >
> > > install -d ${D}${sysconfdir}
> > > echo "[default]" > ${D}${sysconfdir}/powervr.ini
> > > - echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so.1" >>
> > > ${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
> > >
> > > @@ -174,11 +212,15 @@ do_install () {
> > > 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"
> > > + 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 eglinfo eglinfo_x gles1test1
> > > gles2test1 ovg_unit_test pvr2d_test pvrsrvinit services_test
> > > sgx_blit_test sgx_clipblit_test sgx_flip_test sgx_init_test
> > > sgx_render_flip_test xgles1test1 xgles2test1 xmultiegltest
> > > xovg_unit_test ; do
> > > + for esprog in $shared_prog $raw_prog
> > > ${@base_contains('DISTRO_FEATURES', 'x11',"$x11_prog","",d)} ; do
> > > install -m 0755 ${ESLOCATION}/$esprog
> > > ${D}${bindir}/ES${esrev}.0/ || true
> > > done
> > > fi
> > > @@ -190,15 +232,19 @@ do_install () {
> > > cp ${WORKDIR}/*.desktop ${D}${prefix}/share/applications
> > > rm ${D}${prefix}/share/applications/sample.desktop
> > >
> > > - install -d ${D}${bindir}/SGX/demos/X11/
> > > - install -d ${D}${bindir}/SGX/demos/Raw/
> > > - install -m 0755 ${S}/demos/x11/*
> > > ${D}${bindir}/SGX/demos/X11/
> > > - install -m 0755 ${S}/demos/raw/*
> > > ${D}${bindir}/SGX/demos/Raw/
> > > + 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
> > > + install -m 0755 ${S}/trainingcourses/x11/*
> > > ${D}${bindir}/SGX/trainingcourses/X11/
> > > + 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
> > > + install -m 0755 ${S}/trainingcourses/raw/*
> > > ${D}${bindir}/SGX/trainingcourses/Raw/
> > >
> > > - install -d ${D}${bindir}/SGX/trainingcourses/Raw
> > > - install -d ${D}${bindir}/SGX/trainingcourses/X11
> > > - install -m 0755 ${S}/trainingcourses/x11/*
> > > ${D}${bindir}/SGX/trainingcourses/X11/
> > > - install -m 0755 ${S}/trainingcourses/raw/*
> > > ${D}${bindir}/SGX/trainingcourses/Raw/
> > >
> > > # Delete objects and linker scripts hidden between the
> > > headers
> > > find ${D} -name "*.o" -delete
> > > @@ -209,15 +255,8 @@ do_install () {
> > >
> > > }
> > >
> > > -PACKAGES =+ "${PN}-rawdemos \
> > > - ${PN}-x11demos \
> > > - ${PN}-rawtrainingcourses \
> > > - ${PN}-x11trainingcourses \
> > > -"
> > > -
> > > -PACKAGES += "xserver-kdrive-powervrsgx \
> > > - ${PN}-tests "
> > > -
> > > +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'x11',"${PN}-
> > > x11demos ${PN}-x11trainingcourses xserver-kdrive-powervrsgx" ,"",
> > > d)} \
> > > + ${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"
> > > @@ -234,7 +273,9 @@ PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so
> > > libIMGegl.so libsrv_um.so libOpenVG.so li
> > > 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 ${PN}-x11wsegl ${PN}-driwsegl"
> > > +
> > > +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.*"
> > > @@ -242,7 +283,10 @@ 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 ${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 =+ "${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.*"
> > > @@ -287,7 +331,7 @@ RRECOMMENDS_${PN}-driwsegl = " ${PN}-
> > > driwsegl-es2 ${PN}-driwsegl-es3 ${PN}-driws
> > >
> > > CONFFILES_${PN} = "${sysconfdir}/powervr.ini"
> > >
> > > -FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > > ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*"
> > > +FILES_${PN} = "${sysconfdir} ${libdir}/*.so*
> > > ${bindir}/${PVR_INIT} ${bindir}/cputype ${bindir}/*"
> > >
> > > FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx"
> > > FILES_${PN}-tests = "${bindir}/*test*"
> > > @@ -335,8 +379,12 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40
> > > 0 1 6 ."
> > > 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
> > > +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() {
> > > diff --git a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > > b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > > index 00cd994..e5a4cd1 100755
> > > --- a/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > > +++ b/recipes-graphics/libgles/libgles-omap3/rc.pvr
> > > @@ -42,6 +42,13 @@ 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
> > > +
> >
> > Why is this fix here? Doesn't seem related and could be it's own patch.
> >
> > > modprobe omaplfb
> > > modprobe bufferclass_ti
> > >
> > > --
> > > 1.7.0.4
> > >
> > > _______________________________________________
> > > 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] 6+ messages in thread
end of thread, other threads:[~2012-11-13 1:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-10 4:23 [PATCH v2] libgles-omap3: Adjust for non X11 distros Franklin S. Cooper Jr
2012-10-10 15:46 ` Maupin, Chase
2012-10-10 16:18 ` Cooper Jr., Franklin
2012-11-13 1:47 ` Denys Dmytriyenko
2012-11-13 1:52 ` Cooper Jr., Franklin
2012-11-13 1:59 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.