public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2015-10-26 16:38 Chí-Thanh Christopher Nguyễn
  0 siblings, 0 replies; 16+ messages in thread
From: Chí-Thanh Christopher Nguyễn @ 2015-10-26 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1bca70f53487f157d0df00deac7b46f133ee2cc6
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 16:38:05 2015 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 16:38:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bca70f5

media-libs/raspberrypi-userland: new snapshot

Package-Manager: portage-2.2.20.1

 media-libs/raspberrypi-userland/Manifest           |  1 +
 .../raspberrypi-userland-0_pre20150921.ebuild      | 61 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 27838fc..730152c 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,3 +1,4 @@
 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
+DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
new file mode 100644
index 0000000..e18e32c
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 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
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2016-03-30 13:37 Miroslav Šulc
  0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2016-03-30 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5e3a59a561313546f27414713071c0ad84b606a8
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 13:35:53 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 13:37:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3a59a5

media-libs/raspberrypi-userland: version bump

Package-Manager: portage-2.2.28

 media-libs/raspberrypi-userland/Manifest           |   1 +
 .../raspberrypi-userland-0_pre20160330.ebuild      | 108 +++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index b4e59ea..4a34270 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -3,3 +3,4 @@ DIST raspberrypi-userland-0_pre20140117.tar.xz 31998784 SHA256 2999d711465ddbc6b
 DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc700b83eeb7c3e06d3ea6bd3fd187880a563144a6bf6ee901 SHA512 775005177e760fff611d7ce7e4beb466ea111dfc4652b97593d1061b97b1ded32979f8666a0aada6338791abab988883bbfd902f267eba5734e8aa932ebcf487 WHIRLPOOL 3066272a88b868ef20f27614f6f680aa6eb8a43cd2e281a7a930b99be341b037fa843a1c36bfdc6be619544e5b4b8751e5ab58c853b1baff44894b39284bfa55
 DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a
 DIST raspberrypi-userland-0_pre20160305.tar.gz 32888927 SHA256 01cc6dfb5ee50733d58e6cb1ba0f79cb90ab7ef46718c302cbac0fd9e3a09b6a SHA512 8621f48d699b2736d4a22f03e5cdde6be564b8d2100f46ab85d3f6e0fc958634436fafc8d218f55a114a37acaf6dbe21b5cf2bf57c258a3067af2720d63d0c27 WHIRLPOOL 109aabddfc483900741758a737f93c1f3bc4074de2e2f0d25d28a620f8381adb44d21b5fa8eb3f59a69eb3a9903b95b32e3a5d9d9353560d42e37d19aaa9b085
+DIST raspberrypi-userland-0_pre20160330.tar.gz 32928211 SHA256 a1f3772afee594c7f08e5362cff96d783d2a0a4970d0172c611a638fe93cfeea SHA512 5b56885a1d832fff7d806718341d0050df66641d698ead4997e684c2aedb8faebd5cd9ce84a69537cc0ed362ca1b6c487ff2fd5575f5a3fbb1d4a7fe8602fb6e WHIRLPOOL ec3d224715e351150f72d021fd5a623287a64bc39379137cde01f8c460e083069f9cc18cf4899fff43d69a711b4c5bd9c69f51113b3b0a6b5092bb62441d9355

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild
new file mode 100644
index 0000000..076d8de
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 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
+	GIT_COMMIT="703a2c4"
+	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~arm"
+	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
+fi
+
+RDEPEND="!media-libs/raspberrypi-userland-bin
+	wayland? ( dev-libs/wayland )"
+DEPEND="${RDEPEND}
+	wayland? ( virtual/pkgconfig )"
+
+IUSE="examples wayland"
+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
+	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
+
+	# wayland egl support
+	epatch "${FILESDIR}"/next-resource-handle.patch \
+		"${FILESDIR}"/wayland-wsys.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
+	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+
+	# 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
+
+	insinto /opt/vc/lib/pkgconfig
+	doins "${FILESDIR}"/bcm_host.pc
+	doins "${FILESDIR}"/egl.pc
+	doins "${FILESDIR}"/glesv2.pc
+	if use wayland; then
+	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
+		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
+		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
+	fi
+
+	# some #include instructions are wrong so we need to fix them
+	einfo "Fixing #include \"vcos_platform_types.h\""
+	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vcos_platform.h\""
+	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vchost_config.h\""
+	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
+	done
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/examples
+		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
+		rm -fr "${D}"/opt/vc/src
+	else
+		rm -fr "${D}/opt/vc/src"
+	fi
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2016-04-11 20:28 Miroslav Šulc
  0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2016-04-11 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     57008e2017bd460a9c44c30ab7bcd5498902e782
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 20:28:25 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 20:28:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57008e20

