New snapshot. Use correct path in env.d file, bug #494976.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

6 files changed, 30 insertions, 72 deletions

diff --git a/media-libs/raspberrypi-userland/ChangeLog b/media-libs/raspberrypi-userland/ChangeLog
index a190259faf94..3baf8da6184f 100644
--- a/media-libs/raspberrypi-userland/ChangeLog
+++ b/media-libs/raspberrypi-userland/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/raspberrypi-userland
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog,v 1.4 2013/07/13 17:13:52 chithanh Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/ChangeLog,v 1.5 2014/01/23 13:33:18 chithanh Exp $
+
+*raspberrypi-userland-0_pre20130705-r1 (23 Jan 2014)
+*raspberrypi-userland-0_pre20140117 (23 Jan 2014)
+
+  23 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +raspberrypi-userland-0_pre20130705-r1.ebuild,
+  +raspberrypi-userland-0_pre20140117.ebuild,
+  -raspberrypi-userland-0_pre20121024.ebuild,
+  -raspberrypi-userland-0_pre20130131.ebuild,
+  -raspberrypi-userland-0_pre20130705.ebuild, files/04raspberrypi-userland:
+  New snapshot. Use correct path in env.d file, bug #494976.
 
 *raspberrypi-userland-0_pre20130705 (13 Jul 2013)
 
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index c313b963541f..9a24a5377fd8 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,10 +1,8 @@
-AUX 04raspberrypi-userland 38 SHA256 60a648bd13f8a1efb29800c312e520f74b9254a688a2a8a21e3b507c2ba25764 SHA512 0fa8b154a3048e10bb1d2fb1dffa7bae322b95ed6c1694edfb355280cb5c00f158f18df83333380d60a1a27741437efc21bae5d11de8fed5a3d4beef695068d9 WHIRLPOOL 966118f1d1494c38f695990331f6da46fcae758364c665836ca43b6d63a2b8e1c53670c7193ce00c4d8fac7d0bf399cc238dc71c5d2073dfcee5f9b1128c2f2e
-DIST raspberrypi-userland-0_pre20121024.tar.xz 539284 SHA256 6d280a16a34065ecacbd6e779ffe8277390129367fafb32d81f0197deed2b512 SHA512 7a6d24e95fd7e075694b434c08765dd884705c59aa26a7795d156b3b8304a8b168bddccebfd99733063da7b0bd0f7ae210f3bf6eec0c63ba3c1f116dddff34cb WHIRLPOOL 5c64ad8c8b45452f200fb5788ef477f748ae6a87acb1d494c146eb1c26a29be0f4ec9ffc3c085b4e821275ee83ea8b7a3c2ac8bd86ebd67b050676d021295ef2
-DIST raspberrypi-userland-0_pre20130131.tar.xz 31815328 SHA256 d949b3e208c98b631516e21e42de39ad8fa54f0a425ada41890e6d55ed8c7314 SHA512 64a71d70b14477687049ce7d658a248bef8d934287cb50a6ce39cad8ce7c43ca067f4417fddd471b01032874f8e461060983476b7a511ca9b86bc61ffadd0d72 WHIRLPOOL 8d018d00f400323247e1327695fcba7665377cb22d48f7681b6eaa7136157eda4a4b5d0fc1d5888fc45f1e7c788f4defcee8de3917b3d95966cf272b3de26aec
+AUX 04raspberrypi-userland 41 SHA256 4669ec0a1100c48d38f98675ab7dd437d8a428dcc362d6430bffab8ad229f672 SHA512 058a81aa3847fc2c39c6f4b322cb76e55442cdcd5481d427da4c22cb16022c33f08fc367c5cc279b5681a61ed830f97d82f733dc20024dc77b3282df03f96659 WHIRLPOOL d08f0d28465375f344c3810cbb3a3404412950df7973e74292356dac038880c064a60383f01a0a6acb21a911f27d431049582cdbc47686474688c713414bd812
 DIST raspberrypi-userland-0_pre20130705.tar.xz 31966608 SHA256 6307cc9d6103cd8afddf1b94ab44c4071f80884ec85d8e5aadd0f2f3d631c713 SHA512 d83de618e8fa6d49bd0b5b265706c7b290fa5800ac9a674dbf3d34222ab25e92c99877d61c4f706292666bf130ee0118ad54f35c8379a281f8ee90ce76a89651 WHIRLPOOL 8077d99e7a970f37bb4961ac928f9860b47be8aee83bff00eb4c44ee511aa322c532c9ff52528aece0897247ed8472aa70c147794aafe546ece8f8a08c5eb208
