From b548d51db8a08c626777348943a29426036c8904 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 22 Apr 2019 01:23:35 +0200 Subject: [PATCH] Add pseudo packages for OpenGL ES 2.x Move the Raspberry Pi 3 pkg-config files to /lib and add pseudo packages for OpenGL ES. Other implementations will have to add equivalent packages and use the provided machanism. Packages that requires GLES can simply rely on adding that package to their dependency list. Signed-off-by: David Oberhollenzer --- pkg/firmware-rpi/build | 5 ++++- pkg/firmware-rpi/gles2-dev.desc | 1 + pkg/firmware-rpi/gles2-dev.files | 0 pkg/firmware-rpi/gles2.desc | 1 + pkg/firmware-rpi/gles2.files | 0 pkg/firmware-rpi/rpi-vc-dev.files | 21 +++++++++++---------- 6 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 pkg/firmware-rpi/gles2-dev.desc create mode 100644 pkg/firmware-rpi/gles2-dev.files create mode 100644 pkg/firmware-rpi/gles2.desc create mode 100644 pkg/firmware-rpi/gles2.files diff --git a/pkg/firmware-rpi/build b/pkg/firmware-rpi/build index 1cf385d..7fe12a2 100755 --- a/pkg/firmware-rpi/build +++ b/pkg/firmware-rpi/build @@ -4,7 +4,7 @@ TARBALL="${VERSION}.tar.gz" URL="https://github.com/raspberrypi/firmware/archive" SHA256SUM="6b6db5f15c400bc1224266fd44238dd9b2479fd09f8a55e36ccdac2120632f8f" DEPENDS="toolchain" -SUBPKG="boot-rpi boot-rpi-dtbo rpi-vc rpi-vc-dev boot-rpi-dtb" +SUBPKG="boot-rpi boot-rpi-dtbo rpi-vc rpi-vc-dev boot-rpi-dtb gles2 gles2-dev" prepare() { return @@ -24,6 +24,9 @@ deploy() { strip_files ${PKGDEPLOYDIR}/opt/vc/bin/* strip_files ${PKGDEPLOYDIR}/opt/vc/lib/*.so strip_files ${PKGDEPLOYDIR}/opt/vc/lib/plugins/*.so + + mkdir -p "$PKGDEPLOYDIR/lib" + mv "$PKGDEPLOYDIR/opt/vc/lib/pkgconfig" "$PKGDEPLOYDIR/lib" } check_update() { diff --git a/pkg/firmware-rpi/gles2-dev.desc b/pkg/firmware-rpi/gles2-dev.desc new file mode 100644 index 0000000..89e7083 --- /dev/null +++ b/pkg/firmware-rpi/gles2-dev.desc @@ -0,0 +1 @@ +requires gles2 rpi-vc-dev diff --git a/pkg/firmware-rpi/gles2-dev.files b/pkg/firmware-rpi/gles2-dev.files new file mode 100644 index 0000000..e69de29 diff --git a/pkg/firmware-rpi/gles2.desc b/pkg/firmware-rpi/gles2.desc new file mode 100644 index 0000000..adad384 --- /dev/null +++ b/pkg/firmware-rpi/gles2.desc @@ -0,0 +1 @@ +requires rpi-vc diff --git a/pkg/firmware-rpi/gles2.files b/pkg/firmware-rpi/gles2.files new file mode 100644 index 0000000..e69de29 diff --git a/pkg/firmware-rpi/rpi-vc-dev.files b/pkg/firmware-rpi/rpi-vc-dev.files index 5865dd0..55d65fe 100644 --- a/pkg/firmware-rpi/rpi-vc-dev.files +++ b/pkg/firmware-rpi/rpi-vc-dev.files @@ -31,16 +31,6 @@ dir opt/vc/include/GLES2 0755 0 0 dir opt/vc/include/GLES 0755 0 0 dir opt/vc/include/EGL 0755 0 0 dir opt/vc/lib 0755 0 0 -dir opt/vc/lib/pkgconfig 0755 0 0 -file opt/vc/lib/pkgconfig/vg.pc 0664 0 0 -file opt/vc/lib/pkgconfig/vcsm.pc 0664 0 0 -file opt/vc/lib/pkgconfig/mmal.pc 0664 0 0 -file opt/vc/lib/pkgconfig/glesv2.pc 0664 0 0 -file opt/vc/lib/pkgconfig/egl.pc 0664 0 0 -file opt/vc/lib/pkgconfig/brcmvg.pc 0664 0 0 -file opt/vc/lib/pkgconfig/brcmglesv2.pc 0664 0 0 -file opt/vc/lib/pkgconfig/brcmegl.pc 0664 0 0 -file opt/vc/lib/pkgconfig/bcm_host.pc 0664 0 0 file opt/vc/lib/libvcilcs.a 0664 0 0 file opt/vc/lib/libvchostif.a 0664 0 0 file opt/vc/lib/libkhrn_static.a 0664 0 0 @@ -244,3 +234,14 @@ file opt/vc/include/EGL/eglext_brcm.h 0664 0 0 file opt/vc/include/EGL/eglext_android.h 0664 0 0 file opt/vc/include/EGL/eglext.h 0664 0 0 file opt/vc/include/EGL/egl.h 0664 0 0 +dir lib 0755 0 0 +dir lib/pkgconfig 0755 0 0 +file lib/pkgconfig/vg.pc 0664 0 0 +file lib/pkgconfig/vcsm.pc 0664 0 0 +file lib/pkgconfig/mmal.pc 0664 0 0 +file lib/pkgconfig/glesv2.pc 0664 0 0 +file lib/pkgconfig/egl.pc 0664 0 0 +file lib/pkgconfig/brcmvg.pc 0664 0 0 +file lib/pkgconfig/brcmglesv2.pc 0664 0 0 +file lib/pkgconfig/brcmegl.pc 0664 0 0 +file lib/pkgconfig/bcm_host.pc 0664 0 0