media-libs/raspberrypi-userland: version bump

Package-Manager: portage-2.2.28

 media-libs/raspberrypi-userland/Manifest           |   1 +
 .../raspberrypi-userland-0_pre20160408.ebuild      | 108 +++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 4a34270..1823f23 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -4,3 +4,4 @@ DIST raspberrypi-userland-0_pre20140830.tar.xz 32066536 SHA256 f9a06d2ca7d41cdc7
 DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a
 DIST raspberrypi-userland-0_pre20160305.tar.gz 32888927 SHA256 01cc6dfb5ee50733d58e6cb1ba0f79cb90ab7ef46718c302cbac0fd9e3a09b6a SHA512 8621f48d699b2736d4a22f03e5cdde6be564b8d2100f46ab85d3f6e0fc958634436fafc8d218f55a114a37acaf6dbe21b5cf2bf57c258a3067af2720d63d0c27 WHIRLPOOL 109aabddfc483900741758a737f93c1f3bc4074de2e2f0d25d28a620f8381adb44d21b5fa8eb3f59a69eb3a9903b95b32e3a5d9d9353560d42e37d19aaa9b085
 DIST raspberrypi-userland-0_pre20160330.tar.gz 32928211 SHA256 a1f3772afee594c7f08e5362cff96d783d2a0a4970d0172c611a638fe93cfeea SHA512 5b56885a1d832fff7d806718341d0050df66641d698ead4997e684c2aedb8faebd5cd9ce84a69537cc0ed362ca1b6c487ff2fd5575f5a3fbb1d4a7fe8602fb6e WHIRLPOOL ec3d224715e351150f72d021fd5a623287a64bc39379137cde01f8c460e083069f9cc18cf4899fff43d69a711b4c5bd9c69f51113b3b0a6b5092bb62441d9355
+DIST raspberrypi-userland-0_pre20160408.tar.gz 32930276 SHA256 006500715b4131db263b81059685877eeb46b2591c13f772fa9f79b2368f195a SHA512 f42c561d1b9ebe9fe6335166a35e47d5dc932c1fefe567458f6a4ae9c57849ccf33e8ede8144989e3a1fa4c9b2a6c892cf61f77d69350d590443d0360388814b WHIRLPOOL 786ca22ad4e7a9740b853d7adbf362b618add9f12e987192f40bf012fdb313dcf9a38b27c963e87566cf91c98c4f02d59d8ef2eee602ea13369036c4e3a7891c

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild
new file mode 100644
index 0000000..8c40e8e
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 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
+	GIT_COMMIT="cfd971c"
+	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~arm"
+	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
+fi
+
+RDEPEND="!media-libs/raspberrypi-userland-bin
+	wayland? ( dev-libs/wayland )"
+DEPEND="${RDEPEND}
+	wayland? ( virtual/pkgconfig )"
+
+IUSE="examples wayland"
+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
+	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
+
+	# wayland egl support
+	epatch "${FILESDIR}"/next-resource-handle.patch \
+		"${FILESDIR}"/wayland-wsys.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
+	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+
+	# 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
+
+	insinto /opt/vc/lib/pkgconfig
+	doins "${FILESDIR}"/bcm_host.pc
+	doins "${FILESDIR}"/egl.pc
+	doins "${FILESDIR}"/glesv2.pc
+	if use wayland; then
+	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
+		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
+		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
+	fi
+
+	# some #include instructions are wrong so we need to fix them
+	einfo "Fixing #include \"vcos_platform_types.h\""
+	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vcos_platform.h\""
+	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vchost_config.h\""
+	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
+	done
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/examples
+		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
+		rm -fr "${D}"/opt/vc/src
+	else
+		rm -fr "${D}/opt/vc/src"
+	fi
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2016-04-25  7:56 Miroslav Šulc
  0 siblings, 0 replies; 16+ messages in thread
