diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/raspberrypi-userland | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/raspberrypi-userland')
8 files changed, 332 insertions, 0 deletions
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest new file mode 100644 index 000000000000..27838fcb95bb --- /dev/null +++ b/media-libs/raspberrypi-userland/Manifest @@ -0,0 +1,3 @@ +DIST raspberrypi-userland-0_pre20130705.tar.xz 31966608 SHA256 6307cc9d6103cd8afddf1b94ab44c4071f80884ec85d8e5aadd0f2f3d631c713 SHA512 d83de618e8fa6d49bd0b5b265706c7b290fa5800ac9a674dbf3d34222ab25e92c99877d61c4f706292666bf130ee0118ad54f35c8379a281f8ee90ce76a89651 WHIRLPOOL 8077d99e7a970f37bb4961ac928f9860b47be8aee83bff00eb4c44ee511aa322c532c9ff52528aece0897247ed8472aa70c147794aafe546ece8f8a08c5eb208 +DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e WHIRLPOOL 5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d +DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab988883bbfd902f267eba5734e8aa932ebcf487 WHIRLPOOL 3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55 diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland new file mode 100644 index 000000000000..fd37f4990328 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland @@ -0,0 +1,3 @@ + +PATH='/opt/vc/bin' +LDPATH='/opt/vc/lib' diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch new file mode 100644 index 000000000000..dc74ca0a50f3 --- /dev/null +++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-9999-gentoo.patch @@ -0,0 +1,81 @@ +--- 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__) +--- interface/vchiq_arm/vchiq_test.c.old 2015-02-20 20:52:15.202983349 +0100 ++++ interface/vchiq_arm/vchiq_test.c 2015-02-20 20:53:34.401882346 +0100 +@@ -130,6 +130,7 @@ + #ifdef __linux__ + + #include <fcntl.h> ++#include <sys/ioctl.h> + #include "interface/vmcs_host/vc_cma.h" + + static void reserve_test(int reserve, int delay) +@@ -1311,6 +1312,7 @@ + clnt_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, + VCHIQ_SERVICE_HANDLE_T service, void *bulk_userdata) + { ++ int data; + vcos_mutex_lock(&g_mutex); + if (reason == VCHIQ_MESSAGE_AVAILABLE) + { +@@ -1318,7 +1320,7 @@ + vchiq_release_message(service, header); + else + /* Responses of length 0 are not sync points */ +- if ((header->size >= 4) && (*(int *)header->data == MSG_ECHO)) ++ if ((header->size >= 4) && (memcpy(&data, header->data, sizeof(data)), data == MSG_ECHO)) + { + /* This is a complete echoed packet */ + if (g_params.verify && (mem_check(header->data, bulk_tx_data[ctrl_received % NUM_BULK_BUFS], g_params.blocksize) != 0)) +--- interface/vchiq_arm/CMakeLists.txt.old 2015-02-20 21:23:05.736777755 +0100 ++++ interface/vchiq_arm/CMakeLists.txt 2015-02-20 21:24:11.335832941 +0100 +@@ -3,7 +3,7 @@ + vchiq_lib.c vchiq_util.c) + + # pull in VCHI cond variable emulation +-target_link_libraries(vchiq_arm) ++target_link_libraries(vchiq_arm vcos) + + install(TARGETS vchiq_arm DESTINATION lib) + #install(FILES etc/10-vchiq.rules DESTINATION /etc/udev/rules.d) +--- makefiles/cmake/vmcs.cmake.old 2015-02-21 14:31:57.608527445 +0100 ++++ makefiles/cmake/vmcs.cmake 2015-02-21 14:32:09.358363958 +0100 +@@ -10,7 +10,7 @@ + if (ANDROID) + SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE) + else() +- SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE) ++ SET(VMCS_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories" FORCE) + endif() + + SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix +--- interface/vmcs_host/vcilcs_out.c.old 2015-02-24 06:57:20.977771332 +0100 ++++ interface/vmcs_host/vcilcs_out.c 2015-02-24 06:59:34.735428061 +0100 +@@ -37,6 +37,7 @@ + #include "interface/vmcs_host/vc_ilcs_defs.h" + #include "interface/vmcs_host/vcilcs.h" + #include "interface/vmcs_host/vcilcs_common.h" ++#include "interface/vcos/vcos_dlfcn.h" + + static VC_PRIVATE_PORT_T *find_port(VC_PRIVATE_COMPONENT_T *comp, OMX_U32 nPortIndex) + { +--- interface/khronos/common/linux/khrn_client_rpc_linux.c.old 2015-02-24 06:56:24.458761962 +0100 ++++ interface/khronos/common/linux/khrn_client_rpc_linux.c 2015-02-24 07:02:41.522158412 +0100 +@@ -503,7 +503,8 @@ + void rpc_call8_makecurrent(CLIENT_THREAD_STATE_T *thread, uint32_t id, uint32_t p0, + uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7) + { +- if (thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE && *((uint32_t *)thread->merge_buffer) == EGLINTMAKECURRENT_ID) ++ uint32_t data; ++ if (thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE && (memcpy(&data,thread->merge_buffer,sizeof(data)), data == EGLINTMAKECURRENT_ID)) + { + rpc_begin(thread); + vcos_log_trace("rpc_call8_makecurrent collapse onto previous makecurrent"); diff --git a/media-libs/raspberrypi-userland/metadata.xml b/media-libs/raspberrypi-userland/metadata.xml new file mode 100644 index 000000000000..27c51391065b --- /dev/null +++ b/media-libs/raspberrypi-userland/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>chithanh@gentoo.org</email> + <name>Chí-Thanh Christopher Nguyễn</name> + </maintainer> + <maintainer> + <email>tupone@gentoo.org</email> + <name>Tupone Alfredo</name> + </maintainer> + <upstream> + <remote-id type="github">raspberrypi/userland</remote-id> + </upstream> +</pkgmetadata> diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild new file mode 100644 index 000000000000..bb23bf036480 --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/${PN/-//}.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~arm" +fi + +LICENSE="BSD" +SLOT="0" + +# TODO: +# * port vcfiled init script +# * stuff is still installed to hardcoded /opt/vc location, investigate whether +# anything else depends on it being there +# * live ebuild + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-2_src_unpack + else + default + mv userland-*/ ${P}/ || die + fi +} + +src_prepare() { + # init script for Debian, not useful on Gentoo + sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die +} + +src_configure() { + # toolchain file not needed, but build fails if it is not specified + local mycmakeargs="-DCMAKE_TOOLCHAIN_FILE=/dev/null" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doenvd "${FILESDIR}"/04${PN} + + # enable dynamic switching of the GL implementation + dodir /usr/lib/opengl + dosym ../../../opt/vc /usr/lib/opengl/${PN} + + # tell eselect opengl that we do not have libGL + touch "${ED}"/opt/vc/.gles-only +} diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild new file mode 100644 index 000000000000..bb23bf036480 --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/${PN/-//}.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~arm" +fi + +LICENSE="BSD" +SLOT="0" + +# TODO: +# * port vcfiled init script +# * stuff is still installed to hardcoded /opt/vc location, investigate whether +# anything else depends on it being there +# * live ebuild + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-2_src_unpack + else + default + mv userland-*/ ${P}/ || die + fi +} + +src_prepare() { + # init script for Debian, not useful on Gentoo + sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die +} + +src_configure() { + # toolchain file not needed, but build fails if it is not specified + local mycmakeargs="-DCMAKE_TOOLCHAIN_FILE=/dev/null" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doenvd "${FILESDIR}"/04${PN} + + # enable dynamic switching of the GL implementation + dodir /usr/lib/opengl + dosym ../../../opt/vc /usr/lib/opengl/${PN} + + # tell eselect opengl that we do not have libGL + touch "${ED}"/opt/vc/.gles-only +} diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild new file mode 100644 index 000000000000..bb23bf036480 --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/${PN/-//}.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://gentoo/${P}.tar.xz" + KEYWORDS="~arm" +fi + +LICENSE="BSD" +SLOT="0" + +# TODO: +# * port vcfiled init script +# * stuff is still installed to hardcoded /opt/vc location, investigate whether +# anything else depends on it being there +# * live ebuild + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-2_src_unpack + else + default + mv userland-*/ ${P}/ || die + fi +} + +src_prepare() { + # init script for Debian, not useful on Gentoo + sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die +} + +src_configure() { + # toolchain file not needed, but build fails if it is not specified + local mycmakeargs="-DCMAKE_TOOLCHAIN_FILE=/dev/null" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + doenvd "${FILESDIR}"/04${PN} + + # enable dynamic switching of the GL implementation + dodir /usr/lib/opengl + dosym ../../../opt/vc /usr/lib/opengl/${PN} + + # tell eselect opengl that we do not have libGL + touch "${ED}"/opt/vc/.gles-only +} diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild new file mode 100644 index 000000000000..fc4088c8689c --- /dev/null +++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-utils git-r3 + +DESCRIPTION="Raspberry Pi userspace tools and libraries" +HOMEPAGE="https://github.com/raspberrypi/userland" +SRC_URI="" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="" + +EGIT_REPO_URI="https://github.com/raspberrypi/userland" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch +} + +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 + + dodir /usr/share/doc/${PF} + mv "${D}"/usr/src/hello_pi "${D}"/usr/share/doc/${PF}/ + rmdir "${D}"/usr/src +} |