From d1fa1c0b75a8de15ae27a9a2f9eaa496a5fe6de9 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Mon, 2 Mar 2015 00:06:19 +0100 Subject: vc-graphics: Move to recipes-graphics Signed-off-by: Andrei Gherzan --- recipes-bcm/vc-graphics/files/egl.pc | 10 ---- recipes-bcm/vc-graphics/files/vchiq.sh | 24 ---------- recipes-bcm/vc-graphics/vc-graphics-hardfp.bb | 6 --- recipes-bcm/vc-graphics/vc-graphics.bb | 6 --- recipes-bcm/vc-graphics/vc-graphics.inc | 56 ---------------------- recipes-graphics/vc-graphics/files/egl.pc | 10 ++++ recipes-graphics/vc-graphics/files/vchiq.sh | 24 ++++++++++ recipes-graphics/vc-graphics/vc-graphics-hardfp.bb | 6 +++ recipes-graphics/vc-graphics/vc-graphics.bb | 6 +++ recipes-graphics/vc-graphics/vc-graphics.inc | 56 ++++++++++++++++++++++ 10 files changed, 102 insertions(+), 102 deletions(-) delete mode 100644 recipes-bcm/vc-graphics/files/egl.pc delete mode 100644 recipes-bcm/vc-graphics/files/vchiq.sh delete mode 100644 recipes-bcm/vc-graphics/vc-graphics-hardfp.bb delete mode 100644 recipes-bcm/vc-graphics/vc-graphics.bb delete mode 100644 recipes-bcm/vc-graphics/vc-graphics.inc create mode 100644 recipes-graphics/vc-graphics/files/egl.pc create mode 100644 recipes-graphics/vc-graphics/files/vchiq.sh create mode 100644 recipes-graphics/vc-graphics/vc-graphics-hardfp.bb create mode 100644 recipes-graphics/vc-graphics/vc-graphics.bb create mode 100644 recipes-graphics/vc-graphics/vc-graphics.inc diff --git a/recipes-bcm/vc-graphics/files/egl.pc b/recipes-bcm/vc-graphics/files/egl.pc deleted file mode 100644 index c314202..0000000 --- a/recipes-bcm/vc-graphics/files/egl.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: egl for RaspberryPI -Version: 0.0 -Libs: -L${libdir} -lEGL -lGLESv2 -Cflags: -I${includedir}/vc -I${includedir}/interface -I${includedir}/interface/vcos -I${includedir}/interface/vcos/pthreads diff --git a/recipes-bcm/vc-graphics/files/vchiq.sh b/recipes-bcm/vc-graphics/files/vchiq.sh deleted file mode 100644 index c73e3a9..0000000 --- a/recipes-bcm/vc-graphics/files/vchiq.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: vchiq.sh -# Required-Start: $remote_fs rmnologin -# Required-Stop: -# Default-Start: S -# Default-Stop: -# Short-Description: Create /dev/vchiq. -# Description: Get the major number from /proc/devices and use it -# ti create /dev/vchiq -### END INIT INFO - -rm -f /dev/vchiq - -#Get the major number -major=$(awk "\$2==\"vchiq\" {print \$1}" /proc/devices) - -if [ -z "$major" ]; then - echo "Error: Cannot find vchiq in /proc/devices" - exit 2 -else - mknod /dev/vchiq c "$major" 0 - chmod a+w /dev/vchiq -fi diff --git a/recipes-bcm/vc-graphics/vc-graphics-hardfp.bb b/recipes-bcm/vc-graphics/vc-graphics-hardfp.bb deleted file mode 100644 index 0db71fd..0000000 --- a/recipes-bcm/vc-graphics/vc-graphics-hardfp.bb +++ /dev/null @@ -1,6 +0,0 @@ -CONFLICTS = "vc-graphics" - -VCDIR = "hardfp/opt/vc" -require vc-graphics.inc - -PR = "${INCPR}.0" diff --git a/recipes-bcm/vc-graphics/vc-graphics.bb b/recipes-bcm/vc-graphics/vc-graphics.bb deleted file mode 100644 index a1bce56..0000000 --- a/recipes-bcm/vc-graphics/vc-graphics.bb +++ /dev/null @@ -1,6 +0,0 @@ -CONFLICTS = "vc-graphics-hardfp" - -VCDIR = "opt/vc" -require vc-graphics.inc - -PR = "${INCPR}.0" diff --git a/recipes-bcm/vc-graphics/vc-graphics.inc b/recipes-bcm/vc-graphics/vc-graphics.inc deleted file mode 100644 index 1dee53e..0000000 --- a/recipes-bcm/vc-graphics/vc-graphics.inc +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "Graphics libraries for BCM2835." -LICENSE = "Proprietary" - -LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780" - -PROVIDES = "virtual/libgles2 virtual/egl" -COMPATIBLE_MACHINE = "raspberrypi" - -include ../common/firmware.inc - -SRC_URI += " \ - file://egl.pc \ - file://vchiq.sh \ -" - -S = "${RPIFW_S}/${VCDIR}" - -INCPR = "r1" - -inherit pkgconfig update-rc.d - -do_install () { - install -d ${D}${bindir} - cp -R bin/* ${D}${bindir} - - install -d ${D}${sbindir} - cp -R sbin/* ${D}${sbindir} - - install -d ${D}${libdir} - # note: -H option to deref symlinked .so - cp -R -H lib/* ${D}${libdir} - - install -d ${D}${includedir} - cp -R include/* ${D}${includedir} - - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/ - - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/ -} - -# These are proprietary binaries generated elsewhere so don't check ldflags -INSANE_SKIP_${PN} = "ldflags" - -INITSCRIPT_NAME = "vchiq.sh" -INITSCRIPT_PARAMS = "start 03 S ." - -FILES_${PN} = "${bindir}/* \ - ${sbindir}/* \ - ${libdir}/lib*.so \ - ${sysconfdir}/init.d \ - ${libdir}/plugins" -FILES_${PN}-dev = "${libdir}/pkgconfig \ - ${includedir}" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" diff --git a/recipes-graphics/vc-graphics/files/egl.pc b/recipes-graphics/vc-graphics/files/egl.pc new file mode 100644 index 0000000..c314202 --- /dev/null +++ b/recipes-graphics/vc-graphics/files/egl.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: egl +Description: egl for RaspberryPI +Version: 0.0 +Libs: -L${libdir} -lEGL -lGLESv2 +Cflags: -I${includedir}/vc -I${includedir}/interface -I${includedir}/interface/vcos -I${includedir}/interface/vcos/pthreads diff --git a/recipes-graphics/vc-graphics/files/vchiq.sh b/recipes-graphics/vc-graphics/files/vchiq.sh new file mode 100644 index 0000000..c73e3a9 --- /dev/null +++ b/recipes-graphics/vc-graphics/files/vchiq.sh @@ -0,0 +1,24 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: vchiq.sh +# Required-Start: $remote_fs rmnologin +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Create /dev/vchiq. +# Description: Get the major number from /proc/devices and use it +# ti create /dev/vchiq +### END INIT INFO + +rm -f /dev/vchiq + +#Get the major number +major=$(awk "\$2==\"vchiq\" {print \$1}" /proc/devices) + +if [ -z "$major" ]; then + echo "Error: Cannot find vchiq in /proc/devices" + exit 2 +else + mknod /dev/vchiq c "$major" 0 + chmod a+w /dev/vchiq +fi diff --git a/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb b/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb new file mode 100644 index 0000000..0db71fd --- /dev/null +++ b/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb @@ -0,0 +1,6 @@ +CONFLICTS = "vc-graphics" + +VCDIR = "hardfp/opt/vc" +require vc-graphics.inc + +PR = "${INCPR}.0" diff --git a/recipes-graphics/vc-graphics/vc-graphics.bb b/recipes-graphics/vc-graphics/vc-graphics.bb new file mode 100644 index 0000000..a1bce56 --- /dev/null +++ b/recipes-graphics/vc-graphics/vc-graphics.bb @@ -0,0 +1,6 @@ +CONFLICTS = "vc-graphics-hardfp" + +VCDIR = "opt/vc" +require vc-graphics.inc + +PR = "${INCPR}.0" diff --git a/recipes-graphics/vc-graphics/vc-graphics.inc b/recipes-graphics/vc-graphics/vc-graphics.inc new file mode 100644 index 0000000..a1c8d29 --- /dev/null +++ b/recipes-graphics/vc-graphics/vc-graphics.inc @@ -0,0 +1,56 @@ +DESCRIPTION = "Graphics libraries for BCM2835." +LICENSE = "Proprietary" + +LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780" + +PROVIDES = "virtual/libgles2 virtual/egl" +COMPATIBLE_MACHINE = "raspberrypi" + +include recipes-bsp/common/firmware.inc + +SRC_URI += " \ + file://egl.pc \ + file://vchiq.sh \ +" + +S = "${RPIFW_S}/${VCDIR}" + +INCPR = "r1" + +inherit pkgconfig update-rc.d + +do_install () { + install -d ${D}${bindir} + cp -R bin/* ${D}${bindir} + + install -d ${D}${sbindir} + cp -R sbin/* ${D}${sbindir} + + install -d ${D}${libdir} + # note: -H option to deref symlinked .so + cp -R -H lib/* ${D}${libdir} + + install -d ${D}${includedir} + cp -R include/* ${D}${includedir} + + install -d ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/ + + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/ +} + +# These are proprietary binaries generated elsewhere so don't check ldflags +INSANE_SKIP_${PN} = "ldflags" + +INITSCRIPT_NAME = "vchiq.sh" +INITSCRIPT_PARAMS = "start 03 S ." + +FILES_${PN} = "${bindir}/* \ + ${sbindir}/* \ + ${libdir}/lib*.so \ + ${sysconfdir}/init.d \ + ${libdir}/plugins" +FILES_${PN}-dev = "${libdir}/pkgconfig \ + ${includedir}" +FILES_${PN}-dbg += "${libdir}/plugins/.debug" -- cgit v1.2.2-1-g5e49