From: Miroslav Šulc @ 2016-04-25  7:56 UTC (permalink / raw
  To: gentoo-commits

commit:     411d95bd22109e0bb667e4dab23b13c272f897e1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 07:56:01 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 07:56:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411d95bd

media-libs/raspberrypi-userland: version bump

Package-Manager: portage-2.2.28

 media-libs/raspberrypi-userland/Manifest           |   1 +
 .../raspberrypi-userland-0_pre20160424.ebuild      | 108 +++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 1823f23..9aeb8ba 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -5,3 +5,4 @@ DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b8
 DIST raspberrypi-userland-0_pre20160305.tar.gz 32888927 SHA256 01cc6dfb5ee50733d58e6cb1ba0f79cb90ab7ef46718c302cbac0fd9e3a09b6a SHA512 8621f48d699b2736d4a22f03e5cdde6be564b8d2100f46ab85d3f6e0fc958634436fafc8d218f55a114a37acaf6dbe21b5cf2bf57c258a3067af2720d63d0c27 WHIRLPOOL 109aabddfc483900741758a737f93c1f3bc4074de2e2f0d25d28a620f8381adb44d21b5fa8eb3f59a69eb3a9903b95b32e3a5d9d9353560d42e37d19aaa9b085
 DIST raspberrypi-userland-0_pre20160330.tar.gz 32928211 SHA256 a1f3772afee594c7f08e5362cff96d783d2a0a4970d0172c611a638fe93cfeea SHA512 5b56885a1d832fff7d806718341d0050df66641d698ead4997e684c2aedb8faebd5cd9ce84a69537cc0ed362ca1b6c487ff2fd5575f5a3fbb1d4a7fe8602fb6e WHIRLPOOL ec3d224715e351150f72d021fd5a623287a64bc39379137cde01f8c460e083069f9cc18cf4899fff43d69a711b4c5bd9c69f51113b3b0a6b5092bb62441d9355
 DIST raspberrypi-userland-0_pre20160408.tar.gz 32930276 SHA256 006500715b4131db263b81059685877eeb46b2591c13f772fa9f79b2368f195a SHA512 f42c561d1b9ebe9fe6335166a35e47d5dc932c1fefe567458f6a4ae9c57849ccf33e8ede8144989e3a1fa4c9b2a6c892cf61f77d69350d590443d0360388814b WHIRLPOOL 786ca22ad4e7a9740b853d7adbf362b618add9f12e987192f40bf012fdb313dcf9a38b27c963e87566cf91c98c4f02d59d8ef2eee602ea13369036c4e3a7891c
+DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 SHA256 e040448cec34b9cea0072977397391af3131b2b43b057beba2ecf8b098d70b77 SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b WHIRLPOOL 95d6472d2f64e047d296cbebc122fe62eb392f861ad069e5a092a2d5710e7f85824e7a69e68d5af68d91b567c973b7e8b95135bf8b5a0bcfa58b683b35a8ed44

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
new file mode 100644
index 0000000..ebcc322
--- /dev/null
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 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
+	GIT_COMMIT="dff5760"
+	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
+	KEYWORDS="~arm"
+	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
+fi
+
+RDEPEND="!media-libs/raspberrypi-userland-bin
+	wayland? ( dev-libs/wayland )"
+DEPEND="${RDEPEND}
+	wayland? ( virtual/pkgconfig )"
+
+IUSE="examples wayland"
+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
+	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
+
+	# wayland egl support
+	epatch "${FILESDIR}"/next-resource-handle.patch \
+		"${FILESDIR}"/wayland-wsys.patch
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
+	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
+
+	doenvd "${FILESDIR}"/04${PN}
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+
+	# 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
+
+	insinto /opt/vc/lib/pkgconfig
+	doins "${FILESDIR}"/bcm_host.pc
+	doins "${FILESDIR}"/egl.pc
+	doins "${FILESDIR}"/glesv2.pc
+	if use wayland; then
+	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
+		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
+		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
+	fi
+
+	# some #include instructions are wrong so we need to fix them
+	einfo "Fixing #include \"vcos_platform_types.h\""
+	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vcos_platform.h\""
+	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
+	done
+	einfo "Fixing #include \"vchost_config.h\""
+	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
+		einfo "  Fixing file ${file}"
+		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
+	done
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/examples
+		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
+		rm -fr "${D}"/opt/vc/src
+	else
+		rm -fr "${D}/opt/vc/src"
+	fi
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2017-02-23 12:35 Michael Weber
  0 siblings, 0 replies; 16+ messages in thread
From: Michael Weber @ 2017-02-23 12:35 UTC (permalink / raw
  To: gentoo-commits

commit:     bf0131a298efc20ac52befda7aeeb04e21e14ae8
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 12:34:16 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 12:34:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0131a2

media-libs/raspberrypi-userland: arm stable (bug 608868)

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"

 .../raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index ebcc322845..a61ff228d3 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,11 +13,10 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	GIT_COMMIT="dff5760"
 	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~arm"
+	KEYWORDS="arm"
 	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
 fi
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2017-03-07  7:28 Michael Weber
  0 siblings, 0 replies; 16+ messages in thread
From: Michael Weber @ 2017-03-07  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d1ff3c306a37380e39b459652e57ff1846d4ab23
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 07:28:34 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 07:28:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ff3c30

media-libs/raspberrypi-userland: Remove old versions.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-libs/raspberrypi-userland/Manifest           |   7 --
 .../raspberrypi-userland-0_pre20130705-r1.ebuild   |  60 ------------
 .../raspberrypi-userland-0_pre20140117.ebuild      |  60 ------------
 .../raspberrypi-userland-0_pre20140830.ebuild      |  60 ------------
 .../raspberrypi-userland-0_pre20150921.ebuild      |  60 ------------
 .../raspberrypi-userland-0_pre20160305-r1.ebuild   | 107 ---------------------
 .../raspberrypi-userland-0_pre20160330.ebuild      | 107 ---------------------
 .../raspberrypi-userland-0_pre20160408.ebuild      | 107 ---------------------
 8 files changed, 568 deletions(-)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 9aeb8badae3..01faf4aa39f 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,8 +1 @@
-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
-DIST raspberrypi-userland-0_pre20150921.tar.xz 32395092 SHA256 771bf96111d40c3b86cf2590f22d02306e5f56668f6ee11ace389c719bfccb2b SHA512 0aad096f5c6d54ef1d494708e80f8fb921e30e0d93ced79b4e939afffa8e824e35347595d6f925d1d7ee86917e72fa0b160ad56c8a4df7711d5e87b5cc399be1 WHIRLPOOL 2204dd8f8acf79c3d8baab770e133d18596f00fbf714e9ab46bf4a5ae1a1c0cf9edcbf763bf7fc0403126bb0ca9de7f422a3427dd429d849df6aee1be08b4b6a
-DIST raspberrypi-userland-0_pre20160305.tar.gz 32888927 SHA256 01cc6dfb5ee50733d58e6cb1ba0f79cb90ab7ef46718c302cbac0fd9e3a09b6a SHA512 8621f48d699b2736d4a22f03e5cdde6be564b8d2100f46ab85d3f6e0fc958634436fafc8d218f55a114a37acaf6dbe21b5cf2bf57c258a3067af2720d63d0c27 WHIRLPOOL 109aabddfc483900741758a737f93c1f3bc4074de2e2f0d25d28a620f8381adb44d21b5fa8eb3f59a69eb3a9903b95b32e3a5d9d9353560d42e37d19aaa9b085
-DIST raspberrypi-userland-0_pre20160330.tar.gz 32928211 SHA256 a1f3772afee594c7f08e5362cff96d783d2a0a4970d0172c611a638fe93cfeea SHA512 5b56885a1d832fff7d806718341d0050df66641d698ead4997e684c2aedb8faebd5cd9ce84a69537cc0ed362ca1b6c487ff2fd5575f5a3fbb1d4a7fe8602fb6e WHIRLPOOL ec3d224715e351150f72d021fd5a623287a64bc39379137cde01f8c460e083069f9cc18cf4899fff43d69a711b4c5bd9c69f51113b3b0a6b5092bb62441d9355
-DIST raspberrypi-userland-0_pre20160408.tar.gz 32930276 SHA256 006500715b4131db263b81059685877eeb46b2591c13f772fa9f79b2368f195a SHA512 f42c561d1b9ebe9fe6335166a35e47d5dc932c1fefe567458f6a4ae9c57849ccf33e8ede8144989e3a1fa4c9b2a6c892cf61f77d69350d590443d0360388814b WHIRLPOOL 786ca22ad4e7a9740b853d7adbf362b618add9f12e987192f40bf012fdb313dcf9a38b27c963e87566cf91c98c4f02d59d8ef2eee602ea13369036c4e3a7891c
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 SHA256 e040448cec34b9cea0072977397391af3131b2b43b057beba2ecf8b098d70b77 SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b WHIRLPOOL 95d6472d2f64e047d296cbebc122fe62eb392f861ad069e5a092a2d5710e7f85824e7a69e68d5af68d91b567c973b7e8b95135bf8b5a0bcfa58b683b35a8ed44

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild
deleted file mode 100644
index 3d43e4934e9..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20130705-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index 3d43e4934e9..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140117.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index 3d43e4934e9..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20140830.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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_pre20150921.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
deleted file mode 100644
index d2c3cffe9ed..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20150921.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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_pre20160305-r1.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160305-r1.ebuild
deleted file mode 100644
index 168ab44077d..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160305-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	GIT_COMMIT="8369e39"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-DEPEND="${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-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
-	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
-
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch \
-		"${FILESDIR}"/wayland-wsys.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
-
-	# 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
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
-	done
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-		rm -fr "${D}"/opt/vc/src
-	else
-		rm -fr "${D}/opt/vc/src"
-	fi
-}

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild
deleted file mode 100644
index 33a773f686e..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160330.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	GIT_COMMIT="703a2c4"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-DEPEND="${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-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
-	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
-
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch \
-		"${FILESDIR}"/wayland-wsys.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
-
-	# 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
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
-	done
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-		rm -fr "${D}"/opt/vc/src
-	else
-		rm -fr "${D}/opt/vc/src"
-	fi
-}

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild
deleted file mode 100644
index 5bc7c77164c..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160408.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-	GIT_COMMIT="cfd971c"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-DEPEND="${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-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
-	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
-
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch \
-		"${FILESDIR}"/wayland-wsys.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
-
-	# 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
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
-	done
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
-	done
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-		rm -fr "${D}"/opt/vc/src
-	else
-		rm -fr "${D}/opt/vc/src"
-	fi
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2017-07-19  8:56 Patrice Clement
  0 siblings, 0 replies; 16+ messages in thread
