From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38AD5139694 for ; Wed, 19 Jul 2017 08:56:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79DFEE0D9E; Wed, 19 Jul 2017 08:56:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4CFBBE0D9E for ; Wed, 19 Jul 2017 08:56:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 422DE341717 for ; Wed, 19 Jul 2017 08:56:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF8DB74B8 for ; Wed, 19 Jul 2017 08:56:02 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1500454554.5f2232110a087c77505b1e19f162c60fe6e33501.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/raspberrypi-userland/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20160424.ebuild X-VCS-Directories: media-libs/raspberrypi-userland/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 5f2232110a087c77505b1e19f162c60fe6e33501 X-VCS-Branch: master Date: Wed, 19 Jul 2017 08:56:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bcb71d1b-8cc6-44d2-b98a-a2f7e26e6abd X-Archives-Hash: 9052c39de714196415451fefac866dd8 commit: 5f2232110a087c77505b1e19f162c60fe6e33501 Author: Patrice Clement gentoo org> AuthorDate: Wed Jul 19 08:13:55 2017 +0000 Commit: Patrice Clement gentoo 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 }