diff options
| author |   Steve Sakoman <steve@sakoman.com> | 2010-02-26 12:12:24 -0800 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2010-03-05 10:00:24 +0100 |
| commit | 34c20e2d530c68d47123e554e1e634885e0ae99e (patch) | |
| tree | 747e5f8d4c1aa4041771003737b459f931107818 /recipes/powervr-drivers | |
| parent | dbb73cac5de3f6b1a9353a0f56837644bb992108 (diff) | |
| download | openembedded-34c20e2d530c68d47123e554e1e634885e0ae99e.tar.gz | |
libgles-omap3: fix for unwanted *.desktop file, shorten app names in menus
Diffstat (limited to 'recipes/powervr-drivers')
| -rw-r--r-- | recipes/powervr-drivers/libgles-omap3.inc | 40 | ||||
| -rw-r--r-- | recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb | 2 |
2 files changed, 26 insertions, 16 deletions
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index f1c6e8898b..2562ed6234 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -76,15 +76,25 @@ do_compile() { # 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 + 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/LinuxOMAP3/Release*/*.o - install -m 0755 $demo/OGLES*/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true - sed -e s:NAME:$(basename $demo/OGLES*/Build/LinuxOMAP3/ReleaseX11/*): \ - -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES*/Build/LinuxOMAP3/ReleaseX11/*): \ - ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo/OGLES*/Build/LinuxOMAP3/ReleaseX11/*).desktop - install -m 0755 $demo/OGLES*/Build/LinuxOMAP3/ReleaseRaw/* ${S}/demos/raw || true + rm $demo/OGLES/Build/LinuxOMAP3/Release*/*.o + install -m 0755 $demo/OGLES/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true + sed -e s:NAME:$(basename $demo): \ + -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES/Build/LinuxOMAP3/ReleaseX11/*): \ + ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop + install -m 0755 $demo/OGLES/Build/LinuxOMAP3/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 $demo/OGLES2/Build/LinuxOMAP3/Release*/*.o + install -m 0755 $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/demos/x11 || true + sed -e s:NAME:$(basename $demo): \ + -e s:EXEC:${bindir}/SGX/demos/X11/$(basename $demo/OGLES2/Build/LinuxOMAP3/ReleaseX11/*): \ + ${WORKDIR}/sample.desktop > ${WORKDIR}/$(basename $demo).desktop + install -m 0755 $demo/OGLES2/Build/LinuxOMAP3/ReleaseRaw/* ${S}/demos/raw || true done done @@ -94,18 +104,18 @@ do_compile() { # 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/OGLES*/Build/LinuxGeneric/Makefile ] ; then - cd $training/OGLES*/Build/LinuxGeneric + if [ -e $training/OGLES2/Build/LinuxGeneric/Makefile ] ; then + cd $training/OGLES2/Build/LinuxGeneric fi - if [ -e $training/OGLES*/Build/LinuxOMAP3/Makefile ] ; then - cd $training/OGLES*/Build/LinuxOMAP3 + if [ -e $training/OGLES2/Build/LinuxOMAP3/Makefile ] ; then + cd $training/OGLES2/Build/LinuxOMAP3 fi oe_runmake Common=1 PLATFORM=$PLATFORM X11BUILD=$X11BUILD - rm $training/OGLES*/Build/LinuxOMAP3/Release*/*.o - install -m 0755 $training/OGLES*/Build/LinuxOMAP3/ReleaseX11/* ${S}/trainingcourses/x11 || true - install -m 0755 $training/OGLES*/Build/LinuxOMAP3/ReleaseRaw/* ${S}/trainingcourses/raw || true + rm $training/OGLES2/Build/LinuxOMAP3/Release*/*.o + install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseX11/* ${S}/trainingcourses/x11 || true + install -m 0755 $training/OGLES2/Build/LinuxOMAP3/ReleaseRaw/* ${S}/trainingcourses/raw || true done done diff --git a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb index cc3f640e36..65b318ae3f 100644 --- a/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb +++ b/recipes/powervr-drivers/libgles-omap3_3.01.00.02.bb @@ -2,7 +2,7 @@ BINLOCATION = "${S}/gfx_rel_es3.x" require libgles-omap3.inc -PR = "r4" +PR = "r5" # download required binary distribution from: # http://software-dl.ti.com/dsps/forms/export.html?prod_no=/OMAP35x_Graphics_SDK_setuplinux_3_01_00_02.bin |