From: Patrice Clement @ 2017-07-19  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     5f2232110a087c77505b1e19f162c60fe6e33501
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 08:13:55 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 08:55:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f223211

media-libs/raspberrypi-userland: tidy up ebuild and add missing dies.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../raspberrypi-userland-0_pre20160424.ebuild      | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index 44af1834f38..fb3240d5919 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -19,9 +19,12 @@ else
 	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
 fi
 
-RDEPEND="!media-libs/raspberrypi-userland-bin
+RDEPEND="
+	!media-libs/raspberrypi-userland-bin
 	wayland? ( dev-libs/wayland )"
-DEPEND="${RDEPEND}
+
+DEPEND="
+	${RDEPEND}
 	wayland? ( virtual/pkgconfig )"
 
 IUSE="examples wayland"
@@ -66,7 +69,7 @@ src_install() {
 	dosym ../../../opt/vc /usr/lib/opengl/${PN}
 
 	# tell eselect opengl that we do not have libGL
-	touch "${ED}"/opt/vc/.gles-only
+	touch "${ED}"/opt/vc/.gles-only || die
 
 	insinto /opt/vc/lib/pkgconfig
 	doins "${FILESDIR}"/bcm_host.pc
@@ -74,7 +77,7 @@ src_install() {
 	doins "${FILESDIR}"/glesv2.pc
 	if use wayland; then
 	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc
+		sed -i -e 's/Version:  /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die
 		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
 	fi
 
@@ -82,24 +85,25 @@ src_install() {
 	einfo "Fixing #include \"vcos_platform_types.h\""
 	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
 		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file}
+		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die
 	done
+
 	einfo "Fixing #include \"vcos_platform.h\""
 	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
 		einfo "  Fixing file ${file}"
-	sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file}
+		sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die
 	done
+
 	einfo "Fixing #include \"vchost_config.h\""
 	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
 		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file}
+		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die
 	done
 
-	if use examples ; then
+	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
 		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-		rm -fr "${D}"/opt/vc/src
-	else
-		rm -fr "${D}/opt/vc/src"
 	fi
+
+	rm -rfv "${D}"/opt/vc/src || die
 }


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2017-07-30  9:38 Michał Górny
  0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2017-07-30  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8123588ff66d9f8e99e8f1ea5389b1dfbf89f236
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 16:44:54 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 09:38:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8123588f

media-libs/raspberrypi-userland: use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index fb3240d5919..ddbbd294d3a 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/raspberrypi/userland"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-2
-	EGIT_REPO_URI="git://github.com/${PN/-//}.git"
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 	SRC_URI=""
 else
 	GIT_COMMIT="dff5760"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2019-04-05 16:41 Alfredo Tupone
  0 siblings, 0 replies; 16+ messages in thread
From: Alfredo Tupone @ 2019-04-05 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2479fd63b0bcff39df0f1f0e832f074ee5f760c7
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 16:41:27 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 16:41:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2479fd63

media-libs/raspberrypi-userland: Removing me as a maintainer

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 media-libs/raspberrypi-userland/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/media-libs/raspberrypi-userland/metadata.xml b/media-libs/raspberrypi-userland/metadata.xml
index 3f36d197951..6bc27686072 100644
--- a/media-libs/raspberrypi-userland/metadata.xml
+++ b/media-libs/raspberrypi-userland/metadata.xml
@@ -5,10 +5,6 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">raspberrypi/userland</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2020-11-23  4:52 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2020-11-23  4:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3c1d1b9e97744c059cd3cb480d019697304c7ca1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 04:48:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 04:48:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1d1b9e

media-libs/raspberrypi-userland: QA & style fixups

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-userland-0_pre20201022.ebuild      | 54 +++++++++++-----------
 .../raspberrypi-userland-9999.ebuild               | 54 +++++++++++-----------
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 9242ae883fc..7fa3e590928 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -9,13 +9,12 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 	SRC_URI=""
 else
