Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
Date: Sun, 12 Feb 2017 14:34:22
Message-Id: 1486910027.a18a8c4cbfc39c02825851d24e9e9ab777c4706b.tupone@gentoo
1 commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 14:33:47 2017 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 14:33:47 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c
7
8 media-libs/raspberrypi-userland: Fix devices permissions
9
10 Not using anymore eselect opengl (includes not compatible)
11
12 Package-Manager: portage-2.3.3
13
14 .../files/92-local-vchiq-permissions.rules | 2 ++
15 .../files/raspberrypi-userland-9999-gentoo.patch | 15 +++++++++++++
16 .../raspberrypi-userland-9999.ebuild | 26 +++++++++-------------
17 3 files changed, 27 insertions(+), 16 deletions(-)
18
19 diff --git a/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
20 index bacea0e066..fd95502940 100644
21 --- a/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
22 +++ b/media-libs/raspberrypi-userland/files/92-local-vchiq-permissions.rules
23 @@ -1 +1,3 @@
24 SUBSYSTEM=="vchiq",GROUP="video",MODE="0660"
25 +SUBSYSTEM=="vc-sm",GROUP="video",MODE="0660"
26 +SUBSYSTEM=="bcm2708_vcio",GROUP="video",MODE="0660"
27
28 diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
29 new file mode 100644
30 index 0000000000..a5e60554cd
31 --- /dev/null
32 +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch
33 @@ -0,0 +1,15 @@
34 +--- raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100
35 ++++ raspberrypi-userland-9999/host_applications/linux/apps/dtoverlay/CMakeLists.txt 2017-02-04 19:02:09.634401479 +0100
36 +@@ -22,12 +22,4 @@
37 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
38 +
39 + set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
40 +-foreach(_script ${DTOVERLAY_SCRIPTS})
41 +- add_custom_command(
42 +- TARGET dtoverlay
43 +- COMMAND ${CMAKE_COMMAND}
44 +- -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
45 +- ${CMAKE_BINARY_DIR}/../../bin/${_script}
46 +- )
47 +-endforeach()
48 + install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
49
50 diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
51 index c7448085bb..cc5ecd0b82 100644
52 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
53 +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
54 @@ -1,9 +1,9 @@
55 -# Copyright 1999-2016 Gentoo Foundation
56 +# Copyright 1999-2017 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Id$
59
60 EAPI=5
61 -inherit cmake-utils git-r3
62 +inherit cmake-utils flag-o-matic git-r3
63
64 DESCRIPTION="Raspberry Pi userspace tools and libraries"
65 HOMEPAGE="https://github.com/raspberrypi/userland"
66 @@ -19,6 +19,12 @@ RDEPEND=""
67
68 EGIT_REPO_URI="https://github.com/raspberrypi/userland"
69
70 +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
71 +
72 +pkg_setup() {
73 + append-ldflags $(no-as-needed)
74 +}
75 +
76 src_configure() {
77 local mycmakeargs=(
78 -DVMCS_INSTALL_PREFIX="/usr"
79 @@ -30,20 +36,8 @@ src_configure() {
80 src_install() {
81 cmake-utils_src_install
82
83 - dodir /usr/lib/opengl/raspberrypi/lib
84 - touch "${D}"/usr/lib/opengl/raspberrypi/.gles-only
85 - mv "${D}"/usr/lib/lib{EGL,GLESv2}* \
86 - "${D}"/usr/lib/opengl/raspberrypi/lib
87 -
88 - dodir /usr/lib/opengl/raspberrypi/include
89 - mv "${D}"/usr/include/{EGL,GLES,GLES2,KHR,WF} \
90 - "${D}"/usr/lib/opengl/raspberrypi/include
91 - mv "${D}"/usr/include/interface/vcos/pthreads/* \
92 - "${D}"/usr/include/interface/vcos/
93 - rmdir "${D}"/usr/include/interface/vcos/pthreads
94 - mv "${D}"/usr/include/interface/vmcs_host/linux/* \
95 - "${D}"/usr/include/interface/vmcs_host/
96 - rmdir "${D}"/usr/include/interface/vmcs_host/linux
97 + insinto /lib/udev/rules.d
98 + doins "${FILESDIR}"/92-local-vchiq-permissions.rules
99
100 dodir /usr/share/doc/${PF}
101 mv "${D}"/usr/src/hello_pi "${D}"/usr/share/doc/${PF}/