From d3870a9f38c0c5fa1e2510e1d219501c0dc7f2b9 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 9 Jun 2019 15:08:43 +0200 Subject: [PATCH] rpi-userland: automatically generate pkgconfig files --- srcpkgs/rpi-userland/files/bcm_host.pc | 11 ----------- srcpkgs/rpi-userland/files/egl.pc | 12 ------------ srcpkgs/rpi-userland/files/glesv2.pc | 12 ------------ srcpkgs/rpi-userland/template | 5 +++-- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/rpi-userland/files/bcm_host.pc delete mode 100644 srcpkgs/rpi-userland/files/egl.pc delete mode 100644 srcpkgs/rpi-userland/files/glesv2.pc diff --git a/srcpkgs/rpi-userland/files/bcm_host.pc b/srcpkgs/rpi-userland/files/bcm_host.pc deleted file mode 100644 index 3cb841caba6..00000000000 --- a/srcpkgs/rpi-userland/files/bcm_host.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/opt/vc -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: bcm_host -Description: Broadcom VideoCore host API library -Version: 1 -Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm -Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM - diff --git a/srcpkgs/rpi-userland/files/egl.pc b/srcpkgs/rpi-userland/files/egl.pc deleted file mode 100644 index 52f4a515fb3..00000000000 --- a/srcpkgs/rpi-userland/files/egl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/opt/vc -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: EGL -Description: Fake EGL package for RPi -Version: 10 -Requires: bcm_host -Libs: -L${libdir} -lEGL -Cflags: -I${includedir} - diff --git a/srcpkgs/rpi-userland/files/glesv2.pc b/srcpkgs/rpi-userland/files/glesv2.pc deleted file mode 100644 index 901d3306faa..00000000000 --- a/srcpkgs/rpi-userland/files/glesv2.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/opt/vc -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: GLESv2 -Description: Fake GL ES 2 package for RPi -Version: 10 -Requires: bcm_host -Libs: -L${libdir} -lGLESv2 -Cflags: -I${includedir} - diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template index f40c376b27c..0e5dac9ed71 100644 --- a/srcpkgs/rpi-userland/template +++ b/srcpkgs/rpi-userland/template @@ -4,9 +4,10 @@ _gitshort="${_githash:0:7}" pkgname=rpi-userland version=20190501 -revision=1 +revision=2 wrksrc="userland-${_githash}" build_style=cmake +hostmakedepends="pkg-config" configure_args="-DCMAKE_INSTALL_RPATH=/opt/vc/lib" short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})" maintainer="Juan RP " @@ -49,7 +50,7 @@ pre_configure() { post_install() { vlicense LICENCE vmkdir usr/lib/pkgconfig - vcopy ${FILESDIR}/*.pc usr/lib/pkgconfig + mv ${DESTDIR}/opt/vc/lib/pkgconfig/*.pc ${DESTDIR}/usr/lib/pkgconfig rm -rf ${DESTDIR}/etc rm -rf ${DESTDIR}/opt/vc/share