-	#We base our versioning off Raspbian's
-	#Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/
-	#Example:
-	#libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb
-	#"e432bc3" is the first 7 hex digits of the commit hash.
-	#Now go to https://github.com/raspberrypi/userland/commits/master and find the
-	#full hash
+	# We base our versioning on  Raspbian
+	# Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/
+	# Example:
+	# * libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb
+	# * "e432bc3" is the first 7 hex digits of the commit hash.
+	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~arm ~arm64"
@@ -27,30 +26,22 @@ HOMEPAGE="https://github.com/raspberrypi/userland"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 DEPEND=""
 RDEPEND="acct-group/video
 	!media-libs/raspberrypi-userland-bin"
 
-#Install in $(get_libdir)
-#See https://github.com/raspberrypi/userland/pull/650
-PATCHES=( "${FILESDIR}/${PN}-libdir.patch" )
-#Don't install includes that collide.
-PATCHES+=( "${FILESDIR}/${PN}-include.patch" )
-#See https://github.com/raspberrypi/userland/pull/655
-PATCHES+=( "${FILESDIR}/${PN}-libfdt-static.patch" )
-#See https://github.com/raspberrypi/userland/pull/659
-PATCHES+=( "${FILESDIR}/${PN}-pkgconf-arm64.patch" )
-
-pkg_setup() {
-	append-ldflags $(no-as-needed)
-
-	mycmakeargs=(
-		-DVMCS_INSTALL_PREFIX="/usr"
-		-DARM64=$(usex arm64 ON OFF)
-	)
-}
+PATCHES=(
+	# Install in $(get_libdir)
+	# See https://github.com/raspberrypi/userland/pull/650
+	"${FILESDIR}/${PN}-libdir.patch"
+	# Don't install includes that collide.
+	"${FILESDIR}/${PN}-include.patch"
+	# See https://github.com/raspberrypi/userland/pull/655
+	"${FILESDIR}/${PN}-libfdt-static.patch"
+	# See https://github.com/raspberrypi/userland/pull/659
+	"${FILESDIR}/${PN}-pkgconf-arm64.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -63,6 +54,17 @@ src_prepare() {
 		"${S}/interface/khronos/CMakeLists.txt" || die "Failed sedding interface/khronos/CMakeLists.txt"
 }
 
+src_configure() {
+	append-ldflags $(no-as-needed)
+
+	mycmakeargs=(
+		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DARM64=$(usex arm64)
+	)
+
+	cmake_src_configure
+}
+
 src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index 9242ae883fc..7fa3e590928 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -9,13 +9,12 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
 	SRC_URI=""
 else
-	#We base our versioning off Raspbian's
-	#Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/
-	#Example:
-	#libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb
-	#"e432bc3" is the first 7 hex digits of the commit hash.
-	#Now go to https://github.com/raspberrypi/userland/commits/master and find the
-	#full hash
+	# We base our versioning on  Raspbian
+	# Go to https://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-userland/
+	# Example:
+	# * libraspberrypi-bin-dbgsym_2+git20201022~151804+e432bc3-1_arm64.deb
+	# * "e432bc3" is the first 7 hex digits of the commit hash.
+	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~arm ~arm64"
@@ -27,30 +26,22 @@ HOMEPAGE="https://github.com/raspberrypi/userland"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 
 DEPEND=""
 RDEPEND="acct-group/video
 	!media-libs/raspberrypi-userland-bin"
 
