From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/
Date: Mon, 23 Nov 2020 04:52:03 +0000 (UTC) [thread overview]
Message-ID: <1606106889.3c1d1b9e97744c059cd3cb480d019697304c7ca1.sam@gentoo> (raw)
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"
next reply other threads:[~2020-11-23 4:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 4:52 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-24 21:03 [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/ Andreas Sturmlechner
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
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1606106889.3c1d1b9e97744c059cd3cb480d019697304c7ca1.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox