media-libs/raspberrypi-userland: Fix devices permissions

Not using anymore eselect opengl (includes not compatible)

Package-Manager: portage-2.3.3

3 files changed, 27 insertions, 16 deletions

diff --git a/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
index bacea0e0665e..fd95502940a5 100644
--- a/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
+++ b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
@@ -1 +1,3 @@
 SUBSYSTEM=="vchiq",GROUP="video",MODE="0660"
+SUBSYSTEM=="vc-sm",GROUP="video",MODE="0660"
+SUBSYSTEM=="bcm2708_vcio",GROUP="video",MODE="0660"
diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
new file mode 100644
index 000000000000..a5e60554cd13
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
@@ -0,0 +1,15 @@
+--- raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old	2017-02-04 19:01:38.944537134 +0100
++++ raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt	2017-02-04 19:02:09.634401479 +0100
+@@ -22,12 +22,4 @@
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
+ 
+ set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
+-foreach(_script ${DTOVERLAY_SCRIPTS})
+-   add_custom_command(
+-     TARGET dtoverlay
+-     COMMAND ${CMAKE_COMMAND}
+-     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
+-     ${CMAKE_BINARY_DIR}/../../bin/${_script}
+-   )
+-endforeach()
+ install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index c7448085bbb3..cc5ecd0b8271 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit cmake-utils git-r3
+inherit cmake-utils flag-o-matic git-r3
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/userland"
@@ -19,6 +19,12 @@ RDEPEND=""
 
 EGIT_REPO_URI="https://github.com/raspberrypi/userland"
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	append-ldflags $(no-as-needed)
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DVMCS_INSTALL_PREFIX="/usr"
@@ -30,20 +36,8 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	dodir /usr/lib/opengl/raspberrypi/lib
-	touch "${D}"/usr/lib/opengl/raspberrypi/.gles-only
-	mv "${D}"/usr/lib/lib{EGL,GLESv2}* \
-		"${D}"/usr/lib/opengl/raspberrypi/lib
-
-	dodir /usr/lib/opengl/raspberrypi/include
-	mv "${D}"/usr/include/{EGL,GLES,GLES2,KHR,WF} \
-		"${D}"/usr/lib/opengl/raspberrypi/include
-	mv "${D}"/usr/include/interface/vcos/pthreads/* \
-		"${D}"/usr/include/interface/vcos/
-	rmdir "${D}"/usr/include/interface/vcos/pthreads
-	mv "${D}"/usr/include/interface/vmcs_host/linux/* \
-		"${D}"/usr/include/interface/vmcs_host/
-	rmdir "${D}"/usr/include/interface/vmcs_host/linux
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
 
 	dodir /usr/share/doc/${PF}
 	mv "${D}"/usr/src/hello_pi "${D}"/usr/share/doc/${PF}/