From b02c0284fbf695a5543b2d61630cd2a95cd36c66 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 21 Jun 2013 14:24:50 -0400 Subject: [PATCH] libgles-omap3: don't RCONFLICT/RREPLACE no-x version with x11 as it breaks non-X distros * 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 --- .../omap3-sgx-modules-x11_4.09.00.01.bb | 1 - .../omap3-sgx-modules_4.09.00.01.bb | 1 - .../libgles/libgles-omap3-no-x.inc | 3 +-- .../libgles/libgles-omap3-x11.inc | 21 ++++++++----------- recipes-graphics/libgles/libgles-omap3.inc | 1 - 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb index 84938141..d439d838 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules-x11_4.09.00.01.bb @@ -71,4 +71,3 @@ do_install() { cp ${S}/services4/3rdparty/linux_drm/drm.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr } - diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb index 923e6a55..399374d4 100644 --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb @@ -48,4 +48,3 @@ do_install() { ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \ ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr } - diff --git a/recipes-graphics/libgles/libgles-omap3-no-x.inc b/recipes-graphics/libgles/libgles-omap3-no-x.inc index 6d79bf6f..d4cb46bb 100644 --- a/recipes-graphics/libgles/libgles-omap3-no-x.inc +++ b/recipes-graphics/libgles/libgles-omap3-no-x.inc @@ -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 } - diff --git a/recipes-graphics/libgles/libgles-omap3-x11.inc b/recipes-graphics/libgles/libgles-omap3-x11.inc index c4d08067..6621396d 100644 --- a/recipes-graphics/libgles/libgles-omap3-x11.inc +++ b/recipes-graphics/libgles/libgles-omap3-x11.inc @@ -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 \ diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc index 9a90c561..f417b8ee 100644 --- a/recipes-graphics/libgles/libgles-omap3.inc +++ b/recipes-graphics/libgles/libgles-omap3.inc @@ -437,4 +437,3 @@ echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini pkg_postinst_${PN}-driwsegl() { rm -f $D${sysconfdir}/powervr-esrev } -