tupone 15/03/17 13:03:30 Modified: ChangeLog raspberrypi-userland-9999.ebuild Log: Build from source and deployed on /usr tree (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Revision Changes Path 1.7 media-libs/raspberrypi-userland/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 3 Sep 2014 22:28:11 -0000 1.6 +++ ChangeLog 17 Mar 2015 13:03:30 -0000 1.7 @@ -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 <[email protected]> + 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) 1.3 media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild?r1=1.2&r2=1.3 Index: raspberrypi-userland-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- raspberrypi-userland-9999.ebuild 13 Jul 2013 17:13:52 -0000 1.2 +++ raspberrypi-userland-9999.ebuild 17 Mar 2015 13:03:30 -0000 1.3 @@ -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 }