-EBUILD raspberrypi-userland-0_pre20121024.ebuild 1607 SHA256 45f79bc7e5b21bd32ea8f9984289ceafe5ce3b56afcecfdbda2d0288854c9f3a SHA512 c8e8475ff149a4aedd7b969a26279b583bf4166e97e9d1d1eb1e3e3c262fd91b5c9fd582daedb324927935407be81d61f244b72613eead814045301de3c4f17c WHIRLPOOL ec38308da2df99e065caecb65261942db90a59fd1469a22fa4e80cd108af05e5ff66efebc05399b432917b642116d831f7f1adf5ba6aa4112dd124276dfd0e67
-EBUILD raspberrypi-userland-0_pre20130131.ebuild 1308 SHA256 030aaa4410ffa587f21fae4fcf414ce6b6ea2bed26e3280a8f040ace3215efdc SHA512 22156d7c9366d188b7419657256656dd01b1e2ea128d333691c72c194ce50bcd7c52a3e27430b9ccdec1ad3b4166a6999862e1a825621b80a679e8e2269fb8b7 WHIRLPOOL e7963d23c14ea78c7bdde93e3a2429888fc6bc32d39fd628745f2aba28d003ddab512906ed3df3d6dd073a41ddacd304286524b96ab5c3c0a780083ead3d681b
-EBUILD raspberrypi-userland-0_pre20130705.ebuild 1513 SHA256 8de7886de29fe91d0d87693697ab148f49e8ad79dc804afdc828f262eff8827c SHA512 3bacf40ca59c70068349fd06a3eae9fcd96a6d1e7b742bcbedfe4381eb86d764096c49abacabc322f89f09776029864e346f1ac6868fe3bd03e73ef7205d9aec WHIRLPOOL a1a3402afa45073a9c4f0c0727cb23b3be606f3a4a293bcf935e8610a2c0994dd23fb553ebfd64d90d3375ef61cb9a1fd595aec9f5dba54051b27026a354a88b
+DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b70d429a0253b8a9c1f838351a96f2b25cc86109a879005f SHA512 5c3dfebdcb36a2a17da94cafcc92067b24b454d5694b0bd216dd0d6752c4f505840880094c22125ab5da60f7b53b9114e8d04359a223e9e00be967cb8585e42e WHIRLPOOL 5179758c2be4b45f640eb8759554e19ea4fc8c83e63b0d4396ae84e67ae82e97824bf12f0766df5a70e2ca5b80e90be80e5c9b2eaa968752829765463d3f6d0d
+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-9999.ebuild 1504 SHA256 9964117d51a72224e7cfde32a2e0eccabf0bbf48d3e16bde09631092b2331a74 SHA512 b1fbbc212e40bf18bb19c5ba87245bc31b8f1e8713ea52805256452ba2ad59efa976d7e5ccfe15d84ed85317822d37a75839a43b7e96af155869540cd89dc3bf WHIRLPOOL c48ef41a896472854a0613c5a7ae522dd1d31b2b02618b6d9b89d681fb11b2017e4cd00c9e4339560c2bd0f60453bb01c84c0831c25cb5b408fc21c519a489b5
-MISC ChangeLog 1174 SHA256 b5c514a0e764e4f1ebeec031334963eb2ade7c6c3268a56a7284283843616923 SHA512 44c16556ffe00989644355d6afe4f1fcae639773536b6f5a765dd26787029d81baa780a9de657092c600fcb277c3178014b3a1e8e62d1d61307e2ce95bd46aac WHIRLPOOL a6783df7060518e2cce14f981081582b5d234944ceb89ee2bf96cf94f1232a7d0d8a6ff6152eae1b3b8ca351f9ee6c735f255320f81a16b558bb8bd3665416e0
+MISC ChangeLog 1672 SHA256 e54d6ec05f90fa30c2813ca577a63080c85308035d7f42cfafd12044987d917d SHA512 bc995058b089c5914ba5ac91d9a28e0b2b8aad0503a7144a819d5f204ed96bbc3c1b78d7b09dea48a60de089fe42110e7a59bb3bc897d2fc03477320158f8f2e WHIRLPOOL 1ef841bbbd824840d89eadbab45548f7583329c2db5b1c5b5c40491525f2dc17df8499f62f0daf19d19a4002e80f681da3e7212c5dd869ff015850c29487d667
 MISC metadata.xml 253 SHA256 2033971042ce53f0af10bdc9f59bd2aba7b8490f0eafbca62a9e8ffd49d23c5d SHA512 cd887d2863b319dabf8598d349740e8d2223a03b0432157a421933a1a98b6140ad4b56f4750244da7d2545b56fb59567aae00d1e822e7cd90d3cb2b3d464ef01 WHIRLPOOL 95f9871ded20192d86cd4dc49f4471d0ddc884bc804980bcbedc6c4d1f90ebc25e30231dd2a56e8e5a33762cf3f660250934b1299042956d6eba74a7b6d9c81b
diff --git a/media-libs/raspberrypi-userland/files/04raspberrypi-userland b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
index 600a95474096..fd37f4990328 100644
--- a/media-libs/raspberrypi-userland/files/04raspberrypi-userland
+++ b/media-libs/raspberrypi-userland/files/04raspberrypi-userland
@@ -1,3 +1,3 @@
 
-PATH='/opt/bin'
+PATH='/opt/vc/bin'
 LDPATH='/opt/vc/lib'
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20121024.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20121024.ebuild
deleted file mode 100644
index 2f1359e838ed..000000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20121024.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20121024.ebuild,v 1.2 2012/10/25 01:10:45 chithanh Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Raspberry Pi userspace tools and libraries for the VideoCore IV GPU"
-HOMEPAGE="https://github.com/raspberrypi/userland"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
-	SRC_URI=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~arm"
-
-# 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 ${PN}-*/ ${P}/ || die
-	fi
-}
-
-src_prepare() {
-	# missing from upstream repo, would be installed to wrong directory anyway
-	# https://github.com/raspberrypi/userland/issues/1
-	sed -i "/10-vchiq.rules/d" interface/vchiq_arm/CMakeLists.txt || die
-	# init script for Debian, not useful on Gentoo
-	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
-	# we have our env.d file for this
-	sed -i "/\/etc\/ld.so.conf/d" makefiles/cmake/vmcs.cmake
-}
-
-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}
-}
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130131.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild
index 3072bdd2e567..6d7c4f7edc68 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130131.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130131.ebuild,v 1.1 2013/02/02 00:57:27 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild,v 1.1 2014/01/23 13:33:18 chithanh Exp $
 
 EAPI=5
 
@@ -51,4 +51,11 @@ 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_pre20130705.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
index e1226941bde4..fb2289150198 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705.ebuild,v 1.1 2013/07/13 17:13:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild,v 1.1 2014/01/23 13:33:18 chithanh Exp $
 
 EAPI=5