Build from source and deployed on /usr tree

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 124 insertions, 63 deletions

diff --git a/media-libs/raspberrypi-userland/ChangeLog b/media-libs/raspberrypi-userland/ChangeLog
index f332ca2f9e32..35d40d264b2c 100644
--- a/media-libs/raspberrypi-userland/ChangeLog
+++ b/media-libs/raspberrypi-userland/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/raspberrypi-userland
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog,v 1.6 2014/09/03 22:28:11 chithanh Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog,v 1.7 2015/03/17 13:03:30 tupone Exp $
+
+  17 Mar 2015; Tupone Alfredo <tupone@gentoo.org>
+  raspberrypi-userland-9999.ebuild,
+  +files/raspberrypi-userland-9999-gentoo.patch:
+  Build from source and deployed on canonical tree /usr
 
 *raspberrypi-userland-0_pre20140830 (03 Sep 2014)
 
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 82d992005e59..677fc39ff0fb 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -2,31 +2,20 @@
 Hash: SHA256
 
 AUX 04raspberrypi-userland 41 SHA256 4669ec0a1100c48d38f98675ab7dd437d8a428dcc362d6430bffab8ad229f672 SHA512 058a81aa3847fc2c39c6f4b322cb76e55442cdcd5481d427da4c22cb16022c33f08fc367c5cc279b5681a61ed830f97d82f733dc20024dc77b3282df03f96659 WHIRLPOOL d08f0d28465375f344c3810cbb3a3404412950df7973e74292356dac038880c064a60383f01a0a6acb21a911f27d431049582cdbc47686474688c713414bd812
+AUX raspberrypi-userland-9999-gentoo.patch 3669 SHA256 3bc1bfa7aae0d86f3605baa6c6471dc745761860c0f269edd1de834cbf22727b SHA512 c97ccc744dde93939d2bcb6d5a04d53389e922728be8d8658a1cb155bfab7cac953a72da0a77a827dba1bfa78291294aefdc97ffe2aba5514f546c774315037d WHIRLPOOL fe19e600d608c110c631582d389abf0ef3f05d33bff3dabc7e050193c81543e29b05e88413e27d14d5b8493eef0b353394ec1c4f881285b9723f7db1284264c5
 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
 EBUILD raspberrypi-userland-0_pre20130705-r1.ebuild 1516 SHA256 08757eb77b7cadc85489861f5b400109e2c64cd3cddf584b99179bf7d5a1f8e7 SHA512 6f6deb63ccc2d480004095faa8a57ff2f53ddf013ed6715f8d1316e199da344dbca30a05f8e697819620c9e1067c6565f943a9f6ee0d03c8961920ce924de473 WHIRLPOOL ecc0c28c2f5da88c7bf6e1fbdfa50de3e60519b89ef6922e17f89a5b8e4c8db33918381762ee7822bc080d0c241230ca5a5e470eeadc9b5b1f35ebb90fc46ccc
 EBUILD raspberrypi-userland-0_pre20140117.ebuild 1513 SHA256 13fde09a5640357884a4ac1fb33ba021eadcdd15510ad1db9a55f489aa7440e7 SHA512 ab871d8b260fb1ebadc13acf3a4e86579ca671ba245356f1ba53b494dbc7dc2aff40c4e7bd4823837b26a9fc47ca39ed3c356d4b5416c61112fa9ecdd13f13d5 WHIRLPOOL f60a5bd547d4605e899a760463532c0242d481e83e2f2856cbf56546b8e1b6ce27a43af263e50619bf414333e54f2654d7f9fdd95a03f0d6d9afadb2e13e693f
 EBUILD raspberrypi-userland-0_pre20140830.ebuild 1513 SHA256 9a9dbbbe801af82f4f7d09f6df4d2d58d0878f3b9ce6981c078bc1a050262579 SHA512 d6f4f4962681205c2349395d932bbf10244841ca59be674c3da48fb306c99b1f44811565368ce0689996012a013efa8186f6538af60c4e8c86ec33030e87d8a8 WHIRLPOOL 2b8f8bed3617ee3c359323103bad760add1946e9aa1e5e885ac992c544cff5a670fc6698d267eddcd064eca5499c1b66ca48d22d491a1eabcb31a1111312476e
