mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-04 18:00:36 +00:00
Code Issues Projects Releases Wiki Activity

libgles-omap3: don't RCONFLICT/RREPLACE no-x version with x11 as it breaks non-X distros

Browse Source 
* Enables building/installing both X11 and RAW libs/demos. Plus otherwise the
  build is broken for non-X distros, as it pulls in X11 deps due to RREPLACES...
* Fix broken DEPENDS copy/paste typo.
* Also, clean up after the previous changes - extra empty lines, indentation, etc.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
This commit is contained in:
Denys Dmytriyenko
2013-06-21 14:24:50 -04:00
parent df2d999252
commit b02c0284fb
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb
-1
View File
@@ -71,4 +71,3 @@ do_install() {
cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
}
recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
-1
View File
@@ -48,4 +48,3 @@ do_install() {
${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
}
recipes-graphics/libgles/libgles-omap3-no-x.inc
+1 -2
View File
@@ -245,7 +245,7 @@ FILES_${PN}-dbg = "${libdir}/.debug/* ${bindir}/.debug/* \
${libdir}/ES*/.debug ${bindir}/*/.debug\
${bindir}/SGX/demos/*/.debug/* \
${bindir}/SGX/trainingcourses/*/.debug/* \
"
"
FILES_${PN}-rawdemos = "${bindir}/SGX/demos/Raw/*"
@@ -315,4 +315,3 @@ rm -f $D${sysconfdir}/powervr-esrev
pkg_postinst_${PN}-linuxfbwsegl() {
rm -f $D${sysconfdir}/powervr-esrev
}
recipes-graphics/libgles/libgles-omap3-x11.inc
+9 -12
View File
@@ -7,27 +7,24 @@ PR = "r35"
COMPATIBLE_MACHINE = "(omap3|ti814x|ti816x|ti33x)"
X11DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
DEPENDS = "x11"
DEPENDS = "virtual/libx11 libxau libxdmcp libdrm"
export SUPPORT_XORG ?= "1"
PVR_INIT ?= "pvrsrvinit"
PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
RREPLACES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
RREPLACES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
RREPLACES_${PN} = "libegl libgles1 libgles2"
RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
RREPLACES_${PN}-dbg = "libegl-dbg"
RPROVIDES_${PN} = "libegl libgles1 libgles2 libgles-omap3"
RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
RPROVIDES_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
RPROVIDES_${PN} = "libegl libgles1 libgles2"
RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
RPROVIDES_${PN}-dbg = "libegl-dbg"
RCONFLICTS_${PN} = "libegl libgles1 libgles2"
RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgles-omap3-dev"
RCONFLICTS_${PN}-dbg = "libegl-dbg libgles-omap3-dbg"
RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev"
RCONFLICTS_${PN}-dbg = "libegl-dbg"
SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/${BINFILE} \
file://cputype \
recipes-graphics/libgles/libgles-omap3.inc
-1
View File
@@ -437,4 +437,3 @@ echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini
pkg_postinst_${PN}-driwsegl() {
rm -f $D${sysconfdir}/powervr-esrev
}