rpi-userland: remove package

the utilities are now part of rpi-utils, and the libraries should be
provided by standard system libraries now

common/shlibs

@@ -132,9 +132,6 @@ libGL.so.1 libGL-7.11_1
 libEGL.so.1 libEGL-7.11_1
 libGLESv1_CM.so.1 libGLES-1.0_1
 libGLESv2.so.2 libGLES-1.0_1
-libbrcmEGL.so rpi-userland-20180103_2
-libbrcmGLESv2.so rpi-userland-20180103_2
-libbrcmOpenVG.so rpi-userland-20180103_2
 libnvidia-ml.so.1 nvidia-libs-346.47_1 ignore
 libnvidia-ml.so.1 nvidia390-libs-390.87_1 ignore
 libnvidia-ml.so.1 nvidia470-libs-470.103.01_1 ignore
@@ -1222,22 +1219,6 @@ libtaginfo.so.1 libtaginfo-0.1.3_1
 libtaginfo_c.so.0 libtaginfo-0.1.3_1
 libaa.so.1 aalib-1.4rc4_2
 libbsd.so.0 libbsd-0.4.2_1
-libWFC.so rpi-userland-0.0.0.0.20150907_1
-libbcm_host.so rpi-userland-0.0.0.0.20150907_1
-libopenmaxil.so rpi-userland-0.0.0.0.20150907_1
-libvchiq_arm.so rpi-userland-0.0.0.0.20150907_1
-libvcos.so rpi-userland-0.0.0.0.20150907_1
-libmmal.so rpi-userland-0.0.0.0.20150907_1
-libmmal_core.so rpi-userland-0.0.0.0.20150907_1
-libmmal_util.so rpi-userland-0.0.0.0.20150907_1
-libOpenVG.so rpi-userland-0.0.0.0.20150907_1
-libmmal_vc_client.so rpi-userland-20170427_1
-libmmal_components.so rpi-userland-20170427_1
-libvcsm.so rpi-userland-20170427_1
-libcontainers.so rpi-userland-20170427_1
-libbrcmWFC.so rpi-userland-20180103_1
-libdebug_sym.so rpi-userland-20180103_1
-libdtovl.so rpi-userland-20180103_1
 libwiringPi.so libwiringPi-0.0.20200408_1
 libwiringPiDev.so libwiringPi-0.0.20200408_1
 liblockdev.so.1 lockdev-1.0.3_1

srcpkgs/removed-packages/template

@@ -1,6 +1,6 @@
 # Template file for 'removed-packages'
 pkgname=removed-packages
-version=0.1.20231114
+version=0.1.20240105
 revision=1
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
@@ -345,8 +345,8 @@ replaces="
  libllvm8<=8.0.1_5
  libllvm9<=9.0.1_8
  liblrzip<=0.641_1
- liblvm2app<=2.02.187
  liblvm2app-devel<=2.02.187
+ liblvm2app<=2.02.187
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2
  libmagick6<=6.9.12.12_2
@@ -651,6 +651,7 @@ replaces="
  rkt-stage1-coreos<=1.30.0_3
  rkt-stage1-fly<=1.30.0_3
  rkt<=1.30.0_3
+ rpi-userland-devel<=20230920_1
  rundird<=0.2.0_1
  scantailor<=0.9.12.1_2
  seahorse-sharing<=3.8.0_4

srcpkgs/rpi-userland

@@ -0,0 +1 @@
+rpi-utils

srcpkgs/rpi-userland-devel

@@ -1 +0,0 @@
-rpi-userland

srcpkgs/rpi-userland/template

@@ -1,75 +0,0 @@
-# Template file for 'rpi-userland'
-pkgname=rpi-userland
-version=20230920
-revision=1
-_githash="44a3953fd13d5f0b9b0cd120b904aa7db370244e"
-build_style=cmake
-configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib"
-hostmakedepends="pkg-config"
-short_desc="Raspberry Pi GPU userland libraries and utilities"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/raspberrypi/userland"
-distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz"
-checksum=981c376a110f78fe579a72e218888646ccd5d71ab82d04bb1a8d7be1487b45f0
-
-LDFLAGS="-Wl,--no-as-needed"
-archs="armv6l* armv7l* aarch64*"
-
-shlib_provides="
- libEGL.so
- libGLESv2.so
- libOpenVG.so
- libWFC.so
- libbcm_host.so
- libbrcmEGL.so
- libbrcmGLESv2.so
- libbrcmOpenVG.so
- libbrcmWFC.so
- libcontainers.so
- libdebug_sym.so
- libdtovl.so
- libmmal.so
- libmmal_components.so
- libmmal_core.so
- libmmal_util.so
- libmmal_vc_client.so
- libopenmaxil.so
- libvchiq_arm.so
- libvcos.so
- libvcsm.so"
-
-case "$XBPS_TARGET_MACHINE" in
-aarch64*) configure_args+=" -DARM64=on" ;;
-esac
-
-pre_configure() {
-	for f in $(find ${wrksrc} -type f -name CMakeLists.txt); do
-		sed -i 's,-Werror,,g' $f
-	done
-}
-post_install() {
-	vlicense LICENCE
-	rm -rf ${DESTDIR}/etc
-	rm -rf ${DESTDIR}/opt/vc/share
-
-	vmkdir usr/share
-	mv ${DESTDIR}/opt/vc/man ${DESTDIR}/usr/share
-
-	vmkdir usr/bin
-	ln -sfr ${DESTDIR}/opt/vc/bin/tvservice ${DESTDIR}/usr/bin
-	ln -sfr ${DESTDIR}/opt/vc/bin/vcgencmd ${DESTDIR}/usr/bin
-}
-
-rpi-userland-devel_package() {
-	provides="rpi-firmware-pcfiles-1_1"
-	replaces="rpi-firmware-pcfiles>=0"
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove opt/vc/include
-		vmove opt/vc/src
-		vmove opt/vc/lib/*.a
-		vmove opt/vc/lib/pkgconfig
-	}
-}

srcpkgs/rpi-utils/template

@@ -18,3 +18,9 @@ python_version=3
 post_install() {
 	vlicense LICENCE
 }
+
+rpi-userland_package() {
+	build_style=meta
+	short_desc="RPi userland utilities (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}