-EBUILD raspberrypi-userland-9999.ebuild 1504 SHA256 9964117d51a72224e7cfde32a2e0eccabf0bbf48d3e16bde09631092b2331a74 SHA512 b1fbbc212e40bf18bb19c5ba87245bc31b8f1e8713ea52805256452ba2ad59efa976d7e5ccfe15d84ed85317822d37a75839a43b7e96af155869540cd89dc3bf WHIRLPOOL c48ef41a896472854a0613c5a7ae522dd1d31b2b02618b6d9b89d681fb11b2017e4cd00c9e4339560c2bd0f60453bb01c84c0831c25cb5b408fc21c519a489b5
-MISC ChangeLog 1855 SHA256 2c074010bfa5b44c2a4c7d382e6ba874897c69bf3d7e665c36c0269fd7ce6585 SHA512 a1e780cf3ce9341b8ada63193d735eed48d370edea05950d1a58535655ced933127d17ce60ab4b41ae328d104e7221e62bc28b46f9be904a455cf8dfc3ccfa27 WHIRLPOOL 41fbfcda7828443d2a42c3639c47ea0c6de7fac62792984d5b7d37052ef1dcfe9995b65a8379f3c57fdfc423ad3636571cfc682bef103020b5d657a40e0f5321
+EBUILD raspberrypi-userland-9999.ebuild 1326 SHA256 3201a25ffcc04850fbf217c01f52785e01f05316cbcf5eeafe13821635cafe41 SHA512 1e75cf2fa69af8960e3e0dd76e0dc3669936d038953240777b45cb419f5bdd4eed49b79a24aa8ae36c213390623b0820dab0759155466bcb917fabe3e8a32798 WHIRLPOOL 148a3a2ee9c36ffc2b34ec8b73dbf5348b562b48d963146efd53ed7ebbbfbaa2d563afdc5a82e0b1c4a6e00e7d94ade4a3c3aafc556db37d601e713b611eddb9
+MISC ChangeLog 2045 SHA256 328f5b4dc0081fd80f6802bac422515fc3b7736b92ef233a8fd30464170ad78c SHA512 8d3ac56b6b4d777498349d4258e804d687c4161f6a385a6d9f761c56d3adde70eab7dce4990e4f1145b7c0e302dec773d3e7851dfd43213e753df32bd69c004f WHIRLPOOL 37440209c13071310470f5e0c46aca11f738df57660909c36ed293c456cafe014c0aebe6572fed7b4a9562ad0a65c7b7705d1a90b725b8881c162b5cbd4e1985
 MISC metadata.xml 253 SHA256 2033971042ce53f0af10bdc9f59bd2aba7b8490f0eafbca62a9e8ffd49d23c5d SHA512 cd887d2863b319dabf8598d349740e8d2223a03b0432157a421933a1a98b6140ad4b56f4750244da7d2545b56fb59567aae00d1e822e7cd90d3cb2b3d464ef01 WHIRLPOOL 95f9871ded20192d86cd4dc49f4471d0ddc884bc804980bcbedc6c4d1f90ebc25e30231dd2a56e8e5a33762cf3f660250934b1299042956d6eba74a7b6d9c81b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUB5YkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRKgQP/0CwJ1u3s9qRxfAdS52Hntw1
-2kRubHJ/6xrc31tjPfWWRO6zsb5aV4JutLWny8cvFyshn77yugwMae8o8ej8jogs
-elzXk1wSyDRUoeLPblz+66dwOC7cGLfiZpbx98DmDjDqTaL8fV+yt058CYUfwns9
-zarRp1II5+xGu1WPppegDdL18OppngpY4UXS59SlDcDDe6zl5ABvCFvGqyOdmrS6
-KHWCmxoqzLFZCBceRU3f21YT7W6SYXBLiPNh7zzH5bZqLI4FxX/18NCu9mDQD4YH
-0NZQUw00YnRub8XzeWLKiyGzrmH2+VSZhTPXH949L4Dl/uhULdaXuJcZw7rfTSTP
-IOyyXvah+O/lqWHqwyi96r7KAIL43flupNo1trMmQC+qeZ8MV18ao1JALV4Y5KQU
-7yaBkO9ghWURzHdSUJfK9QDWZg9L6rJuCPO+7pMTXImy8i9QuaIng+cPBQaOTdCw
-K0cWpdzvLS9fP6p350N+DyuTQf0mE/LcqAyjEFZDc8bAWDKsVeGbkprYViFmhxfr
-cUHJh07ab88xUBsVTkydbdhcYw4QRote/lzvDl73Ue0Q6ubkkGttUO+59PkgyHKa
-0vHo0KgpPXoPnZuY5j3MEpaLJ+YL23v0zCrhWBrCnHPfdcc1AQBvNMwb7Jv4/Kg7
-Wwk+C8hA/rg43dw7tYg+
-=sj4D
+iEYEAREIAAYFAlUIJicACgkQIY77eQFFFC3KuwCgv3mAJW3CrXwyX0arosSjtYB7
+P4kAn1EUtJ6E7UqFq8HnoXWQysupJUr7
+=dgl6
 -----END PGP SIGNATURE-----
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/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index 2193bd3eef0f..aa421d745a11 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,61 +1,47 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild,v 1.2 2013/07/13 17:13:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild,v 1.3 2015/03/17 13:03:30 tupone Exp $
 
 EAPI=5
-
-inherit cmake-utils
+inherit cmake-utils git-r3
 
 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
+SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS=""
+IUSE=""
 
-# 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
-}
+DEPEND=""
+RDEPEND=""
 
-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
-}
+EGIT_REPO_URI="https://github.com/raspberrypi/userland"
 
-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_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 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
+	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
 }