[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 69db8036643a3b20b5b98e89e2518a283258c7de Author: stefson yahoo de> AuthorDate: Wed Nov 7 19:52:38 2018 + Commit: Andrey Utkin gentoo org> CommitDate: Sun Mar 24 23:52:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69db8036 media-libs/raspberrypi-userland: : remove upstreamed patch Closes: https://bugs.gentoo.org/641046 Link: https://github.com/raspberrypi/userland/commit/2fe51001dbd421ac35a55af443ac080b50128266 Signed-off-by: Steffen Kuhn yandex.com> Signed-off-by: Andrey Utkin gentoo.org> .../files/raspberrypi-userland--gentoo.patch | 15 --- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 2 -- 2 files changed, 17 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index a5e60554cd1..000 --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 -+++ raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 99b34886324..6906bbc7039 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -18,8 +18,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - pkg_setup() { append-ldflags $(no-as-needed) }
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 3685f662853bf6e75118834a769ab487bea92176 Author: Sam James gentoo org> AuthorDate: Tue Feb 16 19:25:32 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 16 19:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3685f662 Revert "media-libs/raspberrypi-userland: cleanup old" This reverts commit 8021512569b236c2ceb62156c206c133b8f17bf0. Newer version breaks some dependent packages because we don't install GL includes due to collisions. Also reverts 9cbaffb767a7eb275d54f9666584e235d9d0566e. Bug: https://bugs.gentoo.org/770802 Signed-off-by: Sam James gentoo.org> media-libs/raspberrypi-userland/Manifest | 1 + .../files/04raspberrypi-userland | 3 + media-libs/raspberrypi-userland/files/bcm_host.pc | 10 + media-libs/raspberrypi-userland/files/egl.pc | 11 ++ media-libs/raspberrypi-userland/files/glesv2.pc| 11 ++ .../files/next-resource-handle.patch | 207 + .../raspberrypi-userland-0_pre20160424.ebuild | 109 +++ 7 files changed, 352 insertions(+) diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest index 14ea7065276..29025c84702 100644 --- a/media-libs/raspberrypi-userland/Manifest +++ b/media-libs/raspberrypi-userland/Manifest @@ -1 +1,2 @@ +DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000..17b493b1814 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ +PKG_CONFIG_PATH='/opt/vc/lib/pkgconfig' +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/bcm_host.pc b/media-libs/raspberrypi-userland/files/bcm_host.pc new file mode 100644 index 000..7627ae87105 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/bcm_host.pc @@ -0,0 +1,10 @@ +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/media-libs/raspberrypi-userland/files/egl.pc b/media-libs/raspberrypi-userland/files/egl.pc new file mode 100644 index 000..56bf1e07e93 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/egl.pc @@ -0,0 +1,11 @@ +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 glesv2 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/media-libs/raspberrypi-userland/files/glesv2.pc b/media-libs/raspberrypi-userland/files/glesv2.pc new file mode 100644 index 000..04d61c21cea --- /dev/null +++ b/media-libs/raspberrypi-userland/files/glesv2.pc @@ -0,0 +1,11 @@ +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/media-libs/raspberrypi-userland/files/next-resource-handle.patch b/media-libs/raspberrypi-userland/files/next-resource-handle.patch new file mode 100644 index 000..45e1a494b2c --- /dev/null +++ b/media-libs/raspberrypi-userland/files/next-resource-handle.patch @@ -0,0 +1,207 @@ +From 825c3236e5908ff003644abd870bfe98e82722b2 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 9 Jul 2013 09:26:26 -0400 +Subject: [PATCH] Allow applications to set next resource handle + +This patch adds provisions in userland to +let apps callers set the next rendereing dispmanx resource. +It's useful for implementing, say, a buffer carousel. +--- + interface/khronos/common/khrn_client_rpc.h | 2 ++ + interface/khronos/common/khrn_int_ids.h| 2 ++ + interface/khronos/egl/egl_client.c | 30 +++--- + interface/khronos/egl/egl_client_surface.c | 24 +++- + interface/khronos/egl/egl_client_surface.h | 3 ++- + interface/khronos/egl/egl_int_impl.h
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: 2b73810ed25d8db51a5f018da39f186f59d94831 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 19 19:42:23 2016 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 19 19:42:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b73810e media-libs/raspberrypi-userland: Patch accepted by upstream Package-Manager: portage-2.3.0 .../files/raspberrypi-userland--gentoo.patch | 10 -- .../raspberrypi-userland/raspberrypi-userland-.ebuild | 4 2 files changed, 14 deletions(-) diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch deleted file mode 100644 index f58e288.. --- a/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch +++ /dev/null @@ -1,10 +0,0 @@ CMakeLists.txt.old 2015-02-20 19:37:32.754551301 +0100 -+++ CMakeLists.txt 2015-02-20 19:38:45.643356903 +0100 -@@ -38,6 +38,7 @@ - add_definitions(-DOMX_SKIP64BIT) - add_definitions(-DEGL_SERVER_DISPMANX) - add_definitions(-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) -+add_definitions(-D_GNU_SOURCE) - - # do we actually need this? - add_definitions(-D__VIDEOCORE4__) diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index 9c5d675..c744808 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild @@ -19,10 +19,6 @@ RDEPEND="" EGIT_REPO_URI="https://github.com/raspberrypi/userland"; -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - src_configure() { local mycmakeargs=( -DVMCS_INSTALL_PREFIX="/usr"
[gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/, media-libs/raspberrypi-userland/files/
commit: a18a8c4cbfc39c02825851d24e9e9ab777c4706b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 12 14:33:47 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 12 14:33:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a8c4c media-libs/raspberrypi-userland: Fix devices permissions Not using anymore eselect opengl (includes not compatible) Package-Manager: portage-2.3.3 .../files/92-local-vchiq-permissions.rules | 2 ++ .../files/raspberrypi-userland--gentoo.patch | 15 + .../raspberrypi-userland-.ebuild | 26 +- 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 bacea0e066..fd95502940 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--gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch new file mode 100644 index 00..a5e60554cd --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland--gentoo.patch @@ -0,0 +1,15 @@ +--- raspberrypi-userland-/host_applications/linux/apps/dtoverlay/CMakeLists.txt.old 2017-02-04 19:01:38.944537134 +0100 raspberrypi-userland-/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-.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild index c7448085bb..cc5ecd0b82 100644 --- a/media-libs/raspberrypi-userland/raspberrypi-userland-.ebuild +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-.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}/