-#Install in $(get_libdir)
-#See https://github.com/raspberrypi/userland/pull/650
-PATCHES=( "${FILESDIR}/${PN}-libdir.patch" )
-#Don't install includes that collide.
-PATCHES+=( "${FILESDIR}/${PN}-include.patch" )
-#See https://github.com/raspberrypi/userland/pull/655
-PATCHES+=( "${FILESDIR}/${PN}-libfdt-static.patch" )
-#See https://github.com/raspberrypi/userland/pull/659
-PATCHES+=( "${FILESDIR}/${PN}-pkgconf-arm64.patch" )
-
-pkg_setup() {
-	append-ldflags $(no-as-needed)
-
-	mycmakeargs=(
-		-DVMCS_INSTALL_PREFIX="/usr"
-		-DARM64=$(usex arm64 ON OFF)
-	)
-}
+PATCHES=(
+	# Install in $(get_libdir)
+	# See https://github.com/raspberrypi/userland/pull/650
+	"${FILESDIR}/${PN}-libdir.patch"
+	# Don't install includes that collide.
+	"${FILESDIR}/${PN}-include.patch"
+	# See https://github.com/raspberrypi/userland/pull/655
+	"${FILESDIR}/${PN}-libfdt-static.patch"
+	# See https://github.com/raspberrypi/userland/pull/659
+	"${FILESDIR}/${PN}-pkgconf-arm64.patch"
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -63,6 +54,17 @@ src_prepare() {
 		"${S}/interface/khronos/CMakeLists.txt" || die "Failed sedding interface/khronos/CMakeLists.txt"
 }
 
+src_configure() {
+	append-ldflags $(no-as-needed)
+
+	mycmakeargs=(
+		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DARM64=$(usex arm64)
+	)
+
+	cmake_src_configure
+}
+
 src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2020-12-03  5:20 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2020-12-03  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4e1585c66572addfa8e87a8926d063f920f02b8f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 05:17:27 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 05:17:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1585c6

media-libs/raspberrypi-userland: Stabilize 0_pre20201022 arm, #757978

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 7fa3e590928..788e267aecc 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -17,7 +17,7 @@ else
 	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~arm ~arm64"
+	KEYWORDS="arm ~arm64"
 	S="${WORKDIR}/userland-${GIT_COMMIT}"
 fi
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2020-12-07 17:11 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2020-12-07 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8021512569b236c2ceb62156c206c133b8f17bf0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 17:10:58 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 17:10:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80215125

media-libs/raspberrypi-userland: cleanup old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/raspberrypi-userland/Manifest           |   1 -
 .../raspberrypi-userland-0_pre20160424.ebuild      | 109 ---------------------
 2 files changed, 110 deletions(-)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 29025c84702..14ea7065276 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,2 +1 @@
-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/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
deleted file mode 100644
index ddbbd294d3a..00000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://github.com/${PN/-//}.git"
-	SRC_URI=""
-else
-	GIT_COMMIT="dff5760"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="
-	!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-
-DEPEND="
-	${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-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
-	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
-
-	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
-
-	# 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 || die
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die
-	done
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-	fi
-
-	rm -rfv "${D}"/opt/vc/src || die
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2020-12-10 17:43 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2020-12-10 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9c83321ae4083aa43da7517bd47aa246cff84fdc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 17:42:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 17:42:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c83321a

media-libs/raspberrypi-userland: Stabilize 0_pre20201022 arm64, #758929

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 788e267aecc..7f27f665564 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -17,7 +17,7 @@ else
 	# * Go to https://github.com/raspberrypi/userland/commits/master and find the full hash
 	GIT_COMMIT="e432bc3400401064e2d8affa5d1454aac2cf4a00"
 	SRC_URI="https://github.com/raspberrypi/userland/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="arm ~arm64"
+	KEYWORDS="arm arm64"
 	S="${WORKDIR}/userland-${GIT_COMMIT}"
 fi
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2021-02-16 19:33 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-02-16 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ae0419fa055fc278fb7d9763587ac7c54e854554
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 19:33:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 19:33:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0419fa

media-libs/raspberrypi-userland: port to EAPI 7 for legacy version

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-userland-0_pre20160424.ebuild             | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index ddbbd294d3a..8c43fe24aa9 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/userland"
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/raspberrypi/userland"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	SRC_URI=""
 else
 	GIT_COMMIT="dff5760"
 	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
@@ -46,15 +45,19 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
+
 	# init script for Debian, not useful on Gentoo
 	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
 
 	# wayland egl support
-	epatch "${FILESDIR}"/next-resource-handle.patch
+	eapply "${FILESDIR}"/next-resource-handle.patch
+
+	cmake_src_prepare
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
 	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2022-04-28  3:34 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2022-04-28  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5de878490cf52d935a9eff5335de88ce7a34c3df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 03:26:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 03:31:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de87849

media-libs/raspberrypi-userland: use udev.eclass; call udev_reload

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-userland-0_pre20160424.ebuild                 | 11 +++++++----
 .../raspberrypi-userland-0_pre20201022.ebuild                 |  6 +++++-
 .../raspberrypi-userland/raspberrypi-userland-9999.ebuild     |  6 +++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
index 8c43fe24aa99..7f5d733485a6 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake udev
 
 DESCRIPTION="Raspberry Pi userspace tools and libraries"
 HOMEPAGE="https://github.com/raspberrypi/userland"
@@ -64,8 +64,7 @@ src_install() {
 
 	doenvd "${FILESDIR}"/04${PN}
 
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/92-local-vchiq-permissions.rules
+	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 
 	# enable dynamic switching of the GL implementation
 	dodir /usr/lib/opengl
@@ -110,3 +109,7 @@ src_install() {
 
 	rm -rfv "${D}"/opt/vc/src || die
 }
+
+pkg_postinst() {
+	udev_reload
+}

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 7f27f6655647..112896ef1dde 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,3 +69,7 @@ src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 }
+
+pkg_postinst() {
+	udev_reload
+}

diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index 7fa3e5909284..f05820d71ac0 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -69,3 +69,7 @@ src_install() {
 	cmake_src_install
 	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
 }
+
+pkg_postinst() {
+	udev_reload
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
@ 2024-03-24 21:03 Andreas Sturmlechner
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2024-03-24 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5a805aa0a4c97faa764fc5cad1b1195eb21ccfe2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 14:05:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 21:02:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a805aa0

media-libs/raspberrypi-userland: drop 0_pre20160424

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/raspberrypi-userland/Manifest           |   1 -
 .../raspberrypi-userland-0_pre20160424.ebuild      | 115 ---------------------
 2 files changed, 116 deletions(-)

diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 29025c84702d..14ea7065276c 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,2 +1 @@
-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/raspberrypi-userland-0_pre20160424.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
deleted file mode 100644
index 7f5d733485a6..000000000000
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-DESCRIPTION="Raspberry Pi userspace tools and libraries"
-HOMEPAGE="https://github.com/raspberrypi/userland"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-else
-	GIT_COMMIT="dff5760"
-	SRC_URI="https://github.com/raspberrypi/userland/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="arm"
-	S="${WORKDIR}/raspberrypi-userland-${GIT_COMMIT}"
-fi
-
-RDEPEND="
-	!media-libs/raspberrypi-userland-bin
-	wayland? ( dev-libs/wayland )"
-
-DEPEND="
-	${RDEPEND}
-	wayland? ( virtual/pkgconfig )"
-
-IUSE="examples wayland"
-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
-	fi
-}
-
-src_prepare() {
-	default
-
-	# init script for Debian, not useful on Gentoo
-	sed -i "/DESTINATION \/etc\/init.d/,+2d" interface/vmcs_host/linux/vcfiled/CMakeLists.txt || die
-
-	# wayland egl support
-	eapply "${FILESDIR}"/next-resource-handle.patch
-
-	cmake_src_prepare
-}
-
-src_install() {
-	cmake_src_install
-
-	# provide OpenGL ES v1 according to https://github.com/raspberrypi/firmware/issues/78
-	dosym libGLESv2.so /opt/vc/lib/libGLESv1_CM.so
-
-	doenvd "${FILESDIR}"/04${PN}
-
-	udev_dorules "${FILESDIR}/92-local-vchiq-permissions.rules"
-
-	# 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 || die
-
-	insinto /opt/vc/lib/pkgconfig
-	doins "${FILESDIR}"/bcm_host.pc
-	doins "${FILESDIR}"/egl.pc
-	doins "${FILESDIR}"/glesv2.pc
-	if use wayland; then
-	# Missing wayland-egl version from the patch; claim 9.0 (a mesa version) for now, so gst-plugins-bad wayland-egl check is happy
-		sed -i -e 's/Version:  /Version: 9.0/' "${ED}/opt/vc/lib/pkgconfig/wayland-egl.pc" || die
-		doins "${ED}"/opt/vc/lib/pkgconfig/wayland-egl.pc # Maybe move?
-	fi
-
-	# some #include instructions are wrong so we need to fix them
-	einfo "Fixing #include \"vcos_platform_types.h\""
-	for file in $(grep -l "#include \"vcos_platform_types.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform_types.h\"%#include \"interface/vcos/pthreads/vcos_platform_types.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vcos_platform.h\""
-	for file in $(grep -l "#include \"vcos_platform.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vcos_platform.h\"%#include \"interface/vcos/pthreads/vcos_platform.h\"%g" ${file} || die
-	done
-
-	einfo "Fixing #include \"vchost_config.h\""
-	for file in $(grep -l "#include \"vchost_config.h\"" "${D}"/opt/vc/include/* -r); do
-		einfo "  Fixing file ${file}"
-		sed -i "s%#include \"vchost_config.h\"%#include \"interface/vmcs_host/linux/vchost_config.h\"%g" ${file} || die
-	done
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		mv "${D}"/opt/vc/src/hello_pi "${D}"/usr/share/doc/${PF}/examples/ || die
-	fi
-
-	rm -rfv "${D}"/opt/vc/src || die
-}
-
-pkg_postinst() {
-	udev_reload
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2024-03-24 21:03 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-24 21:03 [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-04-28  3:34 Sam James
2021-02-16 19:33 Sam James
2020-12-10 17:43 Sam James
2020-12-07 17:11 Sam James
2020-12-03  5:20 Sam James
2020-11-23  4:52 Sam James
2019-04-05 16:41 Alfredo Tupone
2017-07-30  9:38 Michał Górny
2017-07-19  8:56 Patrice Clement
2017-03-07  7:28 Michael Weber
2017-02-23 12:35 Michael Weber
2016-04-25  7:56 Miroslav Šulc
2016-04-11 20:28 Miroslav Šulc
2016-03-30 13:37 Miroslav Šulc
2015-10-26 16:38 Chí-Thanh Christopher Nguyễn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox